Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migate to the new wxRendererNative::DrawItemSelectionRect function where available, and fix selected text color on Mac.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-11-19 06:47:48 +00:00
parent df0edf4443
commit 8bc0c17afc
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wxPython/wx/lib/customtreectrl.py
View File

@@ -4296,7 +4296,12 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
elif self._vistaselection: elif self._vistaselection:
self.DrawVistaRectangle(dc, itemrect, self._hasFocus) self.DrawVistaRectangle(dc, itemrect, self._hasFocus)
else: else:
dc.DrawRectangleRect(itemrect) if wx.Platform in ["__WXGTK2__", "__WXMAC__"]:
flags = wx.CONTROL_SELECTED
if self._hasFocus: flags = flags | wx.CONTROL_FOCUSED
wx.RendererNative.Get().DrawItemSelectionRect(self, dc, itemrect, flags)
else:
dc.DrawRectangleRect(itemrect)
else: else:
@@ -4324,7 +4329,12 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
elif self._vistaselection: elif self._vistaselection:
self.DrawVistaRectangle(dc, itemrect, self._hasFocus) self.DrawVistaRectangle(dc, itemrect, self._hasFocus)
else: else:
dc.DrawRectangleRect(itemrect) if wx.Platform in ["__WXGTK2__", "__WXMAC__"]:
flags = wx.CONTROL_SELECTED
if self._hasFocus: flags = flags | wx.CONTROL_FOCUSED
wx.RendererNative.Get().DrawItemSelectionRect(self, dc, itemrect, flags)
else:
dc.DrawRectangleRect(itemrect)
# On GTK+ 2, drawing a 'normal' background is wrong for themes that # On GTK+ 2, drawing a 'normal' background is wrong for themes that
# don't allow backgrounds to be customized. Not drawing the background, # don't allow backgrounds to be customized. Not drawing the background,
@@ -4382,6 +4392,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
dc.DrawLabel(item.GetText(), textrect) dc.DrawLabel(item.GetText(), textrect)
dc.SetTextForeground(foreground) dc.SetTextForeground(foreground)
else: else:
if wx.Platform == "__WXMAC__" and item.IsSelected() and self._hasFocus:
dc.SetTextForeground(wx.WHITE)
dc.DrawLabel(item.GetText(), textrect) dc.DrawLabel(item.GetText(), textrect)
wnd = item.GetWindow() wnd = item.GetWindow()