From 92e2ba46ad1a1513acb272c6c53aa3ad17a3e481 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Sun, 28 Oct 2012 01:24:40 -0700 Subject: [PATCH] Add "ToDo" comments at code which works around wxWidgets 2.9.4 bugs reminding us to remove the extra code when bugs are fixed in wxWidgets --- checkin_notes | 4 ++++ clientgui/AdvancedFrame.cpp | 3 +++ clientgui/AdvancedFrame.h | 2 ++ clientgui/sg_BoincSimpleFrame.cpp | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index 836b479356..1d8a9d434e 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6252,6 +6252,10 @@ Charlie 26 Oct 2012 Charlie 28 Oct 2012 - Mac: Work around apparent refresh bug in wxCarbon 2.9.4 wxGenericListCtrl. + - Add "ToDo" comments at code which works around wxWidgets 2.9.4 bugs + reminding us to remove the extra code when bugs are fixed in wxWidgets. clientgui/ + AdvancedFrame.cpp,.h DlgEventLog.cpp + sg_BoincSimpleFrame.cpp diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 56939a4364..17a3797b53 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -195,6 +195,8 @@ BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame) EVT_SIZE(CAdvancedFrame::OnSize) EVT_MOVE(CAdvancedFrame::OnMove) #ifdef __WXMAC__ +// Work around an apparent bug in wxCarbon 2.9.4 +// TODO: remove this when the wxCarbon bug is fixed EVT_SHOW( CAdvancedFrame::OnShow ) #endif END_EVENT_TABLE () @@ -1040,6 +1042,7 @@ void CAdvancedFrame::OnMove(wxMoveEvent& event) { #ifdef __WXMAC__ // Work around an apparent bug in wxCarbon 2.9.4 +// TODO: remove this when the wxCarbon bug is fixed void CAdvancedFrame::OnShow(wxShowEvent& event) { wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnShow - Function Begin")); diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h index df306279fe..cdb08591e8 100644 --- a/clientgui/AdvancedFrame.h +++ b/clientgui/AdvancedFrame.h @@ -132,6 +132,8 @@ private: void OnSize(wxSizeEvent& event); void OnMove(wxMoveEvent& event); #ifdef __WXMAC__ +// Work around an apparent bug in wxCarbon 2.9.4 +// TODO: remove this when the wxCarbon bug is fixed void OnShow(wxShowEvent& event); #endif diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp index 6269081618..0e0bf4d880 100755 --- a/clientgui/sg_BoincSimpleFrame.cpp +++ b/clientgui/sg_BoincSimpleFrame.cpp @@ -814,7 +814,8 @@ void CSimpleGUIPanel::SetBackgroundBitmap() { dc.SetBackground(bgBrush); dc.Clear(); #ifdef __WXMAC__ - // Work around an apparent bug in wxMemoryDC::Clear() + // Work around an apparent bug in wxMemoryDC::Clear() in wxCarbon 2.9.4 + // TODO: remove this when the wxCarbon bug is fixed dc.SetBrush(bgBrush); wxPen bgPen(bgColor); dc.SetPen(bgPen);