merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/wxStaticText.py

@@ -0,0 +1,73 @@
+
+from wxPython.wx import *
+
+#---------------------------------------------------------------------------
+
+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, "using the wxStaticText Control.",
+                     wxPoint(20, 30))
+
+        wxStaticText(self, -1, "Is this yellow?",
+                     wxPoint(20, 70)).SetBackgroundColour(wxNamedColour('Yellow'))
+
+        str = "This is a different font."
+        text = wxStaticText(self, -1, str, wxPoint(20, 100))
+        font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial")
+        w, h, d, e = self.GetFullTextExtent(str, font)
+        text.SetFont(font)
+        text.SetSize(wxSize(w, h))
+
+
+#---------------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    panel = TestPanel(nb)
+    return panel
+
+
+#---------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+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.
+
+name = Window name.
+'''
+
+#---------------------------------------------------------------------------