apparently the check for too small rect is needed not only with wxNB_MULTILINE (see...

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

diff --git a/wxPython/demo/StaticText.py b/wxPython/demo/StaticText.py
index 22874ef4807afabde6cc176aafe2a09f108bffa3..52b738ee03d07917bc4372dcb05048625b3be64f 100644 (file)
--- a/wxPython/demo/StaticText.py
+++ b/wxPython/demo/StaticText.py
@@ -1,41 +1,48 @@
-# 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.
-#

 
 import  wx
 
 
 import  wx
 

+
+USE_GENERIC = 0
+
+if USE_GENERIC:
+    from wx.lib.stattext import GenStaticText as StaticText
+else:
+    StaticText = wx.StaticText
+
+

 #---------------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, -1)
 #---------------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, -1)

+        ##self.SetBackgroundColour("sky blue")

 
 

-        wx.StaticText(self, -1, "This is an example of static text", (20, 10))
-        wx.StaticText(self, -1, "using the wxStaticText Control.", (20, 30))
+        StaticText(self, -1, "This is an example of static text", (20, 10))
+        StaticText(self, -1, "using the wx.StaticText Control.", (20, 30))

 
 

-        wx.StaticText(
-            self, -1, "Is this yellow?", (20, 70), (90, -1)
+        StaticText(
+            self, -1, "Is this yellow?", (20, 70), (120, -1)

             ).SetBackgroundColour('Yellow')
 
             ).SetBackgroundColour('Yellow')
 

-        wx.StaticText(
-            self, -1, "align center", (120, 70), (90, -1), wx.ALIGN_CENTER
+        StaticText(
+            self, -1, "align center", (160, 70), (120, -1), wx.ALIGN_CENTER

             ).SetBackgroundColour('Yellow')
 
             ).SetBackgroundColour('Yellow')
 

-        wx.StaticText(
-            self, -1, "align right", (220, 70), (90, -1), wx.ALIGN_RIGHT
+        StaticText(
+            self, -1, "align right", (300, 70), (120, -1), wx.ALIGN_RIGHT

             ).SetBackgroundColour('Yellow')
 
         str = "This is a different font."
             ).SetBackgroundColour('Yellow')
 
         str = "This is a different font."

-        text = wx.StaticText(self, -1, str, (20, 100))
+        text = StaticText(self, -1, str, (20, 120))

         font = wx.Font(18, wx.SWISS, wx.NORMAL, wx.NORMAL)
         text.SetFont(font)
         font = wx.Font(18, wx.SWISS, wx.NORMAL, wx.NORMAL)
         text.SetFont(font)

-        #text.SetSize(text.GetBestSize())

 
 

-        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)
+        StaticText(self, -1,
+                   "Multi-line wx.StaticText\nline 2\nline 3\n\nafter empty line",
+                   (20,170))
+        StaticText(self, -1,
+                   "Align right multi-line\nline 2\nline 3\n\nafter empty line",
+                   (220,170), style=wx.ALIGN_RIGHT)

 
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------


@@ -49,7 +56,7 @@ def runTest(frame, nb, log):
 
 
 overview = '''\
 
 
 overview = '''\

-A static text control displays one or more lines of read-only text.
+A StaticText control displays one or more lines of read-only text.

 
 '''
 
 
 '''
 


@@ -57,5 +64,5 @@ A static text control displays one or more lines of read-only text.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])