summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXButton.c
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/tkMacOSXButton.c')
-rw-r--r--macosx/tkMacOSXButton.c58
1 files changed, 32 insertions, 26 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 78fc303..0878819 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.13 2006/03/28 02:44:12 das Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.14 2006/05/26 21:43:05 hobbs Exp $
*/
#include "tkMacOSXInt.h"
@@ -1009,33 +1009,39 @@ TkMacOSXDrawControl(
} else {
SetControlValue(mbPtr->control, 0);
}
-
+
if (!Tk_MacOSXIsAppInFront() || butPtr->state == STATE_DISABLED) {
- HiliteControl(mbPtr->control, kControlInactivePart);
- } else if (butPtr->state == STATE_ACTIVE) {
- if (mbPtr->params.isBevel) {
- HiliteControl(mbPtr->control, kControlButtonPart);
- } else {
- switch (butPtr->type) {
- case TYPE_BUTTON:
- HiliteControl(mbPtr->control, kControlButtonPart);
- break;
- case TYPE_RADIO_BUTTON:
- HiliteControl(mbPtr->control, kControlRadioButtonPart);
- break;
- case TYPE_CHECK_BUTTON:
- HiliteControl(mbPtr->control, kControlCheckBoxPart);
- break;
- }
- }
+ HiliteControl(mbPtr->control, kControlInactivePart);
} else {
- HiliteControl(mbPtr->control, kControlNoPart);
+ /*
+ * Use NoPart for normal and to ensure correct direct transition from
+ * disabled to active -state. [Bug 706446]
+ */
+ HiliteControl(mbPtr->control, kControlNoPart);
+
+ if (butPtr->state == STATE_ACTIVE) {
+ if (mbPtr->params.isBevel) {
+ HiliteControl(mbPtr->control, kControlButtonPart);
+ } else {
+ switch (butPtr->type) {
+ case TYPE_BUTTON:
+ HiliteControl(mbPtr->control, kControlButtonPart);
+ break;
+ case TYPE_RADIO_BUTTON:
+ HiliteControl(mbPtr->control, kControlRadioButtonPart);
+ break;
+ case TYPE_CHECK_BUTTON:
+ HiliteControl(mbPtr->control, kControlCheckBoxPart);
+ break;
+ }
+ }
+ }
}
UpdateControlColors(mbPtr);
-
- if ((butPtr->type == TYPE_BUTTON) ) {
+
+ if (butPtr->type == TYPE_BUTTON) {
Boolean isDefault;
-
+
if (butPtr->defaultState == STATE_ACTIVE) {
isDefault = true;
} else {
@@ -1043,7 +1049,7 @@ TkMacOSXDrawControl(
}
if ((err=SetControlData(mbPtr->control, kControlNoPart,
kControlPushButtonDefaultTag,
- sizeof(isDefault), (Ptr) &isDefault)) != noErr ) {
+ sizeof(isDefault), (Ptr) &isDefault)) != noErr) {
}
}
@@ -1055,10 +1061,10 @@ TkMacOSXDrawControl(
SetControlVisibility(mbPtr->control, true, true);
Draw1Control(mbPtr->userPane);
}
-
+
if (mbPtr->params.isBevel) {
KillPicture(mbPtr->bevelButtonContent.u.picture);
- }
+ }
}
/*