added support for underlined fonts

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

diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py
index 54d7c64e93c7bbccc8ff5cc5abb760d86d7b6cd5..f69d9b6160c6983d01545ddca17fc826c34ed308 100644 (file)
--- a/wxPython/wx/lib/stattext.py
+++ b/wxPython/wx/lib/stattext.py
@@ -56,7 +56,7 @@ class GenStaticText(wx.PyControl):
         style = self.GetWindowStyleFlag()
         self.InvalidateBestSize()
         if not style & wx.ST_NO_AUTORESIZE:
-            self.SetInitialSize(self.GetBestSize())
+            self.SetSize(self.GetBestSize())
         self.Refresh()
 
 
@@ -69,7 +69,7 @@ class GenStaticText(wx.PyControl):
         style = self.GetWindowStyleFlag()
         self.InvalidateBestSize()
         if not style & wx.ST_NO_AUTORESIZE:
-            self.SetInitialSize(self.GetBestSize())
+            self.SetSize(self.GetBestSize())
         self.Refresh()
 
 
@@ -138,9 +138,10 @@ class GenStaticText(wx.PyControl):
             dc.Clear()
 
         if self.IsEnabled():
-             dc.SetTextForeground(self.GetForegroundColour())
-         else:
-             dc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT))
+            dc.SetTextForeground(self.GetForegroundColour())
+        else:
+            dc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT))
+            
         dc.SetFont(self.GetFont())
         label = self.GetLabel()
         style = self.GetWindowStyleFlag()