Migate to the new wxRendererNative::DrawItemSelectionRect function where available, and fix selected text color on Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
df0edf4443
commit
8bc0c17afc
@ -4296,7 +4296,12 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
|
||||
elif self._vistaselection:
|
||||
self.DrawVistaRectangle(dc, itemrect, self._hasFocus)
|
||||
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:
|
||||
|
||||
@ -4324,7 +4329,12 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
|
||||
elif self._vistaselection:
|
||||
self.DrawVistaRectangle(dc, itemrect, self._hasFocus)
|
||||
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
|
||||
# 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.SetTextForeground(foreground)
|
||||
else:
|
||||
if wx.Platform == "__WXMAC__" and item.IsSelected() and self._hasFocus:
|
||||
dc.SetTextForeground(wx.WHITE)
|
||||
dc.DrawLabel(item.GetText(), textrect)
|
||||
|
||||
wnd = item.GetWindow()
|
||||
|
Loading…
Reference in New Issue
Block a user