X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10e07c70d8161058e55d722686edbafb4688d243..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/demo/OOR.py

diff --git a/wxPython/demo/OOR.py b/wxPython/demo/OOR.py
index e7afc3b785..fa746c10f9 100644
--- a/wxPython/demo/OOR.py
+++ b/wxPython/demo/OOR.py
@@ -1,48 +1,52 @@
 
-from wxPython.wx import *
-from wxPython.html import *
+import  wx
+import  wx.html as wxhtml
 
 #----------------------------------------------------------------------
 
-BTN1 = wxNewId()
-BTN2 = wxNewId()
+BTN1 = wx.NewId()
+BTN2 = wx.NewId()
 
-
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent, log):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
         self.log = log
 
-        sizer = wxBoxSizer(wxVERTICAL)
-        html = wxHtmlWindow(self, -1)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        html = wxhtml.HtmlWindow(self, -1)
         html.SetPage(overview)
-        sizer.Add(html, 1, wxEXPAND|wxALL, 5)
+        sizer.Add(html, 1, wx.EXPAND|wx.ALL, 5)
 
-        btns = wxBoxSizer(wxHORIZONTAL)
-        btns.Add(50, -1, 1, wxEXPAND)
-        btn1 = wxButton(self, BTN1, "Find My Alter-ego")  # don't save a ref to this one
+        btns = wx.BoxSizer(wx.HORIZONTAL)
+        btns.Add((50, -1), 1, wx.EXPAND)
+        btn1 = wx.Button(self, BTN1, "Find My Alter-ego") # don't save a ref to this one 
         btns.Add(btn1)
-        btns.Add(50, -1, 1, wxEXPAND)
-        self.btn2 = wxButton(self, BTN2, "Find Myself")
+        btns.Add((50, -1), 1, wx.EXPAND)
+        self.btn2 = wx.Button(self, BTN2, "Find Myself")
         btns.Add(self.btn2)
-        btns.Add(50, -1, 1, wxEXPAND)
+        btns.Add((50, -1), 1, wx.EXPAND)
 
-        sizer.Add(btns, 0, wxEXPAND|wxALL, 15)
+        sizer.Add(btns, 0, wx.EXPAND|wx.ALL, 15)
 
         self.SetSizer(sizer)
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
+
+        self.sizer = sizer  # save it for testing later
 
-        EVT_BUTTON(self, BTN1, self.OnFindButton1)
-        EVT_BUTTON(self, BTN2, self.OnFindButton2)
+        self.Bind(wx.EVT_BUTTON, self.OnFindButton1, id=BTN1)
+        self.Bind(wx.EVT_BUTTON, self.OnFindButton2, id=BTN2)
 
 
     def OnFindButton1(self, evt):
         win = self.FindWindowById(BTN1)
+
         if win is None:
             self.log.write("***** OOPS! None returned...\n")
             return
+
         className = win.__class__.__name__
-        if className in ["wxButton", "wxButtonPtr"]:
+
+        if className in ["Button", "ButtonPtr"]:
             self.log.write("The types are the same! <grin>\n")
         else:
             self.log.write("Got %s, expected wxButton or wxButtonPtr\n" % className)
@@ -51,14 +55,38 @@ class TestPanel(wxPanel):
 
     def OnFindButton2(self, evt):
         win = self.FindWindowById(BTN2)
+
+        if win is None:
+            self.log.write("***** OOPS! None returned...\n")
+            return
+
+        if win is self.btn2:
+            self.log.write("The objects are the same! <grin>\n")
+        else:
+            self.log.write("The objects are NOT the same! <frown>\n")
+
+        win = evt.GetEventObject()
+
         if win is None:
             self.log.write("***** OOPS! None returned...\n")
             return
+
         if win is self.btn2:
             self.log.write("The objects are the same! <grin>\n")
         else:
             self.log.write("The objects are NOT the same! <frown>\n")
 
+        sizer = self.GetSizer()
+
+        if sizer is None:
+            self.log.write("***** OOPS! None returned...\n")
+            return
+
+        if sizer is self.sizer:
+            self.log.write("The objects are the same! <grin>\n")
+        else:
+            self.log.write("The objects are NOT the same! <frown>\n")
+
 
 #----------------------------------------------------------------------
 
@@ -79,21 +107,21 @@ SWIG isn't able to tell the actual type it just creates a new Python
 shadow object of the base type to wrap around the base type pointer
 and returns it.
 
-<p>In wxPython this can cause annoying issues.  For example if you
-call:
+<p>In wxPython prior to 2.3.0 this could cause annoying issues.  For
+example if you called:
 
 <pre>
 
         myText = someWindow.FindWindowById(txtID)
 </pre>
 
-expecting to get a wxTextCtrl you will actually get a wxWindow object
+expecting to get a wxTextCtrl you would actually get a wxWindow object
 instead.  If you then try to call SetValue on that object you'll get
 an exception since there is no such method.  This is the reason for
 the wxPyTypeCast hack that has been in wxPython for so long.
 
-<p>Even with wxPyTypeCast there is the issue that the object returned
-is not the same one that was created in Python originally, but a new
+<p>Even with wxPyTypeCast there was the issue that the object returned
+was not the same one that was created in Python originally, but a new
 object of the same type that wraps the same C++ pointer.  If the
 programmer has set additional attributes of that original object they
 will not exist in the new object.
@@ -112,7 +140,16 @@ and be able to then turn wxPyTypeCast in to a no-op.
 </ol>
 
 <p>The first button below shows the first of these phases (<i>working</i>)
-and the second will show #2 (<i>not yet working.</i>)
+and the second will show #2 (<i>working as of Python 2.3.2</i>)
 
 </body></html>
 """
+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+