Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=6532
This commit is contained in:
Charlie Fenton 2005-07-06 06:41:27 +00:00
parent 8daba3cd79
commit 2ac5b0497c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clientgui/BOINCTaskBar.cpp
View File

@ -435,7 +435,8 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* menu) {
} }
#ifdef __WXMAC__ #ifdef __WXMAC__
WindowRef win = ActiveNonFloatingWindow(); // WindowRef win = ActiveNonFloatingWindow();
WindowRef win = FrontWindow();
WindowModality modality = kWindowModalityNone; WindowModality modality = kWindowModalityNone;
wxMenuItem *item; wxMenuItem *item;
unsigned int i; unsigned int i;

9
clientgui/mac/MacSysMenu.cpp
View File

@ -262,6 +262,15 @@ pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
pFrame->Show(); pFrame->Show();
pFrame->SendSizeEvent(); pFrame->SendSizeEvent();
} }
// If a modal dialog was open, make sure it remains in front
WindowRef win = GetWindowList();
WindowModality modality = kWindowModalityNone;
while (win) {
GetWindowModality(win, &modality, NULL);
if (modality == kWindowModalityAppModal)
BringToFront(win);
win = GetNextWindow(win);
}
break; break;
} }