diff options
| author | Manolo Gouy <Manolo> | 2010-12-01 18:31:23 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-12-01 18:31:23 +0000 |
| commit | 2f8b7e47c2e3b2e3ecabd0711e8daf735f32f09d (patch) | |
| tree | fffcfc5d687ab3d345fa087321ec23fc9acd93c6 | |
| parent | bbb273cb3a6530673c18f4e98cde324d378f0ee4 (diff) | |
Should fix STR #2464 by not calling fl_open_display when running fluid in command line mode
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7934 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/fluid.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 4832e2d37..8374a0ef7 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -2352,12 +2352,12 @@ int main(int argc,char **argv) { make_main_window(); -#ifdef __APPLE__ - fl_open_callback(apple_open_cb); -#endif // __APPLE__ if (c) set_filename(c); if (!compile_only) { +#ifdef __APPLE__ + fl_open_callback(apple_open_cb); +#endif // __APPLE__ Fl::visual((Fl_Mode)(FL_DOUBLE|FL_INDEX)); Fl_File_Icon::load_system_icons(); main_window->callback(exit_cb); diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 79ef1180d..96f65329f 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -1447,12 +1447,14 @@ void fl_close_display() { // Gets the border sizes and the titlebar size static void get_window_frame_sizes(int &bx, int &by, int &bt) { - fl_open_display(); + NSAutoreleasePool *localPool; + localPool = [[NSAutoreleasePool alloc] init]; NSRect inside = { {20,20}, {100,100} }; NSRect outside = [NSWindow frameRectForContentRect:inside styleMask:NSTitledWindowMask]; bx = int(outside.origin.x - inside.origin.x); by = int(outside.origin.y - inside.origin.y); bt = int(outside.size.height - inside.size.height - by); + [localPool release]; } /* |