X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..830efc9b0cb87eae22d4435af7858175017522ab:/wxPython/demo/wxStaticText.py?ds=sidebyside

diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/wxStaticText.py
index baba79cf08..dc558eed08 100644
--- a/wxPython/demo/wxStaticText.py
+++ b/wxPython/demo/wxStaticText.py
@@ -1,28 +1,37 @@
 
 from wxPython.wx import *
 
+USE_GENERIC = 1
+
+if USE_GENERIC:
+    from wxPython.lib.stattext import wxGenStaticText as wxStaticText
+
 #---------------------------------------------------------------------------
 
 class TestPanel(wxPanel):
     def __init__(self, parent):
         wxPanel.__init__(self, parent, -1)
 
-        wxStaticText(self, -1, "This is an example of static text",
-                     wxPoint(20, 10))
+        wxStaticText(self, -1, "This is an example of static text", (20, 10))
+
+        wxStaticText(self, -1, "using the wxStaticText Control.", (20, 30))
 
-        wxStaticText(self, -1, "using the wxStaticText Control.",
-                     wxPoint(20, 30))
+        wxStaticText(self, -1, "Is this yellow?", (20, 70), (90, -1)).SetBackgroundColour('Yellow')
 
-        wxStaticText(self, -1, "Is this yellow?",
-                     wxPoint(20, 70)).SetBackgroundColour(wxNamedColour('Yellow'))
+        wxStaticText(self, -1, "align center", (120, 70), (90, -1), wxALIGN_CENTER).SetBackgroundColour('Yellow')
+
+        wxStaticText(self, -1, "align right", (220, 70), (90, -1), wxALIGN_RIGHT).SetBackgroundColour('Yellow')
 
         str = "This is a different font."
-        text = wxStaticText(self, -1, str, wxPoint(20, 100))
-        font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial")
+        text = wxStaticText(self, -1, str, (20, 100))
+        font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial")
         w, h, d, e = self.GetFullTextExtent(str, font)
         text.SetFont(font)
         text.SetSize(wxSize(w, h))
 
+        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)
+
 
 #---------------------------------------------------------------------------
 
@@ -35,39 +44,15 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
 overview = '''\
 A static text control displays one or more lines of read-only text.
 
-wxStaticText()
--------------------------
-
-Default constructor.
-
-wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label = "", const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "staticText")
-
-Constructor, creating and showing a text control.
-
-Parameters
--------------------
-
-parent = Parent window. Should not be NULL.
-
-id = Control identifier. A value of -1 denotes a default value.
-
-label = Text label.
+'''
 
-pos = Window position.
 
-size = Window size.
 
-style = Window style. See wxStaticText.
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-name = Window name.
-'''
-
-#---------------------------------------------------------------------------