Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Fix wxListCtrl / CBOINCListCtrl flicker on Mac when resizing columns under wxCocoa 3.0.0.

This commit is contained in:
Charlie Fenton 2014-06-13 04:02:00 -07:00
parent 5fd1656935
commit f8966bf93e
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientgui/BOINCListCtrl.cpp
View File

@ -242,7 +242,7 @@ void CBOINCListCtrl::DrawProgressBars()
wxClientDC dc(this); wxClientDC dc(this);
m_bProgressBarEventPending = false; m_bProgressBarEventPending = false;
#else #else
wxClientDC dc(GetMainWin()); // Available only in wxGenericListCtrl wxWindowDC dc(GetMainWin()); // Available only in wxGenericListCtrl
#endif #endif
if (progressColumn < 0) { if (progressColumn < 0) {

25
mac_build/buildWxMac.sh
View File

@ -30,6 +30,7 @@
# Patch to fix crash on OS 10.5 or 10.6 when built on OS 10.7+ 2/18/14 # Patch to fix crash on OS 10.5 or 10.6 when built on OS 10.7+ 2/18/14
# Enable wxWidgets asserts in Release build 3/6/14 # 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 # 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
# #
## This script requires OS 10.6 or later ## This script requires OS 10.6 or later
## ##
@ -117,6 +118,30 @@ fi
echo "" echo ""
# Patch wxWidgets-3.0.0/src/generic/listctrl.cpp to eliminate flicker when resizing columns
if [ ! -f src/generic/listctrl.cpp.orig ]; then
cat >> /tmp/listctrl_cpp_diff << ENDOFFILE
--- /Volumes/Cheer/BOINC_GIT/wxWidgets-3.0.0/src/generic/listctrl.cpp 2013-11-11 05:10:39.000000000 -0800
+++ /Volumes/Cheer/BOINC_GIT/wxWidgets-3.0.0/src/generic/listctrl_patched.cpp 2014-06-13 03:44:28.000000000 -0700
@@ -3632,7 +3632,7 @@
{
const int lineHeight = GetLineHeight();
- wxClientDC dc( this );
+ wxWindowDC dc( this );
dc.SetFont( GetFont() );
const size_t count = GetItemCount();
ENDOFFILE
patch -bfi /tmp/listctrl_cpp_diff src/generic/listctrl.cpp
rm -f /tmp/listctrl_cpp_diff
else
echo "src/generic/listctrl.cpp already patched"
fi
echo ""
if [ "$1" = "-clean" ]; then if [ "$1" = "-clean" ]; then
doclean="clean " doclean="clean "