diff options
| author | jenglish <jenglish@flightlab.com> | 2007-10-25 07:08:25 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2007-10-25 07:08:25 (GMT) |
| commit | 504f22c2002890ce5b39d30561d76cae861d0d40 (patch) | |
| tree | cc3ec59b3743ffde75e375f9a9f2c21fcfbf95a2 /generic/ttk/ttkSquare.c | |
| parent | a9b41e61dd1f2274961a88385d433a9bac66d44a (diff) | |
| download | tk-504f22c2002890ce5b39d30561d76cae861d0d40.zip tk-504f22c2002890ce5b39d30561d76cae861d0d40.tar.gz tk-504f22c2002890ce5b39d30561d76cae861d0d40.tar.bz2 | |
Move widget layout registration from TtkElements_Init()
to widget *_Init() routines.
Renaming/consistency: s/...ElementGeometry()/...ElementSize()/
Diffstat (limited to 'generic/ttk/ttkSquare.c')
| -rw-r--r-- | generic/ttk/ttkSquare.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c index 4f1bd0f..365cb10 100644 --- a/generic/ttk/ttkSquare.c +++ b/generic/ttk/ttkSquare.c @@ -2,7 +2,7 @@ * * Minimal sample ttk widget. * - * $Id: ttkSquare.c,v 1.4 2007/01/11 14:49:47 jenglish Exp $ + * $Id: ttkSquare.c,v 1.5 2007/10/25 07:08:26 jenglish Exp $ */ #include <tk.h> @@ -201,10 +201,9 @@ static Ttk_ElementOptionSpec SquareElementOptions[] = * size and padding information */ -static void -SquareElementGeometry( - void *clientData, void *elementRecord, - Tk_Window tkwin, int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) +static void SquareElementSize( + void *clientData, void *elementRecord, Tk_Window tkwin, + int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) { SquareElement *square = elementRecord; int borderWidth = 0; @@ -219,9 +218,9 @@ SquareElementGeometry( * Draw the element in the box provided. */ -static void -SquareElementDraw(void *clientData, void *elementRecord, - Tk_Window tkwin, Drawable d, Ttk_Box b, unsigned int state) +static void SquareElementDraw( + void *clientData, void *elementRecord, Tk_Window tkwin, + Drawable d, Ttk_Box b, unsigned int state) { SquareElement *square = elementRecord; Tk_3DBorder border = NULL, foreground = NULL; @@ -241,7 +240,7 @@ static Ttk_ElementSpec SquareElementSpec = TK_STYLE_VERSION_2, sizeof(SquareElement), SquareElementOptions, - SquareElementGeometry, + SquareElementSize, SquareElementDraw }; |