X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..61940a7061d0b5d5122b1e1e939cfa2d72596999:/wxPython/demo/wxStaticText.py

diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/wxStaticText.py
index f143ddb5cb..22874ef480 100644
--- a/wxPython/demo/wxStaticText.py
+++ b/wxPython/demo/wxStaticText.py
@@ -1,36 +1,41 @@
+# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# o Removed the USE_GENERIC code because it doesn't work unless you use
+#   the 'from wx import *' methodology.
+#
 
-from wxPython.wx import *
-
-USE_GENERIC = 0
-
-if USE_GENERIC:
-    from wxPython.lib.stattext import wxGenStaticText as wxStaticText
+import  wx
 
 #---------------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent):
-        wxPanel.__init__(self, parent, -1)
-
-        wxStaticText(self, -1, "This is an example of static text", (20, 10))
+        wx.Panel.__init__(self, parent, -1)
 
-        wxStaticText(self, -1, "using the wxStaticText Control.", (20, 30))
+        wx.StaticText(self, -1, "This is an example of static text", (20, 10))
+        wx.StaticText(self, -1, "using the wxStaticText Control.", (20, 30))
 
-        wxStaticText(self, -1, "Is this yellow?", (20, 70), (90, -1)).SetBackgroundColour('Yellow')
+        wx.StaticText(
+            self, -1, "Is this yellow?", (20, 70), (90, -1)
+            ).SetBackgroundColour('Yellow')
 
-        wxStaticText(self, -1, "align center", (120, 70), (90, -1), wxALIGN_CENTER).SetBackgroundColour('Yellow')
+        wx.StaticText(
+            self, -1, "align center", (120, 70), (90, -1), wx.ALIGN_CENTER
+            ).SetBackgroundColour('Yellow')
 
-        wxStaticText(self, -1, "align right", (220, 70), (90, -1), wxALIGN_RIGHT).SetBackgroundColour('Yellow')
+        wx.StaticText(
+            self, -1, "align right", (220, 70), (90, -1), wx.ALIGN_RIGHT
+            ).SetBackgroundColour('Yellow')
 
         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)
+        text = wx.StaticText(self, -1, str, (20, 100))
+        font = wx.Font(18, wx.SWISS, wx.NORMAL, wx.NORMAL)
         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)
+        wx.StaticText(self, -1, "Multi-line wxStaticText\nline 2\nline 3\n\nafter empty line", (20,150))
+        wx.StaticText(self, -1, "Align right multi-line\nline 2\nline 3\n\nafter empty line", (220,150), style=wx.ALIGN_RIGHT)
 
 
 #---------------------------------------------------------------------------
@@ -43,14 +48,12 @@ def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 
-
 overview = '''\
 A static text control displays one or more lines of read-only text.
 
 '''
 
 
-
 if __name__ == '__main__':
     import sys,os
     import run