Updates to make latest changes compile

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

diff --git a/utils/wxPython/lib/buttons.py b/utils/wxPython/lib/buttons.py
index 41c68651728c88725d8962fa85a24bff71055804..e02f28850e4c9e7c0ff9f31e24fef08b527356f9 100644 (file)
--- a/utils/wxPython/lib/buttons.py
+++ b/utils/wxPython/lib/buttons.py
@@ -142,7 +142,8 @@ class wxGenButton(wxControl):
         highlightClr = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNHIGHLIGHT)
         self.shadowPen    = wxPen(shadowClr, 1, wxSOLID)
         self.highlightPen = wxPen(highlightClr, 1, wxSOLID)
         highlightClr = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNHIGHLIGHT)
         self.shadowPen    = wxPen(shadowClr, 1, wxSOLID)
         self.highlightPen = wxPen(highlightClr, 1, wxSOLID)

-        self.focusIndPen  = wxPen(textClr, 1, wxUSER_DASH)
+        ##self.focusIndPen  = wxPen(textClr, 1, wxUSER_DASH)
+        self.focusIndPen = wxPen(textClr, 1, wxDOT)

 
 
     def SetBackgroundColour(self, colour):
 
 
     def SetBackgroundColour(self, colour):


@@ -209,7 +210,7 @@ class wxGenButton(wxControl):
         bw = self.bezelWidth
         dc.SetLogicalFunction(wxINVERT)
         self.focusIndPen.SetColour(self.GetForegroundColour())
         bw = self.bezelWidth
         dc.SetLogicalFunction(wxINVERT)
         self.focusIndPen.SetColour(self.GetForegroundColour())

-        self.focusIndPen.SetDashes([1,2,1,2])  # This isn't quite working the way I expected...
+        ##self.focusIndPen.SetDashes([1,2,1,2])  # This isn't quite working the way I expected...

         dc.SetPen(self.focusIndPen)
         dc.SetBrush(wxTRANSPARENT_BRUSH)
         dc.DrawRectangle(bw+2,bw+2, w-bw*2-4, h-bw*2-4)
         dc.SetPen(self.focusIndPen)
         dc.SetBrush(wxTRANSPARENT_BRUSH)
         dc.DrawRectangle(bw+2,bw+2, w-bw*2-4, h-bw*2-4)


@@ -231,6 +232,7 @@ class wxGenButton(wxControl):
         if self.hasFocus and self.useFocusInd:
             self.DrawFocusIndicator(dc, width, height)
 
         if self.hasFocus and self.useFocusInd:
             self.DrawFocusIndicator(dc, width, height)
 

+

     def OnEraseBackground(self, event):
         pass
 
     def OnEraseBackground(self, event):
         pass
 


@@ -292,6 +294,7 @@ class wxGenButton(wxControl):
             self.Refresh()
         event.Skip()
 
             self.Refresh()
         event.Skip()
 

+

     def OnKeyUp(self, event):
         if self.hasFocus and event.KeyCode() == ord(" "):
             self.up = true
     def OnKeyUp(self, event):
         if self.hasFocus and event.KeyCode() == ord(" "):
             self.up = true


@@ -360,7 +363,8 @@ class wxGenBitmapButton(wxGenButton):
         bw,bh = bmp.GetWidth(), bmp.GetHeight()
         if not self.up:
             dw = dy = 1
         bw,bh = bmp.GetWidth(), bmp.GetHeight()
         if not self.up:
             dw = dy = 1

-        dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, true)
+        hasMask = bmp.GetMask() != None
+        dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, hasMask)