summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkButton.c
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-11-09 23:53:09 (GMT)
committerjenglish <jenglish@flightlab.com>2008-11-09 23:53:09 (GMT)
commit382e7dcaf6581b63580d15affc7ac2f66c4ad712 (patch)
tree438838c4ce7d1162b72cf87cab54837316c5aa34 /generic/ttk/ttkButton.c
parent8790cbda7d404e9f8bc351d5349f0ef327575cf9 (diff)
downloadtk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.zip
tk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.tar.gz
tk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.tar.bz2
Ttk widget initializeProc()s now return void instead of
a status code, and are no longer allowed to fail. (Fix for #2207435 in progress).
Diffstat (limited to 'generic/ttk/ttkButton.c')
-rw-r--r--generic/ttk/ttkButton.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 4d1adcd..ce4fd67 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -1,4 +1,4 @@
-/* $Id: ttkButton.c,v 1.9 2008/04/27 22:41:12 dkf Exp $
+/* $Id: ttkButton.c,v 1.10 2008/11/09 23:53:09 jenglish Exp $
* Copyright (c) 2003, Joe English
*
* label, button, checkbutton, radiobutton, and menubutton widgets.
@@ -118,13 +118,12 @@ static void TextVariableChanged(void *clientData, const char *value)
TtkResizeWidget(&basePtr->core);
}
-static int
+static void
BaseInitialize(Tcl_Interp *interp, void *recordPtr)
{
Base *basePtr = recordPtr;
basePtr->base.textVariableTrace = 0;
basePtr->base.imageSpec = NULL;
- return TCL_OK;
}
static void
@@ -453,7 +452,7 @@ static void CheckbuttonVariableChanged(void *clientData, const char *value)
}
}
-static int CheckbuttonInitialize(Tcl_Interp *interp, void *recordPtr)
+static void CheckbuttonInitialize(Tcl_Interp *interp, void *recordPtr)
{
Checkbutton *checkPtr = recordPtr;
Tcl_Obj *objPtr;
@@ -464,8 +463,7 @@ static int CheckbuttonInitialize(Tcl_Interp *interp, void *recordPtr)
Tcl_IncrRefCount(objPtr);
Tcl_DecrRefCount(checkPtr->checkbutton.variableObj);
checkPtr->checkbutton.variableObj = objPtr;
-
- return BaseInitialize(interp, recordPtr);
+ BaseInitialize(interp, recordPtr);
}
static void