X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7efa87d20203b4bfb06e610b361bd8ddca76d604..66dae888d1b46d754469d990a2bbc957163f0bad:/wxPython/wx/lib/stattext.py

diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py
index ec38e165e7..1f47005e36 100644
--- a/wxPython/wx/lib/stattext.py
+++ b/wxPython/wx/lib/stattext.py
@@ -19,6 +19,9 @@
 
 import wx
 
+BUFFERED = 0   # In unbuffered mode we can let the theme shine through,
+               # is there a way to do this when buffering?
+
 #----------------------------------------------------------------------
 
 class GenStaticText(wx.PyControl):
@@ -32,30 +35,16 @@ class GenStaticText(wx.PyControl):
                              wx.DefaultValidator, name)
 
         wx.PyControl.SetLabel(self, label) # don't check wx.ST_NO_AUTORESIZE yet
-        self.SetPosition(pos)
-        font = parent.GetFont()
-        if not font.Ok():
-            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():
-            self.defBackClr = wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DFACE)
-        self.SetBackgroundColour(self.defBackClr)
-
-        clr = parent.GetForegroundColour()
-        if not clr.Ok():
-            clr = wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNTEXT)
-        self.SetForegroundColour(clr)
-
-        rw, rh = size
-        bw, bh = self.GetBestSize()
-        if rw == -1: rw = bw
-        if rh == -1: rh = bh
-        self.SetSize(wx.Size(rw, rh))
+        self.InheritAttributes()
+        self.SetBestFittingSize(size)
 
-        self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
-        self.Bind(wx.EVT_PAINT,            self.OnPaint)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+        if BUFFERED:
+            self.defBackClr = self.GetBackgroundColour()
+            self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
+        else:
+            self.SetBackgroundStyle(wx.BG_STYLE_SYSTEM)
+            
 
 
     def SetLabel(self, label):
@@ -65,8 +54,9 @@ class GenStaticText(wx.PyControl):
         """
         wx.PyControl.SetLabel(self, label)
         style = self.GetWindowStyleFlag()
+        self.InvalidateBestSize()
         if not style & wx.ST_NO_AUTORESIZE:
-            self.SetSize(self.GetBestSize())
+            self.SetBestFittingSize(self.GetBestSize())
         self.Refresh()
 
 
@@ -77,24 +67,35 @@ class GenStaticText(wx.PyControl):
         """
         wx.PyControl.SetFont(self, font)
         style = self.GetWindowStyleFlag()
+        self.InvalidateBestSize()
         if not style & wx.ST_NO_AUTORESIZE:
-            self.SetSize(self.GetBestSize())
+            self.SetBestFittingSize(self.GetBestSize())
         self.Refresh()
 
 
     def DoGetBestSize(self):
-        """Overridden base class virtual.  Determines the best size of the
-        button based on the label size."""
+        """
+        Overridden base class virtual.  Determines the best size of
+        the control based on the label size and the current font.
+        """
         label = self.GetLabel()
+        font = self.GetFont()
+        if not font:
+            font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
+        dc = wx.ClientDC(self)
+        dc.SetFont(font)
+        
         maxWidth = totalHeight = 0
         for line in label.split('\n'):
             if line == '':
-                w, h = self.GetTextExtent('W')  # empty lines have height too
+                w, h = dc.GetTextExtent('W')  # empty lines have height too
             else:
-                w, h = self.GetTextExtent(line)
+                w, h = dc.GetTextExtent(line)
             totalHeight += h
             maxWidth = max(maxWidth, w)
-        return wx.Size(maxWidth, totalHeight)
+        best = wx.Size(maxWidth, totalHeight)
+        self.CacheBestSize(best)
+        return best
 
 
     def AcceptsFocus(self):
@@ -102,22 +103,41 @@ class GenStaticText(wx.PyControl):
         return False
 
 
+    def GetDefaultAttributes(self):
+        """
+        Overridden base class virtual.  By default we should use
+        the same font/colour attributes as the native StaticText.
+        """
+        return wx.StaticText.GetClassDefaultAttributes()
+
+
+    def ShouldInheritColours(self):
+        """
+        Overridden base class virtual.  If the parent has non-default
+        colours then we want this control to inherit them.
+        """
+        return True
+
+    
     def OnPaint(self, event):
-        dc = wx.BufferedPaintDC(self)
-        #dc = wx.PaintDC(self)
+        if BUFFERED:
+            dc = wx.BufferedPaintDC(self)
+        else:
+            dc = wx.PaintDC(self)
         width, height = self.GetClientSize()
         if not width or not height:
             return
 
-        clr = self.GetBackgroundColour()
-        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.MacSetTheme(1) # 1 == kThemeBrushDialogBackgroundActive
-        dc.SetBackground(backBrush)
+        if BUFFERED:
+            clr = self.GetBackgroundColour()
+            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.MacSetTheme(1) # 1 == kThemeBrushDialogBackgroundActive
+            dc.SetBackground(backBrush)
+            dc.Clear()
 
         dc.SetTextForeground(self.GetForegroundColour())
-        dc.Clear()
         dc.SetFont(self.GetFont())
         label = self.GetLabel()
         style = self.GetWindowStyleFlag()
@@ -131,7 +151,7 @@ class GenStaticText(wx.PyControl):
                 x = width - w
             if style & wx.ALIGN_CENTER:
                 x = (width - w)/2
-            dc.DrawText(line, (x, y))
+            dc.DrawText(line, x, y)
             y += h