diff options
| author | das <das> | 2003-09-25 05:36:59 (GMT) |
|---|---|---|
| committer | das <das> | 2003-09-25 05:36:59 (GMT) |
| commit | 70b0eceea88a9726074d5fd6be8d70453c7c5717 (patch) | |
| tree | 942ddd8b847078442e681b156b1e5b5d4cb92b8a /macosx | |
| parent | 9602bb473587aa0e5974dc784fe2f50cad24b8e9 (diff) | |
| download | tk-70b0eceea88a9726074d5fd6be8d70453c7c5717.zip tk-70b0eceea88a9726074d5fd6be8d70453c7c5717.tar.gz tk-70b0eceea88a9726074d5fd6be8d70453c7c5717.tar.bz2 | |
* library/demos/widget: don't create iconwindow on aqua, but add
about menu like on classic.
* macosx/Makefile: pass MAKEOVERRIDES to pxbuild.
* macosx/tkMacOSXButton.c: added -compound support for bevel buttons.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Makefile | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXButton.c | 22 |
2 files changed, 23 insertions, 3 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index b17677c..5882520 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.9 2003/07/18 02:02:28 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.10 2003/09/25 05:37:00 das Exp $ # ################################################################################ @@ -25,7 +25,7 @@ PBXBUILD = /usr/bin/pbxbuild BUILD = ${PBXBUILD} SYMROOT="${SYMROOT}" -target "${TARGET}" \ TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" \ - TCLSH_DIR="${TCLSH_DIR}" + TCLSH_DIR="${TCLSH_DIR}" ${MAKEOVERRIDES} DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index d14cfc2..b84fa44 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.4 2003/04/30 16:16:39 hobbs Exp $ + * RCS: @(#) $Id: tkMacOSXButton.c,v 1.5 2003/09/25 05:37:00 das Exp $ */ #include "tkButton.h" @@ -1171,6 +1171,26 @@ SetupBevelButton( "SetControlData BevelButtonGraphicAlign failed, %d\n", err ); } + if (butPtr->compound != COMPOUND_NONE) { + ControlButtonTextPlacement thePlacement = \ + kControlBevelButtonPlaceNormally; + if (butPtr->compound == COMPOUND_TOP) { + thePlacement = kControlBevelButtonPlaceBelowGraphic; + } else if (butPtr->compound == COMPOUND_BOTTOM) { + thePlacement = kControlBevelButtonPlaceAboveGraphic; + } else if (butPtr->compound == COMPOUND_LEFT) { + thePlacement = kControlBevelButtonPlaceToRightOfGraphic; + } else if (butPtr->compound == COMPOUND_RIGHT) { + thePlacement = kControlBevelButtonPlaceToLeftOfGraphic; + } + if ((err=SetControlData(controlHandle, kControlButtonPart, + kControlBevelButtonTextPlaceTag, + sizeof(ControlButtonTextPlacement), + (char *) &thePlacement)) != noErr ) { + fprintf(stderr, + "SetControlData BevelButtonTextPlace failed, %d\n", err ); + } + } } /* |