mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS: implement the Cocoa equivalent of Carbon's kEventWindowHidden handler.

Browse Source 
Positive effect visible with the clock demo.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8531 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-03-25 12:02:31 +00:00
parent 9fa8427b78
commit edd848aa9c
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Fl_cocoa.mm
View File

@ -1044,6 +1044,8 @@ extern "C" {
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender;
- (void)applicationDidBecomeActive:(NSNotification *)notify;
- (void)applicationWillResignActive:(NSNotification *)notify;
- (void)applicationWillHide:(NSNotification *)notify;
- (void)applicationWillUnhide:(NSNotification *)notify;
- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)client;
@end
@implementation FLDelegate
@ -1087,7 +1089,7 @@ extern "C" {
{
FLWindow *nsw = (FLWindow*)[notif object];
Fl_Window *window = [nsw getFl_Window];
Fl::handle( FL_FOCUS, window);
if ([nsw level] != NSMainMenuWindowLevel) Fl::handle( FL_FOCUS, window);
}
- (void)windowDidBecomeMain:(NSNotification *)notif
{
@ -1227,6 +1229,26 @@ extern "C" {
}
}
}
- (void)applicationWillHide:(NSNotification *)notify
{
Fl_X *x;
for (x = Fl_X::first;x;x = x->next) {
Fl_Window *window = x->w;
if ( !window->parent() ) Fl::handle( FL_HIDE, window);
}
}
- (void)applicationWillUnhide:(NSNotification *)notify
{
Fl_X *x;
for (x = Fl_X::first;x;x = x->next) {
FLWindow *cw = (FLWindow*)x->xid;
Fl_Window *window = x->w;
if ( !window->parent() ) {
if ([cw level] != NSMainMenuWindowLevel) Fl::handle( FL_FOCUS, window);
Fl::handle( FL_SHOW, window);
}
}
}
- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)client
{
NSRect rect={{0,0},{20,20}};
@ -3115,7 +3137,7 @@ void *Fl_Sys_Menu_Bar::doMenuOrItemOperation(Fl_Sys_Menu_Bar::menuOrItemOperatio
void Fl_X::set_key_window()
{
[(NSWindow*)xid makeKeyAndOrderFront:nil];
[(NSWindow*)xid makeKeyWindow];
}
static NSImage *imageFromText(const char *text, int *pwidth, int *pheight)