From a862fa58f45bf68d7bcd2877269801653e82ac09 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 14 Apr 2014 04:25:30 -0700 Subject: [PATCH] MGR: Add comments about know bugs in wxCocoa 3.0.0. --- clientgui/BOINCGUIApp.h | 7 ++++++- clientgui/DlgSelectComputer.cpp | 4 +++- clientgui/mac/BOINCGUIApp.mm | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h index 644e352ad5..79e6370572 100644 --- a/clientgui/BOINCGUIApp.h +++ b/clientgui/BOINCGUIApp.h @@ -207,10 +207,15 @@ public: // void HideThisApp(void); +#if !wxCHECK_VERSION(3,0,0) +// This should be fixed after wxCocoa 3.0.0: +// http://trac.wxwidgets.org/ticket/16156 + // Override standard wxCocoa wxApp::CallOnInit() to allow Manager // to run properly when launched hidden on login via Login Item. bool CallOnInit(); - +#endif + void CheckPartialActivation(); #endif diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp index f12964db37..40cbe7a17d 100644 --- a/clientgui/DlgSelectComputer.cpp +++ b/clientgui/DlgSelectComputer.cpp @@ -180,7 +180,9 @@ void CDlgSelectComputer::CreateControls(bool required) m_Shortcuts[2].Set(wxACCEL_CTRL, 'v', wxID_PASTE); m_pAccelTable = new wxAcceleratorTable(3, m_Shortcuts); m_ComputerPasswordCtrl->SetAcceleratorTable(*m_pAccelTable); - // I don't know why this works for m_ComputerPasswordCtrl but not m_ComputerNameCtrl + + // This does not work for m_ComputerNameCtrl under wxCocoa 3.0.0 + // because of a known bug: http://trac.wxwidgets.org/ticket/14953 m_ComputerNameCtrl->SetAcceleratorTable(*m_pAccelTable); #endif diff --git a/clientgui/mac/BOINCGUIApp.mm b/clientgui/mac/BOINCGUIApp.mm index 1b5a7a2716..1b72e1d7df 100644 --- a/clientgui/mac/BOINCGUIApp.mm +++ b/clientgui/mac/BOINCGUIApp.mm @@ -21,6 +21,9 @@ #include "BOINCGUIApp.h" #import +#if !wxCHECK_VERSION(3,0,0) +// This should be fixed after wxCocoa 3.0.0: +// http://trac.wxwidgets.org/ticket/16156 // Cocoa routines which are part of CBOINCGUIApp // Override standard wxCocoa wxApp::CallOnInit() to allow Manager @@ -42,6 +45,7 @@ bool CBOINCGUIApp::CallOnInit() { [mypool release]; return retVal; } +#endif // Our application can get into a strange state