diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp index 0b1dd14452..1e61bf42c6 100644 --- a/clientgui/BOINCListCtrl.cpp +++ b/clientgui/BOINCListCtrl.cpp @@ -242,7 +242,7 @@ void CBOINCListCtrl::DrawProgressBars() wxClientDC dc(this); m_bProgressBarEventPending = false; #else - wxWindowDC dc(GetMainWin()); // Available only in wxGenericListCtrl + wxClientDC dc(GetMainWin()); // Available only in wxGenericListCtrl #endif if (progressColumn < 0) { diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index 1356e9bf33..727b39e249 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -31,6 +31,7 @@ # Enable wxWidgets asserts in Release build 3/6/14 # Disable all wxWidgets debug support in Release build (revert 3/6/14 change) 5/29/14 # Fix wxListCtrl flicker when resizing columns in wxCocoa 3.0.0 6/13/14 +# Revise fix for wxListCtrl flicker to match the fix in wxWidgets trunk 6/19/14 # ## This script requires OS 10.6 or later ## @@ -118,25 +119,24 @@ fi echo "" -# Patch wxWidgets-3.0.0/src/generic/listctrl.cpp to eliminate flicker when resizing columns -if [ ! -f src/generic/listctrl.cpp.orig ]; then +# Patch wxWidgets-3.0.0/src/osx/carbon/dcclient.cpp to eliminate flicker when resizing columns +if [ ! -f src/osx/carbon/dcclient.cpp.orig ]; then cat >> /tmp/listctrl_cpp_diff << ENDOFFILE ---- src/generic/listctrl.cpp 2013-11-11 05:10:39.000000000 -0800 -+++ src/generic/listctrl_patched.cpp 2014-06-13 03:44:28.000000000 -0700 -@@ -3632,7 +3632,7 @@ +--- src/osx/carbon/dcclient.cpp 2014-06-12 22:15:31.000000000 -0700 ++++ src/osx/carbon/dcclient-patched.cpp 2014-06-19 01:04:58.000000000 -0700 +@@ -174,7 +174,7 @@ + + wxClientDCImpl::~wxClientDCImpl() { - const int lineHeight = GetLineHeight(); - -- wxClientDC dc( this ); -+ wxWindowDC dc( this ); - dc.SetFont( GetFont() ); - - const size_t count = GetItemCount(); +- if( GetGraphicsContext() && GetGraphicsContext()->GetNativeContext() ) ++if( GetGraphicsContext() && GetGraphicsContext()->GetNativeContext() && !m_release ) + Flush(); + } ENDOFFILE - patch -bfi /tmp/listctrl_cpp_diff src/generic/listctrl.cpp + patch -bfi /tmp/listctrl_cpp_diff src/osx/carbon/dcclient.cpp rm -f /tmp/listctrl_cpp_diff else - echo "src/generic/listctrl.cpp already patched" + echo "src/osx/carbon/dcclient.cpp already patched" fi echo ""