MGR: Mac updates for wxWidgets 2.9.5 (wxCocoa)

This commit is contained in:
Charlie Fenton 2013-08-23 05:43:53 -07:00
parent 3eb24b1ee1
commit 49f6704a1e
2 changed files with 3 additions and 6 deletions

View File

@ -28,10 +28,6 @@
#pragma interface "BOINCGUIApp.cpp"
#endif
#ifdef __WXMAC__
#include "mac/MacSysMenu.h" // Must be included before MainDocument.h
#endif
///
/// Which view is on display
///

View File

@ -80,6 +80,7 @@ void MacLocalizeBOINCMenu() {
MenuItemIndex itemIndex;
wxString originalText = wxEmptyString;
char originalCharStr[1024];
char shortName[128];
CFStringRef localizedText;
CFStringRef menuItemString;
OSStatus err;
@ -87,8 +88,8 @@ void MacLocalizeBOINCMenu() {
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxASSERT(pSkinAdvanced);
const wxChar *shortName = pSkinAdvanced->GetApplicationShortName().c_str();
if (!shortName) return; // Should never happen
strlcpy(shortName, pSkinAdvanced->GetApplicationShortName().utf8_str(), sizeof(shortName));
if (!shortName[0]) return; // Should never happen
err = GetIndMenuItemWithCommandID(NULL, kHICommandAbout, 1, &BOINCMenu, &itemIndex);
if (!err) {