A few little tweaks

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

diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 942dea61342a8b24654146df29cc486748706e13..bdafa03d36a19cbee616cafa9c677636e0108037 100644 (file)
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -18,8 +18,8 @@ class MyHtmlWindow(wxHtmlWindow):
         EVT_SCROLLWIN( self, self.OnScroll )
 
     def OnScroll( self, event ):
         EVT_SCROLLWIN( self, self.OnScroll )
 
     def OnScroll( self, event ):

-        print 'event.GetOrientation()',event.GetOrientation()
-        print 'event.GetPosition()',event.GetPosition()
+        #print 'event.GetOrientation()',event.GetOrientation()
+        #print 'event.GetPosition()',event.GetPosition()

         event.Skip()
 
 
         event.Skip()
 
 


@@ -62,32 +62,33 @@ class TestHtmlPanel(wxPanel):
         self.box.Add(self.html, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
         self.box.Add(self.html, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)

-##         btn = wxButton(self, 1201, "Show Default")
-##         EVT_BUTTON(self, 1201, self.OnShowDefault)
-##         subbox.Add(btn, 1, wxGROW | wxALL, 2)

 
 

-        btn = wxButton(self, 1202, "Load File")
-        EVT_BUTTON(self, 1202, self.OnLoadFile)
+        btn = wxButton(self, -1, "Load File")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadFile)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 

-        btn = wxButton(self, 1203, "With Widgets")
-        EVT_BUTTON(self, 1203, self.OnWithWidgets)
+        btn = wxButton(self, -1, "Load URL")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadURL)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 

-        btn = wxButton(self, 1204, "Back")
-        EVT_BUTTON(self, 1204, self.OnBack)
+        btn = wxButton(self, -1, "With Widgets")
+        EVT_BUTTON(self, btn.GetId(), self.OnWithWidgets)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 

-        btn = wxButton(self, 1205, "Forward")
-        EVT_BUTTON(self, 1205, self.OnForward)
+        btn = wxButton(self, -1, "Back")
+        EVT_BUTTON(self, btn.GetId(), self.OnBack)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 

-        btn = wxButton(self, 1207, "Print")
-        EVT_BUTTON(self, 1207, self.OnPrint)
+        btn = wxButton(self, -1, "Forward")
+        EVT_BUTTON(self, btn.GetId(), self.OnForward)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 

-        btn = wxButton(self, 1206, "View Source")
-        EVT_BUTTON(self, 1206, self.OnViewSource)
+        btn = wxButton(self, -1, "Print")
+        EVT_BUTTON(self, btn.GetId(), self.OnPrint)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+
+        btn = wxButton(self, -1, "View Source")
+        EVT_BUTTON(self, btn.GetId(), self.OnViewSource)

         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         self.box.Add(subbox, 0, wxGROW)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         self.box.Add(subbox, 0, wxGROW)


@@ -100,10 +101,6 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
         self.OnShowDefault(None)
 
 

-##     def __del__(self):
-##         print 'TestHtmlPanel.__del__'
-
-

 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))
 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))


@@ -118,6 +115,14 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
         dlg.Destroy()
 
 

+    def OnLoadURL(self, event):
+        dlg = wxTextEntryDialog(self, "Enter a URL")
+        if dlg.ShowModal():
+            url = dlg.GetValue()
+            self.html.LoadPage(url)
+        dlg.Destroy()
+
+

     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
         name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
         name = os.path.join(self.cwd, opj('data/widgetTest.htm'))