wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions

View File

@@ -24,10 +24,9 @@ class TestPanel(wxPanel):
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.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)