forgot to commit some regenerated files

[wxWidgets.git] / wxPython / demo / wxStaticText.py

diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/wxStaticText.py
index dc558eed08e9015074ed3f759a2db585814d59bf..c40d886405820e6d0280953d40645dcd4dc80f09 100644 (file)
--- a/wxPython/demo/wxStaticText.py
+++ b/wxPython/demo/wxStaticText.py
@@ -1,7 +1,7 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

-USE_GENERIC = 1
+USE_GENERIC = 0

 
 if USE_GENERIC:
     from wxPython.lib.stattext import wxGenStaticText as wxStaticText
 
 if USE_GENERIC:
     from wxPython.lib.stattext import wxGenStaticText as wxStaticText


@@ -24,10 +24,9 @@ class TestPanel(wxPanel):
 
         str = "This is a different font."
         text = wxStaticText(self, -1, str, (20, 100))
 
         str = "This is a different font."
         text = wxStaticText(self, -1, str, (20, 100))

-        font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial")
-        w, h, d, e = self.GetFullTextExtent(str, font)
+        font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL)

         text.SetFont(font)
         text.SetFont(font)

-        text.SetSize(wxSize(w, h))
+        #text.SetSize(text.GetBestSize())

 
         wxStaticText(self, -1, "Multi-line wxStaticText\nline 2\nline 3\n\nafter empty line", (20,150))
         wxStaticText(self, -1, "Align right multi-line\nline 2\nline 3\n\nafter empty line", (220,150), style=wxALIGN_RIGHT)
 
         wxStaticText(self, -1, "Multi-line wxStaticText\nline 2\nline 3\n\nafter empty line", (20,150))
         wxStaticText(self, -1, "Align right multi-line\nline 2\nline 3\n\nafter empty line", (220,150), style=wxALIGN_RIGHT)