diff options
| author | nijtmans <nijtmans@noemail.net> | 2010-01-18 20:43:38 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans@noemail.net> | 2010-01-18 20:43:38 (GMT) |
| commit | e12355273fd3be0f6f447e7fdd7307e6e4a318bc (patch) | |
| tree | 765c9b523ea7ef7739325a073f0de02033da1d1d /generic/tkCanvBmap.c | |
| parent | 535cdf32070cf1421a83f0cad4e482c0f09a381d (diff) | |
| download | tk-e12355273fd3be0f6f447e7fdd7307e6e4a318bc.zip tk-e12355273fd3be0f6f447e7fdd7307e6e4a318bc.tar.gz tk-e12355273fd3be0f6f447e7fdd7307e6e4a318bc.tar.bz2 | |
fix more gcc warnings: missing initializer
Apply patch [#2932808]: Canvas items
not updating on widget state change
FossilOrigin-Name: 2f69e1bce26ca36b0ad60946c5d2d5ed4e2c5f05
Diffstat (limited to 'generic/tkCanvBmap.c')
| -rw-r--r-- | generic/tkCanvBmap.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index 8cf550e..9599598 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -9,10 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvBmap.c,v 1.17 2009/02/03 23:55:47 nijtmans Exp $ + * RCS: @(#) $Id: tkCanvBmap.c,v 1.18 2010/01/18 20:43:38 nijtmans Exp $ */ -#include <stdio.h> #include "tkInt.h" #include "tkCanvas.h" @@ -52,34 +51,34 @@ static const Tk_CustomOption tagsOption = { static Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_COLOR, "-activebackground", NULL, NULL, - NULL, Tk_Offset(BitmapItem, activeBgColor), TK_CONFIG_NULL_OK}, + NULL, Tk_Offset(BitmapItem, activeBgColor), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_BITMAP, "-activebitmap", NULL, NULL, - NULL, Tk_Offset(BitmapItem, activeBitmap), TK_CONFIG_NULL_OK}, + NULL, Tk_Offset(BitmapItem, activeBitmap), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-activeforeground", NULL, NULL, - NULL, Tk_Offset(BitmapItem, activeFgColor), TK_CONFIG_NULL_OK}, + NULL, Tk_Offset(BitmapItem, activeFgColor), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_ANCHOR, "-anchor", NULL, NULL, - "center", Tk_Offset(BitmapItem, anchor), TK_CONFIG_DONT_SET_DEFAULT}, + "center", Tk_Offset(BitmapItem, anchor), TK_CONFIG_DONT_SET_DEFAULT, NULL}, {TK_CONFIG_COLOR, "-background", NULL, NULL, - NULL, Tk_Offset(BitmapItem, bgColor), TK_CONFIG_NULL_OK}, + NULL, Tk_Offset(BitmapItem, bgColor), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_BITMAP, "-bitmap", NULL, NULL, - NULL, Tk_Offset(BitmapItem, bitmap), TK_CONFIG_NULL_OK}, + NULL, Tk_Offset(BitmapItem, bitmap), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-disabledbackground", NULL, NULL, NULL, Tk_Offset(BitmapItem, disabledBgColor), - TK_CONFIG_NULL_OK}, + TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_BITMAP, "-disabledbitmap", NULL, NULL, NULL, Tk_Offset(BitmapItem, disabledBitmap), - TK_CONFIG_NULL_OK}, + TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-disabledforeground", NULL, NULL, NULL, Tk_Offset(BitmapItem, disabledFgColor), - TK_CONFIG_NULL_OK}, + TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-foreground", NULL, NULL, - "black", Tk_Offset(BitmapItem, fgColor), 0}, + "black", Tk_Offset(BitmapItem, fgColor), 0, NULL}, {TK_CONFIG_CUSTOM, "-state", NULL, NULL, NULL, Tk_Offset(Tk_Item, state), TK_CONFIG_NULL_OK, &stateOption}, {TK_CONFIG_CUSTOM, "-tags", NULL, NULL, NULL, 0, TK_CONFIG_NULL_OK, &tagsOption}, - {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0} + {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL} }; /* @@ -140,6 +139,7 @@ Tk_ItemType tkBitmapType = { NULL, /* insertProc */ NULL, /* dTextProc */ NULL, /* nextPtr */ + NULL, 0, NULL, NULL }; /* |