diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2016-01-31 00:54:18 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2016-01-31 00:54:18 (GMT) |
| commit | 312ef46823e21b861e68eeb0073936e15177c0f7 (patch) | |
| tree | 8722939c3a746c7214cecf7877de1b1287fd4f76 /macosx | |
| parent | 48ef3bc66f0806a4b54f4abb9888a5fc53e78d33 (diff) | |
| download | tk-312ef46823e21b861e68eeb0073936e15177c0f7.zip tk-312ef46823e21b861e68eeb0073936e15177c0f7.tar.gz tk-312ef46823e21b861e68eeb0073936e15177c0f7.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 | 3 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index adb78c6..35f4ab5 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 26eb3f5..8e353b4 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -59,9 +59,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 e635020..d892f4e 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -274,6 +274,9 @@ VISIBILITY_HIDDEN NSArray *_defaultHelpMenuItems; NSWindow *_windowWithMouse; NSAutoreleasePool *_mainPool; +#ifdef __i386__ + BOOL _poolProtected; +#endif } @property BOOL poolProtected; @end diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 87ec4c2..1997370 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -299,7 +299,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); } |