diff options
author | Joe Mistachkin <joe@mistachkin.com> | 2015-02-05 22:26:58 (GMT) |
---|---|---|
committer | Joe Mistachkin <joe@mistachkin.com> | 2015-02-05 22:26:58 (GMT) |
commit | 8e9e78d52fa9ba2522f175585e3299f03c5b82d0 (patch) | |
tree | fd2d0c47bc7f3a6d897ad98ded8ad583a8cb7f84 /macosx/tkMacOSXInit.c | |
parent | b15c525eedc93a453dfea94482bc1198e27748fc (diff) | |
parent | bedea5a5c74e0fb7f66c572836dc4d98a3285147 (diff) | |
download | tk-bindScriptCount.zip tk-bindScriptCount.tar.gz tk-bindScriptCount.tar.bz2 |
Merge updates from core-8-5-branch.bindScriptCount
Diffstat (limited to 'macosx/tkMacOSXInit.c')
-rw-r--r-- | macosx/tkMacOSXInit.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 1d14990..752ec48 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -33,7 +33,7 @@ static char scriptPath[PATH_MAX + 1] = ""; int tkMacOSXGCEnabled = 0; long tkMacOSXMacOSXVersion = 0; -#pragma mark TKApplication(TKInit) +#pragma mark TKApplication(TKInit) #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #define NSTextInputContextKeyboardSelectionDidChangeNotification @"NSTextInputContextKeyboardSelectionDidChangeNotification" @@ -55,10 +55,6 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt - (void)_setupWindowNotifications; @end -@interface TKApplication(TKScrlbr) -- (void)_setupScrollBarNotifications; -@end - @interface TKApplication(TKMenus) - (void)_setupMenus; @end @@ -87,11 +83,9 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt #endif } - (void)_setupEventLoop { - _running = 1; - if (!_appFlags._hasBeenRun) { - _appFlags._hasBeenRun = YES; - [self finishLaunching]; - } + + /*Remove private API calls here.*/ + [self finishLaunching]; [self setWindowsNeedUpdate:YES]; } - (void)_setup:(Tcl_Interp *)interp { @@ -104,7 +98,6 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt selector:@selector(_postedNotification:) name:nil object:nil]; #endif [self _setupWindowNotifications]; - [self _setupScrollBarNotifications]; [self _setupApplicationNotifications]; } - (NSString *)tkFrameworkImagePath:(NSString*)image { |