Reorder the controls so the RadioButtons work right on Windows

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

diff --git a/wxPython/demo/XmlResourceSubclass.py b/wxPython/demo/XmlResourceSubclass.py
index 2fcb737bb410759a0589156193009815b102a197..6e975e538f2914c873e194825039d5f79bfa8fe2 100644 (file)
--- a/wxPython/demo/XmlResourceSubclass.py
+++ b/wxPython/demo/XmlResourceSubclass.py
@@ -14,8 +14,7 @@ resourceText = r'''<?xml version="1.0"?>
 <object class="wxPanel" subclass="XmlResourceSubclass.MyCustomPanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">
 <object class="wxPanel" subclass="XmlResourceSubclass.MyCustomPanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">

-        <label>This blue panel is a class derived from wx.Panel
-and is loaded by a using a subclass attribute of the object tag.</label>
+        <label>This panel is a custom class derived from wx.Panel,\nand is loaded by a custom XmlResourceHandler.</label>

         <pos>10,10</pos>
     </object>
 </object>
         <pos>10,10</pos>
     </object>
 </object>


@@ -38,17 +37,24 @@ class MyCustomPanel(wx.Panel):
         # silly example.  It could just as easily have been done in
         # the resource.  We do it in the EVT_WINDOW_CREATE handler 
         # because the window doesn't really exist yet in the __init__.
         # silly example.  It could just as easily have been done in
         # the resource.  We do it in the EVT_WINDOW_CREATE handler 
         # because the window doesn't really exist yet in the __init__.

-        t = wx.StaticText(self, -1, "MyCustomPanel")
-        f = t.GetFont()
-        f.SetWeight(wx.BOLD)
-        f.SetPointSize(f.GetPointSize()+2)
-        t.SetFont(f)
-        self.t = t
+        if self is evt.GetEventObject():
+            t = wx.StaticText(self, -1, "MyCustomPanel")
+            f = t.GetFont()
+            f.SetWeight(wx.BOLD)
+            f.SetPointSize(f.GetPointSize()+2)
+            t.SetFont(f)
+            self.t = t
+            # On OSX the EVT_SIZE happens before EVT_WINDOW_CREATE !?!
+            # so give it another kick
+            wx.CallAfter(self.OnSize, None)
+        evt.Skip()

 
     def OnSize(self, evt):
 
     def OnSize(self, evt):

-        sz = self.GetSize()
-        w, h = self.t.GetTextExtent(self.t.GetLabel())
-        self.t.SetPosition(((sz.width-w)/2, (sz.height-h)/2))
+        if hasattr(self, 't'):
+            sz = self.GetSize()
+            w, h = self.t.GetTextExtent(self.t.GetLabel())
+            print w, h
+            self.t.SetPosition(((sz.width-w)/2, (sz.height-h)/2))

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