[Commits] (davids) colheader - tweaks for dynamic renderer switching

[commits at osafoundation.org]

Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.69 1.70
internal/wxPython-2.5/wxPython/demo/ColumnHeader.py 1.26 1.27

Log message:

colheader - tweaks for dynamic renderer switching
r=TBD



ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.69&r2=text&tr2=1.70
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/demo/ColumnHeader.py.diff?r1=text&tr1=1.26&r2=text&tr2=1.27

Index: internal/wxPython-2.5/wxPython/demo/ColumnHeader.py
diff -u internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.26 internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.27
--- internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.26	Mon Apr 18 10:19:30 2005
+++ internal/wxPython-2.5/wxPython/demo/ColumnHeader.py	Mon Apr 18 12:30:33 2005
@@ -94,13 +94,17 @@
         self.Bind( wx.EVT_CHECKBOX, self.OnTestEnableCheckBox, cb1 )
         cb1.SetValue( ch1.IsEnabled() )
 
-        cb2 = wx.CheckBox( self, -1, "Visible Selection", (self.colStartX, miscControlsY + 25), (150, 20), wx.NO_BORDER )
-        self.Bind( wx.EVT_CHECKBOX, self.OnTestVisibleSelectionCheckBox, cb2 )
-        cb2.SetValue( ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_VisibleSelection ) )
-
-        cb3 = wx.CheckBox( self, -1, "Proportional Resizing", (self.colStartX, miscControlsY + 50), (200, 20), wx.NO_BORDER )
-        self.Bind( wx.EVT_CHECKBOX, self.OnTestProportionalResizingCheckBox, cb3 )
-        cb3.SetValue( ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_ProportionalResizing ) )
+        cb2 = wx.CheckBox( self, -1, "Generic Renderer", (self.colStartX, miscControlsY + 25), (150, 20), wx.NO_BORDER )
+        self.Bind( wx.EVT_CHECKBOX, self.OnTestGenericRendererCheckBox, cb2 )
+        cb2.SetValue( ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_GenericRenderer ) )
+
+        cb3 = wx.CheckBox( self, -1, "Visible Selection", (self.colStartX, miscControlsY + 50), (200, 20), wx.NO_BORDER )
+        self.Bind( wx.EVT_CHECKBOX, self.OnTestVisibleSelectionCheckBox, cb3 )
+        cb3.SetValue( ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_VisibleSelection ) )
+
+        cb4 = wx.CheckBox( self, -1, "Proportional Resizing", (self.colStartX, miscControlsY + 75), (200, 20), wx.NO_BORDER )
+        self.Bind( wx.EVT_CHECKBOX, self.OnTestProportionalResizingCheckBox, cb4 )
+        cb4.SetValue( ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_ProportionalResizing ) )
 
         self.colStartX = 175
 
@@ -174,6 +178,13 @@
         self.ch2.Enable( curEnabled )
         self.l0.SetLabel( "enabled (%d)" %(curEnabled) )
 
+    def OnTestGenericRendererCheckBox( self, event ):
+        curEnabled = self.ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_GenericRenderer )
+        curEnabled = not curEnabled
+        self.ch1.SetFlagAttribute( wx.colheader.CH_FLAGATTR_GenericRenderer, curEnabled )
+        self.ch2.SetFlagAttribute( wx.colheader.CH_FLAGATTR_GenericRenderer, curEnabled )
+        self.l0.SetLabel( "generic renderer (%d)" %(curEnabled) )
+
     def OnTestVisibleSelectionCheckBox( self, event ):
         curEnabled = self.ch1.GetFlagAttribute( wx.colheader.CH_FLAGATTR_VisibleSelection )
         curEnabled = not curEnabled

Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.69 internal/wxPython-2.5/src/generic/colheader.cpp:1.70
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.69	Mon Apr 18 10:19:29 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp	Mon Apr 18 12:30:33 2005
@@ -584,13 +584,11 @@
 
 	m_SelectionDrawStyle = styleValue;
 
-#if !defined(__WXMAC__)
 	if (m_ItemSelected >= 0)
 	{
 		RefreshItem( m_ItemSelected );
 		SetViewDirty();
 	}
-#endif
 }
 
 bool wxColumnHeader::GetFlagAttribute(
@@ -641,10 +639,13 @@
 		break;
 
 	case CH_FLAGATTR_GenericRenderer:
+#if defined(__WXMSW__) || defined(__WXMAC__)
 		if (m_BUseGenericRenderer != bFlagValue)
 		{
 			m_BUseGenericRenderer = bFlagValue;
+			SetViewDirty();
 		}
+#endif
 		break;
 
 	case CH_FLAGATTR_VisibleSelection: