Fix or add some DoGetBestSize's

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

diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py
index ddf2642525a1c964524903d16e988c02dcba7719..ec38e165e71de310ce4a1b013bb3b3fbdfc375d3 100644 (file)
--- a/wxPython/wx/lib/stattext.py
+++ b/wxPython/wx/lib/stattext.py
@@ -11,9 +11,11 @@
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

-
-"""
-"""
+# 12/12/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o 2.5 compatability update.
+# o Untested.
+#

 
 import wx
 
 
 import wx
 


@@ -33,17 +35,17 @@ class GenStaticText(wx.PyControl):
         self.SetPosition(pos)
         font = parent.GetFont()
         if not font.Ok():
         self.SetPosition(pos)
         font = parent.GetFont()
         if not font.Ok():

-            font = wx.SystemSettings.GetSystemFont(wx.SYS_DEFAULT_GUI_FONT)
+            font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)

         wx.PyControl.SetFont(self, font) # same here
 
         self.defBackClr = parent.GetBackgroundColour()
         if not self.defBackClr.Ok():
         wx.PyControl.SetFont(self, font) # same here
 
         self.defBackClr = parent.GetBackgroundColour()
         if not self.defBackClr.Ok():

-            self.defBackClr = wx.SystemSettings.GetSystemColour(wx.SYS_COLOUR_3DFACE)
+            self.defBackClr = wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DFACE)

         self.SetBackgroundColour(self.defBackClr)
 
         clr = parent.GetForegroundColour()
         if not clr.Ok():
         self.SetBackgroundColour(self.defBackClr)
 
         clr = parent.GetForegroundColour()
         if not clr.Ok():

-            clr = wx.SystemSettings_GetSystemColour(wx.SYS_COLOUR_BTNTEXT)
+            clr = wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNTEXT)

         self.SetForegroundColour(clr)
 
         rw, rh = size
         self.SetForegroundColour(clr)
 
         rw, rh = size


@@ -52,8 +54,8 @@ class GenStaticText(wx.PyControl):
         if rh == -1: rh = bh
         self.SetSize(wx.Size(rw, rh))
 
         if rh == -1: rh = bh
         self.SetSize(wx.Size(rw, rh))
 

-        wx.EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
-        wx.EVT_PAINT(self,            self.OnPaint)
+        self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
+        self.Bind(wx.EVT_PAINT,            self.OnPaint)

 
 
     def SetLabel(self, label):
 
 
     def SetLabel(self, label):


@@ -111,7 +113,7 @@ class GenStaticText(wx.PyControl):
         backBrush = wx.Brush(clr, wx.SOLID)
         if wx.Platform == "__WXMAC__" and clr == self.defBackClr:
             # if colour is still the default then use the striped background on Mac
         backBrush = wx.Brush(clr, wx.SOLID)
         if wx.Platform == "__WXMAC__" and clr == self.defBackClr:
             # if colour is still the default then use the striped background on Mac

-            backBrush.SetMacTheme(1) # 1 == kThemeBrushDialogBackgroundActive
+            backBrush.MacSetTheme(1) # 1 == kThemeBrushDialogBackgroundActive

         dc.SetBackground(backBrush)
 
         dc.SetTextForeground(self.GetForegroundColour())
         dc.SetBackground(backBrush)
 
         dc.SetTextForeground(self.GetForegroundColour())