diff options
| author | culler <culler> | 2017-11-27 01:19:55 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-11-27 01:19:55 (GMT) |
| commit | 18f5785d52c173bb4acf4b346ed375bd31cc83e3 (patch) | |
| tree | 5f43f329d3bc1d14e5d15bfeeb2e9000072780a3 /macosx/tkMacOSXInit.c | |
| parent | 1a9ed03cff3ca2e3ce2fba690a478d0651c55d12 (diff) | |
| download | tk-18f5785d52c173bb4acf4b346ed375bd31cc83e3.zip tk-18f5785d52c173bb4acf4b346ed375bd31cc83e3.tar.gz tk-18f5785d52c173bb4acf4b346ed375bd31cc83e3.tar.bz2 | |
Remove all conditional code which requires a minimum deployment target
of OSX 10.5. Currently the build fails for 10.5 and it seems pointless
to try fixing it now, more than 8 years after Apple declared it obsolete.
Diffstat (limited to 'macosx/tkMacOSXInit.c')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 7b91f97..d2ae147 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -33,22 +33,11 @@ long tkMacOSXMacOSXVersion = 0; #pragma mark TKApplication(TKInit) -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 -#define NSTextInputContextKeyboardSelectionDidChangeNotification @"NSTextInputContextKeyboardSelectionDidChangeNotification" -static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) { - [[NSNotificationCenter defaultCenter] postNotificationName:NSTextInputContextKeyboardSelectionDidChangeNotification object:nil userInfo:nil]; -} -#endif - @interface TKApplication(TKKeyboard) - (void) keyboardChanged: (NSNotification *) notification; @end -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 #define TKApplication_NSApplicationDelegate <NSApplicationDelegate> -#else -#define TKApplication_NSApplicationDelegate -#endif @interface TKApplication(TKWindowEvent) TKApplication_NSApplicationDelegate - (void) _setupWindowNotifications; @end @@ -106,9 +95,6 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt observe(NSApplicationDidChangeScreenParametersNotification, displayChanged:); observe(NSTextInputContextKeyboardSelectionDidChangeNotification, keyboardChanged:); #undef observe -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(), NULL, &keyboardChanged, kTISNotifySelectedKeyboardInputSourceChanged, NULL, CFNotificationSuspensionBehaviorCoalesce); -#endif } -(void)applicationWillFinishLaunching:(NSNotification *)aNotification @@ -273,8 +259,8 @@ TkpInit( * Initialize/check OS version variable for runtime checks. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -# error Mac OS X 10.5 required +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 +# error Mac OS X 10.6 required #endif if (!uname(&name)) { |