diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2016-01-31 00:53:25 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2016-01-31 00:53:25 (GMT) |
| commit | b5e22a7b7e4fd964d34f9d16aa7802fe7322636c (patch) | |
| tree | 3d501e7a93d6440379a101cb6a89bf29cce65b4d /macosx | |
| parent | c3777ebd3a31648fc5427b9536d2e304e9cbcf77 (diff) | |
| download | tk-b5e22a7b7e4fd964d34f9d16aa7802fe7322636c.zip tk-b5e22a7b7e4fd964d34f9d16aa7802fe7322636c.tar.gz tk-b5e22a7b7e4fd964d34f9d16aa7802fe7322636c.tar.bz2 | |
Fix build errors on i386 for Cocoa; thanks to Marc Culler for patch
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXButton.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXPrivate.h | 4 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index 59d394e..ebbcf09 100644 --- a/macosx/tkMacOSXButton.c +++ b/macosx/tkMacOSXButton.c @@ -289,10 +289,10 @@ TkpComputeButtonGeometry( if ( butPtr->indicatorOn ) { switch (butPtr->type) { case TYPE_RADIO_BUTTON: - GetThemeMetric(kThemeMetricRadioButtonWidth, &butPtr->indicatorDiameter); + GetThemeMetric(kThemeMetricRadioButtonWidth, (SInt32 *)&butPtr->indicatorDiameter); break; case TYPE_CHECK_BUTTON: - GetThemeMetric(kThemeMetricCheckBoxWidth, &butPtr->indicatorDiameter); + GetThemeMetric(kThemeMetricCheckBoxWidth, (SInt32 *)&butPtr->indicatorDiameter); break; default: break; diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index b965a38..33a60f2 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -57,9 +57,7 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt @end @implementation TKApplication -#ifndef __clang__ @synthesize poolProtected = _poolProtected; -#endif @end @implementation TKApplication(TKInit) diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index 2a411f6..65d60ce 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -276,6 +276,10 @@ VISIBILITY_HIDDEN NSArray *_defaultHelpMenuItems; NSWindow *_windowWithMouse; NSAutoreleasePool *_mainPool; +#ifdef __i386__ + /* The Objective C runtime used on i386 requires this. */ + BOOL _poolProtected; +#endif } @property BOOL poolProtected; @end diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 4753a40..f9611c5 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -298,7 +298,7 @@ static void TabElementSize( void *clientData, void *elementRecord, Tk_Window tkwin, int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) { - *heightPtr = GetThemeMetric(kThemeMetricLargeTabHeight, heightPtr); + GetThemeMetric(kThemeMetricLargeTabHeight, (SInt32 *)heightPtr); *paddingPtr = Ttk_MakePadding(0, 0, 0, 2); } |