Author: manolo
Date: 2011-03-24 05:58:32 -0700 (Thu, 24 Mar 2011)
New Revision: 8530
Log:
Fix STR #2594: the focus after creating a new window was not set correctly
because some code present in Fl_mac.cxx was not reflected in Fl_cocoa.mm.
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2011-03-23 12:49:30 UTC (rev 8529)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2011-03-24 12:58:32 UTC (rev 8530)
@@ -1034,6 +1034,7 @@
}
- (void)windowDidMove:(NSNotification *)notif;
- (void)windowDidResize:(NSNotification *)notif;
+- (void)windowDidResignKey:(NSNotification *)notif;
- (void)windowDidBecomeKey:(NSNotification *)notif;
- (void)windowDidBecomeMain:(NSNotification *)notif;
- (void)windowDidDeminiaturize:(NSNotification *)notif;
@@ -1076,6 +1077,12 @@
(int)r.size.width,
(int)r.size.height);
}
+- (void)windowDidResignKey:(NSNotification *)notif
+{
+ FLWindow *nsw = (FLWindow*)[notif object];
+ Fl_Window *window = [nsw getFl_Window];
+ Fl::handle( FL_UNFOCUS, window);
+}
- (void)windowDidBecomeKey:(NSNotification *)notif
{
FLWindow *nsw = (FLWindow*)[notif object];
@@ -2024,6 +2031,8 @@
Fl_Tooltip::enter(0);
}
[cw makeKeyAndOrderFront:nil];
+ if (winlevel != NSMainMenuWindowLevel) Fl::handle(FL_FOCUS, w);
+ Fl::handle(FL_SHOW, w);
Fl::first_window(w);
[cw setDelegate:mydelegate];
if (fl_show_iconic) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
