gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore possibility to run fl_open_display() within a static initializer.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12578 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-12-03 15:46:12 +00:00
parent f609261697
commit 6586b77975
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fl_cocoa.mm
View File

@ -3776,7 +3776,7 @@ static void createAppleMenu(void)
NSMenuItem *menuItem;
NSString *title;
SEL infodictSEL = (fl_mac_os_version >= 100200 ? @selector(localizedInfoDictionary) : @selector(infoDictionary));
SEL infodictSEL = (Fl_Darwin_System_Driver::calc_mac_os_version() >= 100200 ? @selector(localizedInfoDictionary) : @selector(infoDictionary));
NSString *nsappname = [[[NSBundle mainBundle] performSelector:infodictSEL] objectForKey:@"CFBundleName"];
if (nsappname == nil)
nsappname = [[NSProcessInfo processInfo] processName];
@ -4389,7 +4389,7 @@ int Fl_Darwin_System_Driver::calc_mac_os_version() {
sscanf(s, "%d.%d.%d", &M, &m, &b);
}
[localPool release];
return M*10000 + m*100 + b;
return fl_mac_os_version = M*10000 + m*100 + b;
}
//