diff options
| author | Manolo Gouy <Manolo> | 2011-03-01 11:58:36 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-03-01 11:58:36 +0000 |
| commit | f7d7eff7ad584b22ef43211f833073e0dad5ff10 (patch) | |
| tree | 150ebe681186c2972def5f93a298ddf15e399762 /src/Fl_cocoa.mm | |
| parent | 1a4fd8ecc3e7b16fcedca72a0f6326edf3feb06a (diff) | |
STR 2580: Fl::add_fd() now calls fl_open_display() because that is necessary for the fd event
to be recovered by the event loop. Before main() is called, only fl_mac_os_version is
initialized.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8488 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 57b03a889..eee31a9d7 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -293,6 +293,7 @@ static DataReady dataready; void DataReady::AddFD(int n, int events, void (*cb)(int, void*), void *v) { + fl_open_display(); // necessary for NSApp to be defined RemoveFD(n, events); int i = nfds++; if (i >= fd_array_size) @@ -1289,9 +1290,6 @@ void fl_open_display() { while (ign_event); fl_default_cursor = [NSCursor arrowCursor]; - SInt32 version; - Gestalt(gestaltSystemVersion, &version); - fl_mac_os_version = (int)version; // bring the application into foreground without a 'CARB' resource Boolean same_psn; |