merge from 2.8 branch

[wxWidgets.git] / wxPython / demo / VListBox.py

diff --git a/wxPython/demo/VListBox.py b/wxPython/demo/VListBox.py
index 30cec2b5f3e945383d77f0c5503b15b673433207..fe2112ea5ffbdaa38778e642401e4b7edb967a58 100644 (file)
--- a/wxPython/demo/VListBox.py
+++ b/wxPython/demo/VListBox.py
@@ -14,7 +14,7 @@ class MyVListBox(wx.VListBox):
         if self.GetSelection() == n:
             c = wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)
         else:
-            c = self.GetForegroundColour()#wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)
+            c = self.GetForegroundColour()
         dc.SetFont(self.GetFont())
         dc.SetTextForeground(c)
         dc.DrawLabel(self._getItemText(n), rect,
@@ -24,11 +24,9 @@ class MyVListBox(wx.VListBox):
     # required to draw the n'th item.
     def OnMeasureItem(self, n):
         height = 0
-
         for line in self._getItemText(n).split('\n'):
             w, h = self.GetTextExtent(line)
             height += h
-
         return height + 5