* 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.

4 files changed, 31 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d32057..4074ea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-09-25  Daniel Steffen  <das@users.sourceforge.net>
 
+	* 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.
+
 	* unix/configure:
 	* unix/configure.in:
 	* unix/tkConfig.sh.in: added TK_INCLUDE_SPEC to allow extensions to
diff --git a/library/demos/widget b/library/demos/widget
index f0ad7a7..ae32937 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -11,14 +11,14 @@ exec wish "$0" "$@"
 # ".tcl" files is this directory, which are sourced by this script
 # as needed.
 #
-# RCS: @(#) $Id: widget,v 1.15 2003/08/22 22:44:15 dkf Exp $
+# RCS: @(#) $Id: widget,v 1.16 2003/09/25 05:37:00 das Exp $
 
 eval destroy [winfo child .]
 package require msgcat
 ::msgcat::mcload [file join $tk_library demos]
 namespace import ::msgcat::mc
 wm title . [mc "Widget Demonstration"]
-if {$tcl_platform(platform) eq "unix"} {
+if {[tk windowingsystem] eq "x11"} {
     # This won't work everywhere, but there's no other way in core Tk
     # at the moment to display a coloured icon.
     image create photo TclPowered \
@@ -72,7 +72,7 @@ menu .menuBar -tearoff 0
 menu .menuBar.file -tearoff 0
 
 # On the Mac use the specia .apple menu for the about item
-if {[tk windowingsystem] eq "classic"} {
+if {[tk windowingsystem] eq "classic" || [tk windowingsystem] eq "aqua"} {
     .menuBar add cascade -menu .menuBar.apple
     menu .menuBar.apple -tearoff 0
     .menuBar.apple add command -label [mc "About..."] -command {aboutBox}
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 );
+        }
+    }
 }
 
 /*