]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/wxIEHtmlWin.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
reSWIGged
[wxWidgets.git] / wxPython / demo / wxIEHtmlWin.py
diff --git a/wxPython/demo/wxIEHtmlWin.py b/wxPython/demo/wxIEHtmlWin.py
index 5bdd7191bec39914af836f8b7bc0580222a69a58..33e5b8c8be88e0637e6a3e54b1d93e8ddf65792a 100644 (file)
--- a/wxPython/demo/wxIEHtmlWin.py
+++ b/wxPython/demo/wxIEHtmlWin.py
@@ -1,113 +1,136 @@
+# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+# 11/28/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o iewin.py is missing
+# 
 
 
-from wxPython.wx import *
+import  wx
 
 
-if wxPlatform == '__WXMSW__':
-    from wxPython.iewin import *
+if wx.Platform == '__WXMSW__':
+    import  wx.iewin    as  iewin
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxWindow):
+class TestPanel(wx.Window):
     def __init__(self, parent, log, frame=None):
     def __init__(self, parent, log, frame=None):
-        wxWindow.__init__(self, parent, -1,
-                          style=wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE)
+        wx.Window.__init__(
+            self, parent, -1,
+            style=wx.TAB_TRAVERSAL|wx.CLIP_CHILDREN|wx.NO_FULL_REPAINT_ON_RESIZE
+            )
+            
         self.log = log
         self.log = log
-        self.current = "http://wxWindows.org/"
+        self.current = "http://wxPython.org/"
         self.frame = frame
         self.frame = frame
+
         if frame:
             self.titleBase = frame.GetTitle()
 
         if frame:
             self.titleBase = frame.GetTitle()
 
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
 
 
-        sizer = wxBoxSizer(wxVERTICAL)
-        btnSizer = wxBoxSizer(wxHORIZONTAL)
-
-        self.ie = wxIEHtmlWin(self, -1, style = wxNO_FULL_REPAINT_ON_RESIZE)
+        self.ie = iewin.IEHtmlWin(self, -1, style = wx.NO_FULL_REPAINT_ON_RESIZE)
 
 
 
 
-        btn = wxButton(self, wxNewId(), "Open", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "Open", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "Home", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnHomeButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "Home", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnHomeButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "<--", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "<--", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "-->", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "-->", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "Stop", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnStopButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "Stop", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnStopButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "Search", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnSearchPageButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "Search", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnSearchPageButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        btn = wxButton(self, wxNewId(), "Refresh", style=wxBU_EXACTFIT)
-        EVT_BUTTON(self, btn.GetId(), self.OnRefreshPageButton)
-        btnSizer.Add(btn, 0, wxEXPAND|wxALL, 2)
+        btn = wx.Button(self, wx.NewId(), "Refresh", style=wx.BU_EXACTFIT)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnRefreshPageButton)
+        btnSizer.Add(btn, 0, wx.EXPAND|wx.ALL, 2)
 
 
-        txt = wxStaticText(self, -1, "Location:")
-        btnSizer.Add(txt, 0, wxCENTER|wxALL, 2)
+        txt = wx.StaticText(self, -1, "Location:")
+        btnSizer.Add(txt, 0, wx.CENTER|wx.ALL, 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)
-        btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 2)
+        self.location = wx.ComboBox(
+                            self, wx.NewId(), "", style=wx.CB_DROPDOWN|wx.PROCESS_ENTER
+                            )
+        
+        wx.EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
+        wx.EVT_KEY_UP(self.location, self.OnLocationKey)
+        wx.EVT_CHAR(self.location, self.IgnoreReturn)
+        btnSizer.Add(self.location, 1, wx.EXPAND|wx.ALL, 2)
 
 
-        sizer.Add(btnSizer, 0, wxEXPAND)
-        sizer.Add(self.ie, 1, wxEXPAND)
+        sizer.Add(btnSizer, 0, wx.EXPAND)
+        sizer.Add(self.ie, 1, wx.EXPAND)
 
 
-        self.ie.LoadUrl(self.current)
+        self.ie.Navigate(self.current)
         self.location.Append(self.current)
 
         self.SetSizer(sizer)
         self.location.Append(self.current)
 
         self.SetSizer(sizer)
-        self.SetAutoLayout(true)
-        EVT_SIZE(self, self.OnSize)
+        self.SetAutoLayout(True)
+        wx.EVT_SIZE(self, self.OnSize)
 
         # Hook up the event handlers for the IE window
 
         # Hook up the event handlers for the IE window
-        EVT_MSHTML_BEFORENAVIGATE2(self, -1, self.OnBeforeNavigate2)
-        EVT_MSHTML_NEWWINDOW2(self, -1, self.OnNewWindow2)
-        EVT_MSHTML_DOCUMENTCOMPLETE(self, -1, self.OnDocumentComplete)
+        iewin.EVT_MSHTML_BEFORENAVIGATE2(self, -1, self.OnBeforeNavigate2)
+        iewin.EVT_MSHTML_NEWWINDOW2(self, -1, self.OnNewWindow2)
+        iewin.EVT_MSHTML_DOCUMENTCOMPLETE(self, -1, self.OnDocumentComplete)
         #EVT_MSHTML_PROGRESSCHANGE(self, -1, self.OnProgressChange)
         #EVT_MSHTML_PROGRESSCHANGE(self, -1, self.OnProgressChange)
