Always draw the selection of selected items, not just when they have

[wxWidgets.git] / wxPython / wx / lib / buttons.py

diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index e01fd4b55bbc0bad306ef0465b79bf2f8c552ead..f4b9d7b4fbf6db9a7a67f0188a2c8b05a6ad509c 100644 (file)
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -77,7 +77,7 @@ class GenButton(wx.PyControl):
 
         self.SetLabel(label)
         self.InheritAttributes()
 
         self.SetLabel(label)
         self.InheritAttributes()

-        self.SetBestFittingSize(size)
+        self.SetInitialSize(size)

         self.InitColours()
 
         self.Bind(wx.EVT_LEFT_DOWN,        self.OnLeftDown)
         self.InitColours()
 
         self.Bind(wx.EVT_LEFT_DOWN,        self.OnLeftDown)


@@ -92,15 +92,16 @@ class GenButton(wx.PyControl):
         self.Bind(wx.EVT_PAINT,            self.OnPaint)
 
 
         self.Bind(wx.EVT_PAINT,            self.OnPaint)
 
 

-    def SetBestSize(self, size=None):
+    def SetInitialSize(self, size=None):

         """
         Given the current font and bezel width settings, calculate
         and set a good size.
         """
         if size is None:
             size = wx.DefaultSize            
         """
         Given the current font and bezel width settings, calculate
         and set a good size.
         """
         if size is None:
             size = wx.DefaultSize            

-        wx.PyControl.SetBestFittingSize(self, size)
-
+        wx.PyControl.SetInitialSize(self, size)
+    SetBestSize = SetInitialSize
+    

 
     def DoGetBestSize(self):
         """
 
     def DoGetBestSize(self):
         """


@@ -255,16 +256,25 @@ class GenButton(wx.PyControl):
         dc.DrawRectangle(bw+2,bw+2,  w-bw*2-4, h-bw*2-4)
         dc.SetLogicalFunction(wx.COPY)
 
         dc.DrawRectangle(bw+2,bw+2,  w-bw*2-4, h-bw*2-4)
         dc.SetLogicalFunction(wx.COPY)
 

-

     def OnPaint(self, event):
         (width, height) = self.GetClientSizeTuple()
         x1 = y1 = 0
         x2 = width-1
         y2 = height-1
     def OnPaint(self, event):
         (width, height) = self.GetClientSizeTuple()
         x1 = y1 = 0
         x2 = width-1
         y2 = height-1

-        
-        dc = wx.BufferedPaintDC(self)
-        brush = None
-        
+
+        dc = wx.PaintDC(self)
+        brush = self.GetBackgroundBrush(dc)
+        if brush is not None:
+            dc.SetBackground(brush)
+            dc.Clear()
+
+        self.DrawBezel(dc, x1, y1, x2, y2)
+        self.DrawLabel(dc, width, height)
+        if self.hasFocus and self.useFocusInd:
+            self.DrawFocusIndicator(dc, width, height)
+
+
+    def GetBackgroundBrush(self, dc):

         if self.up:
             colBg = self.GetBackgroundColour()
             brush = wx.Brush(colBg, wx.SOLID)
         if self.up:
             colBg = self.GetBackgroundColour()
             brush = wx.Brush(colBg, wx.SOLID)


@@ -283,15 +293,10 @@ class GenButton(wx.PyControl):
                     colBg = self.GetParent().GetBackgroundColour()
                     brush = wx.Brush(colBg, wx.SOLID)
         else:
                     colBg = self.GetParent().GetBackgroundColour()
                     brush = wx.Brush(colBg, wx.SOLID)
         else:

+            # this line assumes that a pressed button should be hilighted with
+            # a solid colour even if the background is supposed to be transparent

             brush = wx.Brush(self.faceDnClr, wx.SOLID)
             brush = wx.Brush(self.faceDnClr, wx.SOLID)

-        if brush is not None:
-            dc.SetBackground(brush)
-            dc.Clear()
-                    
-        self.DrawBezel(dc, x1, y1, x2, y2)
-        self.DrawLabel(dc, width, height)
-        if self.hasFocus and self.useFocusInd:
-            self.DrawFocusIndicator(dc, width, height)
+        return brush

 
 
     def OnLeftDown(self, event):
 
 
     def OnLeftDown(self, event):


@@ -347,14 +352,14 @@ class GenButton(wx.PyControl):
 
 
     def OnKeyDown(self, event):
 
 
     def OnKeyDown(self, event):

-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):

             self.up = False
             self.Refresh()
         event.Skip()
 
 
     def OnKeyUp(self, event):
             self.up = False
             self.Refresh()
         event.Skip()
 
 
     def OnKeyUp(self, event):

-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):

             self.up = True
             self.Notify()
             self.Refresh()
             self.up = True
             self.Notify()
             self.Refresh()


@@ -551,7 +556,7 @@ class __ToggleMixin:
         event.Skip()
 
     def OnKeyUp(self, event):
         event.Skip()
 
     def OnKeyUp(self, event):

-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):

             self.up = not self.up
             self.Notify()
             self.Refresh()
             self.up = not self.up
             self.Notify()
             self.Refresh()