Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-25 06:35:27 +00:00
parent 9b4e3f352b
commit 1e4a197e4c
586 changed files with 62691 additions and 17740 deletions

View File

@@ -1,7 +1,7 @@
from wxPython.wx import *
USE_GENERIC = 1
USE_GENERIC = 0
if USE_GENERIC:
from wxPython.lib.stattext import wxGenStaticText as wxStaticText
@@ -24,7 +24,7 @@ class TestPanel(wxPanel):
str = "This is a different font."
text = wxStaticText(self, -1, str, (20, 100))
font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial")
font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, False, "Arial")
w, h, d, e = self.GetFullTextExtent(str, font)
text.SetFont(font)
text.SetSize(wxSize(w, h))