-        EVT_MSHTML_STATUSTEXTCHANGE(self, -1, self.OnStatusTextChange)
-        EVT_MSHTML_TITLECHANGE(self, -1, self.OnTitleChange)
+        iewin.EVT_MSHTML_STATUSTEXTCHANGE(self, -1, self.OnStatusTextChange)
+        iewin.EVT_MSHTML_TITLECHANGE(self, -1, self.OnTitleChange)
+
+
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
 
 
     def OnSize(self, evt):
         self.Layout()
 
 
 
     def OnSize(self, evt):
         self.Layout()
 
+
     def OnLocationSelect(self, evt):
         url = self.location.GetStringSelection()
         self.log.write('OnLocationSelect: %s\n' % url)
     def OnLocationSelect(self, evt):
         url = self.location.GetStringSelection()
         self.log.write('OnLocationSelect: %s\n' % url)
-        self.ie.LoadUrl(url)
+        self.ie.Navigate(url)
 
     def OnLocationKey(self, evt):
 
     def OnLocationKey(self, evt):
-        if evt.KeyCode() == WXK_RETURN:
+        if evt.KeyCode() == wx.WXK_RETURN:
             URL = self.location.GetValue()
             self.location.Append(URL)
             URL = self.location.GetValue()
             self.location.Append(URL)
-            self.ie.LoadUrl(URL)
+            self.ie.Navigate(URL)
         else:
             evt.Skip()
 
         else:
             evt.Skip()
 
+
     def IgnoreReturn(self, evt):
     def IgnoreReturn(self, evt):
-        print 'IgnoreReturn'
-        if evt.KeyCode() != WXK_RETURN:
+        if evt.GetKeyCode() != wx.WXK_RETURN:
             evt.Skip()
 
     def OnOpenButton(self, event):
             evt.Skip()
 
     def OnOpenButton(self, event):
-        dlg = wxTextEntryDialog(self, "Open Location",
+        dlg = wx.TextEntryDialog(self, "Open Location",
                                 "Enter a full URL or local path",
                                 "Enter a full URL or local path",
-                                self.current, wxOK|wxCANCEL)
+                                self.current, wx.OK|wx.CANCEL)
         dlg.CentreOnParent()
         dlg.CentreOnParent()
-        if dlg.ShowModal() == wxID_OK:
+
+        if dlg.ShowModal() == wx.ID_OK:
             self.current = dlg.GetValue()
             self.current = dlg.GetValue()
-            self.ie.LoadUrl(self.current)
+            self.ie.Navigate(self.current)
+
         dlg.Destroy()
 
     def OnHomeButton(self, event):
         dlg.Destroy()
 
     def OnHomeButton(self, event):
@@ -126,13 +149,12 @@ class TestPanel(wxWindow):
         self.ie.GoSearch()
 
     def OnRefreshPageButton(self, evt):
         self.ie.GoSearch()
 
     def OnRefreshPageButton(self, evt):
-        self.ie.Refresh(wxIEHTML_REFRESH_COMPLETELY)
-
+        self.ie.Refresh(iewin.IEHTML_REFRESH_COMPLETELY)
 
 
     def logEvt(self, name, event):
         self.log.write('%s: %s\n' %
 
 
     def logEvt(self, name, event):
         self.log.write('%s: %s\n' %
-                       (name, (event.GetLong1(), event.GetLong2(), event.GetText())))
+                       (name, (event.GetLong1(), event.GetLong2(), event.GetText1())))
 
     def OnBeforeNavigate2(self, evt):
         self.logEvt('OnBeforeNavigate2', evt)
 
     def OnBeforeNavigate2(self, evt):
         self.logEvt('OnBeforeNavigate2', evt)
@@ -143,30 +165,30 @@ class TestPanel(wxWindow):
 
     def OnDocumentComplete(self, evt):
         self.logEvt('OnDocumentComplete', evt)
 
     def OnDocumentComplete(self, evt):
         self.logEvt('OnDocumentComplete', evt)
-        self.current = evt.GetText()
+        self.current = evt.GetText1()
         self.location.SetValue(self.current)
 
     def OnTitleChange(self, evt):
         self.logEvt('OnTitleChange', evt)
         if self.frame:
         self.location.SetValue(self.current)
 
     def OnTitleChange(self, evt):
         self.logEvt('OnTitleChange', evt)
         if self.frame:
-            self.frame.SetTitle(self.titleBase + ' -- ' + evt.GetText())
+            self.frame.SetTitle(self.titleBase + ' -- ' + evt.GetText1())
 
     def OnStatusTextChange(self, evt):
         self.logEvt('OnStatusTextChange', evt)
         if self.frame:
 
     def OnStatusTextChange(self, evt):
         self.logEvt('OnStatusTextChange', evt)
         if self.frame:
-            self.frame.SetStatusText(evt.GetText())
+            self.frame.SetStatusText(evt.GetText1())
 
 
 #----------------------------------------------------------------------
 # for the demo framework...
 
 def runTest(frame, nb, log):
 
 
 #----------------------------------------------------------------------
 # for the demo framework...
 
 def runTest(frame, nb, log):
-    if wxPlatform == '__WXMSW__':
+    if wx.Platform == '__WXMSW__':
         win = TestPanel(nb, log, frame)
         return win
     else:
         win = TestPanel(nb, log, frame)
         return win
     else:
-        dlg = wxMessageDialog(frame, 'This demo only works on MSW.',
-                          'Sorry', wxOK | wxICON_INFORMATION)
+        dlg = wx.MessageDialog(frame, 'This demo only works on MSW.',
+                          'Sorry', wx.OK | wx.ICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()
 
         dlg.ShowModal()
         dlg.Destroy()
 
wxWidgets (Impactor)