diff options
| author | das <das> | 2005-05-14 20:48:14 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:48:14 (GMT) |
| commit | 960c0c6bb29407c5e4328447895eefdbbf030ec6 (patch) | |
| tree | 2461f0c3bbbdbb7e3c8ac29e9bbb1dd5b651f950 /macosx/tkMacOSXButton.c | |
| parent | 750404ce63573b22bc387ec615ee3c6c6d807a0b (diff) | |
| download | tk-960c0c6bb29407c5e4328447895eefdbbf030ec6.zip tk-960c0c6bb29407c5e4328447895eefdbbf030ec6.tar.gz tk-960c0c6bb29407c5e4328447895eefdbbf030ec6.tar.bz2 | |
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXNotify.c: introduction of new tcl notifier based on
CFRunLoop allows replacement of the custom TkAqua notifier by a
standard tcl event source. Removes requirement of threaded tcl core
for TkAqua, allows to stub-link TkAqua against Tcl by removing use of
the unstubbed TclInitNotifier & TclFinalizeNotifier. [Tcl Patch 1202052]
* macosx/Wish.xcode/project.pbxproj:
* macosx/Wish.pbproj/project.pbxproj: stub-link TkAqua: build with
USE_TCL_STUBS and link against libtclstub instead of Tcl.framework,
unexport libtclstub symbols from Tk to avoid duplicate symbol warnings
when linking with both Tcl and Tk, fixes for gcc4.0 warnings.
* macosx/Wish.xcode/project.pbxproj: sync with Wish.pbproj changes
since 2004-11-19.
NOTE: to use this project, need to uncomment the tclConfig.h settings
at the top of tcl/unix/configure.in, autoconf and rebuild tcl !
* macosx/tkMacOSXBitmap.c:
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXDialog.c:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXKeyboard.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXXStubs.c: fixed gcc 4.0 warnings.
* unix/tcl.m4: sync with tcl
* unix/configure: autoconf-2.59
Diffstat (limited to 'macosx/tkMacOSXButton.c')
| -rw-r--r-- | macosx/tkMacOSXButton.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index 4fb3f2f..59fcc3f 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.11 2005/03/12 00:27:15 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXButton.c,v 1.12 2005/05/14 20:48:14 das Exp $ */ #include "tkButton.h" @@ -912,7 +912,6 @@ TkMacOSXDrawControl( TkWindow * winPtr; Rect paneRect; Rect cntrRect; - int hilitePart = -1; winPtr = (TkWindow *)butPtr->tkwin; @@ -975,7 +974,7 @@ TkMacOSXDrawControl( if ((mbPtr->info.image == NULL) && (mbPtr->info.bitmap == None) || (mbPtr->info.compound != COMPOUND_NONE)) { len = TkFontGetFirstTextLayout(butPtr->textLayout, - &font, controlTitle); + &font, (char*) controlTitle); controlTitle[len] = 0; } else { len = 0; @@ -984,7 +983,7 @@ TkMacOSXDrawControl( if (bcmp(mbPtr->controlTitle, controlTitle, len+1)) { CFStringRef cf; cf = CFStringCreateWithCString(NULL, - controlTitle, kCFStringEncodingUTF8); + (char*) controlTitle, kCFStringEncodingUTF8); if (cf != NULL) { SetControlTitleWithCFString(mbPtr->control, cf); CFRelease(cf); |