mirror of
https://github.com/fltk/fltk.git
synced 2026-05-27 19:10:24 +08:00
Fix STR #2524: no more NSAutoreleaseNoPool messages.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8285 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -1890,8 +1890,6 @@ void Fl_X::make(Fl_Window* w)
|
|||||||
fl_show_iconic = 0;
|
fl_show_iconic = 0;
|
||||||
}
|
}
|
||||||
else { // create a desktop window
|
else { // create a desktop window
|
||||||
NSAutoreleasePool *localPool;
|
|
||||||
localPool = [[NSAutoreleasePool alloc] init];
|
|
||||||
Fl_Group::current(0);
|
Fl_Group::current(0);
|
||||||
fl_open_display();
|
fl_open_display();
|
||||||
NSInteger winlevel = NSNormalWindowLevel;
|
NSInteger winlevel = NSNormalWindowLevel;
|
||||||
@@ -2045,7 +2043,6 @@ void Fl_X::make(Fl_Window* w)
|
|||||||
Fl::e_number = old_event;
|
Fl::e_number = old_event;
|
||||||
|
|
||||||
if (w->modal()) { Fl::modal_ = w; fl_fix_focus(); }
|
if (w->modal()) { Fl::modal_ = w; fl_fix_focus(); }
|
||||||
[localPool release];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2917,8 +2914,6 @@ static void createAppleMenu(void)
|
|||||||
|
|
||||||
void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut)
|
void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut)
|
||||||
{
|
{
|
||||||
NSAutoreleasePool *localPool;
|
|
||||||
localPool = [[NSAutoreleasePool alloc] init];
|
|
||||||
fl_open_display();
|
fl_open_display();
|
||||||
Fl_Menu_Item aboutItem;
|
Fl_Menu_Item aboutItem;
|
||||||
memset(&aboutItem, 0, sizeof(Fl_Menu_Item));
|
memset(&aboutItem, 0, sizeof(Fl_Menu_Item));
|
||||||
@@ -2939,7 +2934,6 @@ void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut)
|
|||||||
[appleMenu insertItem:item atIndex:0];
|
[appleMenu insertItem:item atIndex:0];
|
||||||
CFRelease(cfname);
|
CFRelease(cfname);
|
||||||
[item setTarget:item];
|
[item setTarget:item];
|
||||||
[localPool release];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *remove_ampersand(const char *s)
|
static char *remove_ampersand(const char *s)
|
||||||
|
|||||||
Reference in New Issue
Block a user