diff options
-rw-r--r-- | generic/tkButton.c | 67 | ||||
-rw-r--r-- | generic/tkCanvImg.c | 3 | ||||
-rw-r--r-- | generic/tkCanvas.c | 27 | ||||
-rw-r--r-- | generic/tkMenubutton.c | 53 | ||||
-rw-r--r-- | generic/tkPointer.c | 27 | ||||
-rw-r--r-- | generic/tkStubInit.c | 2 |
6 files changed, 64 insertions, 115 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 8a7236d..4a1fc7b 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -1092,35 +1092,35 @@ ConfigureButton( } else { Tk_SetBackgroundFromBorder(butPtr->tkwin, butPtr->normalBorder); } - Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->wrapLengthObj, &wrapLength); + Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->wrapLengthObj, &wrapLength); if (wrapLength < 0) { wrapLength = 0; Tcl_DecrRefCount(butPtr->wrapLengthObj); butPtr->wrapLengthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->wrapLengthObj); } - Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->borderWidthObj, &borderWidth); + Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->borderWidthObj, &borderWidth); if (borderWidth < 0) { borderWidth = 0; Tcl_DecrRefCount(butPtr->borderWidthObj); butPtr->borderWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->borderWidthObj); } - Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->highlightWidthObj, &highlightWidth); + Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->highlightWidthObj, &highlightWidth); if (highlightWidth < 0) { highlightWidth = 0; Tcl_DecrRefCount(butPtr->highlightWidthObj); butPtr->highlightWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->highlightWidthObj); } - Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padXObj, &padX); + Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padXObj, &padX); if (padX < 0) { padX = 0; Tcl_DecrRefCount(butPtr->padXObj); butPtr->padXObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->padXObj); } - Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padYObj, &padY); + Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padYObj, &padY); if (padY < 0) { padY = 0; Tcl_DecrRefCount(butPtr->padYObj); @@ -1727,14 +1727,12 @@ static char * ButtonTextVarProc( void *clientData, /* Information about button. */ Tcl_Interp *interp, /* Interpreter containing variable. */ - const char *name1, /* Not used. */ - const char *name2, /* Not used. */ + TCL_UNUSED(const char *), /* name1 */ + TCL_UNUSED(const char *), /* name2 */ int flags) /* Information about what happened. */ { TkButton *butPtr = (TkButton *)clientData; Tcl_Obj *valuePtr; - (void)name1; - (void)name2; if (butPtr->flags & BUTTON_DELETED) { return NULL; @@ -1822,19 +1820,14 @@ ButtonTextVarProc( static void ButtonImageProc( void *clientData, /* Pointer to widget record. */ - int x, int y, /* Upper left pixel (within image) that must - * be redisplayed. */ - int width, int height, /* Dimensions of area to redisplay (might be - * <= 0). */ - int imgWidth, int imgHeight)/* New dimensions of image. */ + TCL_UNUSED(int), /* x, Upper left pixel (within image) that must */ + TCL_UNUSED(int), /* y, be redisplayed. */ + TCL_UNUSED(int), /* width, Dimensions of area to redisplay (might be */ + TCL_UNUSED(int), /* height, <= 0). */ + TCL_UNUSED(int), /* imgWidth, New dimensions of image. */ + TCL_UNUSED(int)) /* imgHeight */ { TkButton *butPtr = (TkButton *)clientData; - (void)x; - (void)y; - (void)width; - (void)height; - (void)imgWidth; - (void)imgHeight; if (butPtr->tkwin != NULL) { TkpComputeButtonGeometry(butPtr); @@ -1866,19 +1859,14 @@ ButtonImageProc( static void ButtonSelectImageProc( void *clientData, /* Pointer to widget record. */ - int x, int y, /* Upper left pixel (within image) that must - * be redisplayed. */ - int width, int height, /* Dimensions of area to redisplay (might be - * <= 0). */ - int imgWidth, int imgHeight)/* New dimensions of image. */ + TCL_UNUSED(int), /* x, Upper left pixel (within image) that must */ + TCL_UNUSED(int), /* y, be redisplayed. */ + TCL_UNUSED(int), /* width, Dimensions of area to redisplay (might be */ + TCL_UNUSED(int), /* height, <= 0). */ + TCL_UNUSED(int), /* imgWidth, New dimensions of image. */ + TCL_UNUSED(int)) /* imgHeight */ { TkButton *butPtr = (TkButton *)clientData; - (void)x; - (void)y; - (void)width; - (void)height; - (void)imgWidth; - (void)imgHeight; #ifdef MAC_OSX_TK if (butPtr->tkwin != NULL) { @@ -1919,19 +1907,14 @@ ButtonSelectImageProc( static void ButtonTristateImageProc( void *clientData, /* Pointer to widget record. */ - int x, int y, /* Upper left pixel (within image) that must - * be redisplayed. */ - int width, int height, /* Dimensions of area to redisplay (might be - * <= 0). */ - int imgWidth, int imgHeight)/* New dimensions of image. */ + TCL_UNUSED(int), /* x, Upper left pixel (within image) that must */ + TCL_UNUSED(int), /* y, be redisplayed. */ + TCL_UNUSED(int), /* width, Dimensions of area to redisplay (might be */ + TCL_UNUSED(int), /* height, <= 0). */ + TCL_UNUSED(int), /* imgWidth, New dimensions of image. */ + TCL_UNUSED(int)) /* imgHeight */ { TkButton *butPtr = (TkButton *)clientData; - (void)x; - (void)y; - (void)width; - (void)height; - (void)imgWidth; - (void)imgHeight; #ifdef MAC_OSX_TK if (butPtr->tkwin != NULL) { diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c index a0097b1..95a0b32 100644 --- a/generic/tkCanvImg.c +++ b/generic/tkCanvImg.c @@ -526,7 +526,7 @@ static void DisplayImage( Tk_Canvas canvas, /* Canvas that contains item. */ Tk_Item *itemPtr, /* Item to be displayed. */ - Display *display, /* Display on which to draw item. */ + TCL_UNUSED(Display *), /* Display on which to draw item. */ Drawable drawable, /* Pixmap or window in which to draw item. */ int x, int y, int width, int height) /* Describes region of canvas that must be @@ -536,7 +536,6 @@ DisplayImage( short drawableX, drawableY; Tk_Image image; Tk_State state = itemPtr->state; - (void)display; if (state == TK_STATE_NULL) { state = Canvas(canvas)->canvas_state; diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 402b1d4..05f549e 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -2311,24 +2311,6 @@ ConfigureCanvas( canvasPtr->highlightWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(canvasPtr->highlightWidthObj); } - if (canvasPtr->textInfo.insertBorderWidth < 0) { - canvasPtr->textInfo.insertBorderWidth = 0; - Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved1); - canvasPtr->textInfo.reserved1 = Tcl_NewIntObj(0); - Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved1); - } - if (canvasPtr->textInfo.insertWidth < 0) { - canvasPtr->textInfo.insertWidth = 0; - Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved2); - canvasPtr->textInfo.reserved2 = Tcl_NewIntObj(0); - Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved2); - } - if (canvasPtr->textInfo.selBorderWidth < 0) { - canvasPtr->textInfo.selBorderWidth = 0; - Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved3); - canvasPtr->textInfo.reserved3 = Tcl_NewIntObj(0); - Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved3); - } if (width < 0) { width = 0; Tcl_DecrRefCount(canvasPtr->widthObj); @@ -2350,12 +2332,21 @@ ConfigureCanvas( canvasPtr->inset = borderWidth + highlightWidth; if (canvasPtr->textInfo.insertBorderWidth < 0) { canvasPtr->textInfo.insertBorderWidth = 0; + Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved1); + canvasPtr->textInfo.reserved1 = Tcl_NewIntObj(0); + Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved1); } if (canvasPtr->textInfo.insertWidth < 0) { canvasPtr->textInfo.insertWidth = 0; + Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved2); + canvasPtr->textInfo.reserved2 = Tcl_NewIntObj(0); + Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved2); } if (canvasPtr->textInfo.selBorderWidth < 0) { canvasPtr->textInfo.selBorderWidth = 0; + Tcl_DecrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved3); + canvasPtr->textInfo.reserved3 = Tcl_NewIntObj(0); + Tcl_IncrRefCount((Tcl_Obj *)canvasPtr->textInfo.reserved3); } gcValues.function = GXcopy; diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index 97f57c2..e107546 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -190,7 +190,7 @@ static void DestroyMenuButton(void *memPtr); int Tk_MenubuttonObjCmd( - void *dummy, /* NULL. */ + TCL_UNUSED(void *), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -198,7 +198,6 @@ Tk_MenubuttonObjCmd( TkMenuButton *mbPtr; Tk_OptionTable optionTable; Tk_Window tkwin; - (void)dummy; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?"); @@ -544,36 +543,27 @@ ConfigureMenuButton( Tk_GetPixelsFromObj(NULL, mbPtr->tkwin, mbPtr->padYObj, &padY); if (borderWidth < 0) { borderWidth = 0; - Tcl_DecrRefCount(mbPtr->borderWidthObj); - mbPtr->borderWidthObj = Tcl_NewIntObj(0); - Tcl_IncrRefCount(mbPtr->borderWidthObj); + Tcl_DecrRefCount(mbPtr->borderWidthObj); + mbPtr->borderWidthObj = Tcl_NewIntObj(0); + Tcl_IncrRefCount(mbPtr->borderWidthObj); } if (highlightWidth < 0) { highlightWidth = 0; - Tcl_DecrRefCount(mbPtr->highlightWidthObj); - mbPtr->highlightWidthObj = Tcl_NewIntObj(0); - Tcl_IncrRefCount(mbPtr->highlightWidthObj); + Tcl_DecrRefCount(mbPtr->highlightWidthObj); + mbPtr->highlightWidthObj = Tcl_NewIntObj(0); + Tcl_IncrRefCount(mbPtr->highlightWidthObj); } if (padX < 0) { padX = 0; - if (mbPtr->padXObj) { - Tcl_DecrRefCount(mbPtr->padXObj); - } - mbPtr->padXObj = Tcl_NewIntObj(0); - Tcl_IncrRefCount(mbPtr->padXObj); + Tcl_DecrRefCount(mbPtr->padXObj); + mbPtr->padXObj = Tcl_NewIntObj(0); + Tcl_IncrRefCount(mbPtr->padXObj); } if (padY < 0) { padY = 0; - if (mbPtr->padYObj) { - Tcl_DecrRefCount(mbPtr->padYObj); - } - mbPtr->padYObj = Tcl_NewIntObj(0); - Tcl_IncrRefCount(mbPtr->padYObj); - if (mbPtr->padYObj) { - Tcl_DecrRefCount(mbPtr->padYObj); - } - mbPtr->padYObj = Tcl_NewIntObj(0); - Tcl_IncrRefCount(mbPtr->padYObj); + Tcl_DecrRefCount(mbPtr->padYObj); + mbPtr->padYObj = Tcl_NewIntObj(0); + Tcl_IncrRefCount(mbPtr->padYObj); } /* @@ -971,19 +961,14 @@ MenuButtonTextVarProc( static void MenuButtonImageProc( void *clientData, /* Pointer to widget record. */ - int x, int y, /* Upper left pixel (within image) that must - * be redisplayed. */ - int width, int height, /* Dimensions of area to redisplay (may be <= - * 0). */ - int imgWidth, int imgHeight)/* New dimensions of image. */ + TCL_UNUSED(int), /* x, Upper left pixel (within image) that must */ + TCL_UNUSED(int), /* y, be redisplayed. */ + TCL_UNUSED(int), /* width, Dimensions of area to redisplay (may be <= */ + TCL_UNUSED(int), /* height, 0). */ + TCL_UNUSED(int), /* imgWidth, New dimensions of image. */ + TCL_UNUSED(int)) /* imgHeight */ { TkMenuButton *mbPtr = (TkMenuButton *)clientData; - (void)x; - (void)y; - (void)width; - (void)height; - (void)imgWidth; - (void)imgHeight; if (mbPtr->tkwin != NULL) { TkpComputeMenuButtonGeometry(mbPtr); diff --git a/generic/tkPointer.c b/generic/tkPointer.c index 03dbf1c..b77abbe 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -416,23 +416,16 @@ int XGrabPointer( Display *display, Window grab_window, - Bool owner_events, - unsigned int event_mask, - int pointer_mode, - int keyboard_mode, - Window confine_to, - Cursor cursor, - Time time) + TCL_UNUSED(Bool), /* owner_events */ + TCL_UNUSED(unsigned int), /* event_mask */ + TCL_UNUSED(int), /* pointer_mode */ + TCL_UNUSED(int), /* keyboard_mode */ + TCL_UNUSED(Window), /* confine_to */ + TCL_UNUSED(Cursor), /* cursor */ + TCL_UNUSED(Time)) /* time */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - (void)owner_events; - (void)event_mask; - (void)pointer_mode; - (void)keyboard_mode; - (void)confine_to; - (void)cursor; - (void)time; LastKnownRequestProcessed(display)++; tsdPtr->grabWinPtr = (TkWindow *) Tk_IdToWindow(display, grab_window); @@ -464,11 +457,10 @@ XGrabPointer( int XUngrabPointer( Display *display, - Time time) + TCL_UNUSED(Time)) /* time */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - (void)time; LastKnownRequestProcessed(display)++; tsdPtr->grabWinPtr = NULL; @@ -588,12 +580,11 @@ int XDefineCursor( Display *display, Window w, - Cursor cursor) + TCL_UNUSED(Cursor)) /* cursor */ { TkWindow *winPtr = (TkWindow *) Tk_IdToWindow(display, w); ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - (void)cursor; if (tsdPtr->cursorWinPtr == winPtr) { UpdateCursor(winPtr); diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index e909128..9a97d00 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -58,7 +58,7 @@ doNothing(void) # define TkpRedrawWidget ((void (*)(Tk_Window))(void *)doNothing) # define TkpDefineNativeBitmaps ((void (*)(void))(void *)doNothing) # define TkpCreateNativeBitmap ((Pixmap (*)(Display *, const void *))(void *)doNothing) -# define TkpGetNativeAppBitmap ((Pixmap (*)(Display *, const char*, int *, int *))(void *)doNothing) +# define TkpGetNativeAppBitmap ((Pixmap (*)(Display *, const char *, int *, int *))(void *)doNothing) #endif #ifdef _WIN32 |