*** empty log message ***

svn path=/trunk/boinc/; revision=10075
This commit is contained in:
Charlie Fenton 2006-05-01 23:35:27 +00:00
parent e23b1fdf5e
commit 4910ea1417
2 changed files with 22 additions and 1 deletions

View File

@ -4351,3 +4351,10 @@ Rom 1 May 2006
boinc_ss.vcproj
boincmgr_curl.vcproj
libboinc.vcproj
Charlie 1 May 2006
- Mac: Fix bugs when linking with wxMac-2.6.3.
clientgui/
mac/
MacSysMenu.cpp

View File

@ -170,6 +170,20 @@ pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
pMSM = wxGetApp().GetMacSystemMenu();
// wxMac-2.6.3 "helpfully" converts wxID_ABOUT to kHICommandAbout, wxID_EXIT to kHICommandQuit,
// wxID_PREFERENCES to kHICommandPreferences
switch (commandID) {
case kHICommandAbout:
commandID = wxID_ABOUT;
break;
case kHICommandPreferences:
commandID = wxID_PREFERENCES;
break;
case kHICommandQuit:
commandID = wxID_EXIT;
break;
}
if (commandID == wxID_ABOUT)
pMSM->SetOpeningAboutDlg(true);
@ -183,7 +197,7 @@ pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
baseMenu = (pMSM->GetCurrentMenu());
baseMenuRef = (MenuRef)(baseMenu->GetHMenu());
err = GetIndMenuItemWithCommandID(baseMenuRef, commandID, 1, NULL, &menuItemIndex);
err = GetIndMenuItemWithCommandID(baseMenuRef, command.commandID, 1, NULL, &menuItemIndex);
if (err)
return eventNotHandledErr; // Command not found in our menu