removed second parameter from GetFirstChild calls

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

diff --git a/wxPython/demo/ActiveXWrapper_IE.py b/wxPython/demo/ActiveXWrapper_IE.py
index 216825dd29c6538f7ae4eb4ddd54dd034863969e..fd164e5761449b8a144ef841c6c7d82262e74c00 100644 (file)
--- a/wxPython/demo/ActiveXWrapper_IE.py
+++ b/wxPython/demo/ActiveXWrapper_IE.py
@@ -11,7 +11,7 @@ you can use just like wxWindow, (set the size and position, use in a
 sizer, etc.) except its contents will be the COM control.
 
 <p>
 sizer, etc.) except its contents will be the COM control.
 
 <p>

-This demo embeds the Internet Exploer WebBrowser control, and shows
+This demo embeds the Internet Explorer WebBrowser control, and shows

 how to receive events from the COM control.  (The title bar and status
 bar are updated as pages change, in addition to the log messages being
 shown.)
 how to receive events from the COM control.  (The title bar and status
 bar are updated as pages change, in addition to the log messages being
 shown.)


@@ -34,7 +34,8 @@ if wxPlatform == '__WXMSW__':
 
 class TestPanel(wxWindow):
     def __init__(self, parent, log, frame=None):
 
 class TestPanel(wxWindow):
     def __init__(self, parent, log, frame=None):

-        wxWindow.__init__(self, parent, -1)#, style=wxCLIP_CHILDREN)
+        wxWindow.__init__(self, parent, -1,
+                          style=wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE)

         self.ie = None
         self.log = log
         self.current = "http://wxPython.org/"
         self.ie = None
         self.log = log
         self.current = "http://wxPython.org/"


@@ -53,33 +54,45 @@ class TestPanel(wxWindow):
                                     eventObj = self)
 
         # Create an instance of that class
                                     eventObj = self)
 
         # Create an instance of that class

-        self.ie = theClass(self, -1, style=wxSUNKEN_BORDER)
+        self.ie = theClass(self, -1) ##, style=wxSUNKEN_BORDER)

 
 
 
 

-        #btn = wxButton(self, wxNewId(), " Open ")
-        #EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
-        #btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
+        btn = wxButton(self, wxNewId(), "Open", style=wxBU_EXACTFIT)
+        EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)

 
 

-        btn = wxButton(self, wxNewId(), " Home ")
+        btn = wxButton(self, wxNewId(), "Home", style=wxBU_EXACTFIT)

         EVT_BUTTON(self, btn.GetId(), self.OnHomeButton)
         EVT_BUTTON(self, btn.GetId(), self.OnHomeButton)

-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)

 
 

-        btn = wxButton(self, wxNewId(), " <-- ")
+        btn = wxButton(self, wxNewId(), "<--", style=wxBU_EXACTFIT)

         EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)
         EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)

-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)

 
 

-        btn = wxButton(self, wxNewId(), " --> ")
+        btn = wxButton(self, wxNewId(), "-->", style=wxBU_EXACTFIT)

         EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)
         EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)

-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+
+        btn = wxButton(self, wxNewId(), "Stop", style=wxBU_EXACTFIT)
+        EVT_BUTTON(self, btn.GetId(), self.OnStopButton)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+
+        btn = wxButton(self, wxNewId(), "Search", style=wxBU_EXACTFIT)
+        EVT_BUTTON(self, btn.GetId(), self.OnSearchPageButton)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+
+        btn = wxButton(self, wxNewId(), "Refresh", style=wxBU_EXACTFIT)
+        EVT_BUTTON(self, btn.GetId(), self.OnRefreshPageButton)
+        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)

 
         txt = wxStaticText(self, -1, "Location:")
 
         txt = wxStaticText(self, -1, "Location:")

-        btnSizer.Add(txt, 0, wxCENTER|wxALL, 5)
+        btnSizer.Add(txt, 0, wxCENTER|wxALL, 2)

 
         self.location = wxComboBox(self, wxNewId(), "", style=wxCB_DROPDOWN)
         EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
         EVT_KEY_UP(self.location, self.OnLocationKey)
         EVT_CHAR(self.location, self.IgnoreReturn)
 
         self.location = wxComboBox(self, wxNewId(), "", style=wxCB_DROPDOWN)
         EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
         EVT_KEY_UP(self.location, self.OnLocationKey)
         EVT_CHAR(self.location, self.IgnoreReturn)

-        btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 5)
+        btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 2)

 
         sizer.Add(btnSizer, 0, wxEXPAND)
         sizer.Add(self.ie, 1, wxEXPAND)
 
         sizer.Add(btnSizer, 0, wxEXPAND)
         sizer.Add(self.ie, 1, wxEXPAND)


@@ -88,17 +101,28 @@ class TestPanel(wxWindow):
         self.location.Append(self.current)
 
         self.SetSizer(sizer)
         self.location.Append(self.current)
 
         self.SetSizer(sizer)

-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)

         EVT_SIZE(self, self.OnSize)
 
         EVT_SIZE(self, self.OnSize)
 

+        EVT_WINDOW_DESTROY(self, self.OnDestroy)

 
 

-    def OnSize(self, evt):
-        self.Layout()

 
 

-    def __del__(self):
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
+
+
+    def OnDestroy(self, evt):

         if self.ie:
             self.ie.Cleanup()
             self.ie = None
         if self.ie:
             self.ie.Cleanup()
             self.ie = None

+            self.frame = None
+
+
+    def OnSize(self, evt):
+        self.Layout()
+

 
     def OnLocationSelect(self, evt):
         url = self.location.GetStringSelection()
 
     def OnLocationSelect(self, evt):
         url = self.location.GetStringSelection()


@@ -134,10 +158,19 @@ class TestPanel(wxWindow):
     def OnPrevPageButton(self, event):
         self.ie.GoBack()
 
     def OnPrevPageButton(self, event):
         self.ie.GoBack()
 

-

     def OnNextPageButton(self, event):
         self.ie.GoForward()
 
     def OnNextPageButton(self, event):
         self.ie.GoForward()
 

+    def OnStopButton(self, evt):
+        self.ie.Stop()
+
+    def OnSearchPageButton(self, evt):
+        self.ie.GoSearch()
+
+    def OnRefreshPageButton(self, evt):
+        self.ie.Refresh2(3)
+
+

 
     # The following event handlers are called by the web browser COM
     # control since  we passed self to MakeActiveXClass.  It will look
 
     # The following event handlers are called by the web browser COM
     # control since  we passed self to MakeActiveXClass.  It will look


@@ -191,14 +224,13 @@ if __name__ == '__main__':
             self.tp = TestPanel(self, sys.stdout, self)
             EVT_CLOSE(self, self.OnCloseWindow)
 
             self.tp = TestPanel(self, sys.stdout, self)
             EVT_CLOSE(self, self.OnCloseWindow)
 

-        def OnCloseWindow(self, event):
-            self.tp.ie.Cleanup()
+        def OnCloseWindow(self, evt):
+            self.tp.Destroy()

             self.Destroy()
 
             self.Destroy()
 

-

     app = wxPySimpleApp()
     frame = TestFrame()
     app = wxPySimpleApp()
     frame = TestFrame()

-    frame.Show(true)
+    frame.Show(True)

     app.MainLoop()
 
 
     app.MainLoop()