summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2014-11-17 16:08:23 +0000
committerManolo Gouy <Manolo>2014-11-17 16:08:23 +0000
commitb8a1618c0afa136e2ba3bb54ee87129655630873 (patch)
treec180fccd3c766c8645461ac337ce8690f0c93490
parent537ea4a7e1a622cfb4795c8d76b8ccb24b2c49d0 (diff)
Implement applicationDidUpdate differently according to running OS version.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10459 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 1ab0118d9..09d42bdd2 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1380,8 +1380,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
}
- (void)applicationDidUpdate:(NSNotification *)aNotification
{
- if ((fl_mac_os_version >= 100500) && (im_enabled != -1) &&
- (TSMGetActiveDocument != NULL)) {
+ if ((im_enabled != -1) && (TSMGetActiveDocument != NULL)) {
TSMDocumentID newDoc;
// It is extremely unclear when Cocoa decides to create/update
// the input context, but debugging reveals that it is done
@@ -1478,6 +1477,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
@interface FLAppDelegateBefore10_5 : FLAppDelegate
- (void)applicationDidUnhide:(NSNotification *)notify;
+- (void)applicationDidUpdate:(NSNotification *)aNotification;
@end
@implementation FLAppDelegateBefore10_5
- (void)applicationDidUnhide:(NSNotification *)notify
@@ -1490,6 +1490,9 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
}
fl_unlock_function();
}
+- (void)applicationDidUpdate:(NSNotification *)aNotification
+{
+}
@end
/*