diff options
Diffstat (limited to 'macosx/tkMacOSXButton.c')
| -rw-r--r-- | macosx/tkMacOSXButton.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index 6940a5a..184380f 100644 --- a/macosx/tkMacOSXButton.c +++ b/macosx/tkMacOSXButton.c @@ -23,7 +23,7 @@ #define FIRST_DRAW 2 #define ACTIVE 4 -#define MAX_VALUE 1 +#define MAX_VALUE 2 /* * Default insets for controls @@ -363,12 +363,10 @@ TkpDisplayButton( if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) { Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); -#if 0 } else if ((butPtr->tristateImage != NULL) && (butPtr->flags & TRISTATED)) { Tk_RedrawImage(butPtr->tristateImage, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); -#endif } else { Tk_RedrawImage(butPtr->image, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); @@ -412,12 +410,10 @@ TkpDisplayButton( if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) { Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); -#if 0 } else if ((butPtr->tristateImage != NULL) && (butPtr->flags & TRISTATED)) { Tk_RedrawImage(butPtr->tristateImage, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); -#endif } else { Tk_RedrawImage(butPtr->image, 0, 0, width, height, pixmap, imageXOffset, imageYOffset); @@ -898,7 +894,7 @@ TkMacOSXDrawControl( * The control has been previously initialised. * It may need to be re-initialised */ -#if 0 +#ifdef TK_REBUILD_TOPLEVEL rebuild = (winPtr->flags & TK_REBUILD_TOPLEVEL); winPtr->flags &= ~TK_REBUILD_TOPLEVEL; #else @@ -974,10 +970,8 @@ TkMacOSXDrawControl( if (butPtr->flags & SELECTED) { SetControlValue(mbPtr->control, 1); -#if 0 } else if (butPtr->flags & TRISTATED) { SetControlValue(mbPtr->control, 2); -#endif } else { SetControlValue(mbPtr->control, 0); } @@ -1123,11 +1117,9 @@ SetupBevelButton( if (butPtr->selectImage != NULL && (butPtr->flags & SELECTED)) { Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height, pixmap, 0, 0); -#if 0 } else if (butPtr->tristateImage != NULL && (butPtr->flags & TRISTATED)) { Tk_RedrawImage(butPtr->tristateImage, 0, 0, width, height, pixmap, 0, 0); -#endif } else if (butPtr->image != NULL) { Tk_RedrawImage(butPtr->image, 0, 0, width, height, pixmap, 0, 0); } else { |