uncommented a try...except that I had removed for testing.

[wxWidgets.git] / utils / wxPython / demo / Main.py
diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py

index 175b0c4e151d38a04f28b14b320dc6d3adee11b0..2ff415103e94b8921f4a8174cd941f5272bb54be 100644 (file)
--- a/utils/wxPython/demo/Main.py
+++ b/utils/wxPython/demo/Main.py
@@ -133,7 +133,7 @@ class wxPythonDemo(wxFrame):
          self.log = wxTextCtrl(splitter2, -1,
                                style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
          (w, self.charHeight) = self.log.GetTextExtent('X')
-        #self.WriteText('wxPython Demo Log:\n')
+        self.WriteText('wxPython Demo Log:\n')
  
  
          # add the windows to the splitter and split it.
@@ -168,8 +168,9 @@ class wxPythonDemo(wxFrame):
          w, h = self.log.GetClientSizeTuple()
          numLines = h/self.charHeight
          x, y = self.log.PositionToXY(self.log.GetLastPosition())
-        self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
-        ##self.log.ShowPosition(self.log.GetLastPosition())
+        if y > numLines:
+            self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
+            ##self.log.ShowPosition(self.log.GetLastPosition())
          self.log.SetInsertionPointEnd()
  
      def write(self, txt):
@@ -265,6 +266,7 @@ class wxPythonDemo(wxFrame):
          #                        "of wxPython.\n\n"
          #                        "          Developed by Robin Dunn",
          #                       "About wxPython", wxOK)
+        from About import MyAboutBox
          about = MyAboutBox(self)
          about.ShowModal()
          about.Destroy()
@@ -296,44 +298,6 @@ class wxPythonDemo(wxFrame):
  
  
  
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-
-class MyAboutBox(wxDialog):
-    text = '''
-<html>
-<body bgcolor="#AC76DE">
-<center><table bgcolor="#458154" width="100%%" cellspacing="0" cellpadding="0" border="1">
-<tr>
-    <td align="center"><h1>wxPython %s</h1></td>
-</tr>
-</table>
-
-<p><b>wxPython</b> is a Python extension module that
-encapsulates the wxWindows GUI classes.</p>
-
-<p>This demo shows off some of the capabilities
-of <b>wxPython</b>.  Select items from the menu or tree control,
-sit back and enjoy.  Be sure to take a peek at the source code for each
-demo item so you can learn how to use the classes yourself.</p>
-
-<p><b>wxPython</b> is brought to you by <b>Robin Dunn</b> and<br>
-<b>Total Control Software</b>, copyright 1999.</p>
-
-<p><font size="-1">Please see <i>license.txt</i> for licensing information.</font></p>
-</center>
-</body>
-</html>
-'''
-    def __init__(self, parent):
-        from wxPython.html import *
-        wxDialog.__init__(self, parent, -1, 'About wxPython')
-        self.html = wxHtmlWindow(self, -1, wxPoint(5,5), wxSize(400, 350))
-        self.html.SetPage(self.text % wx.__version__)
-        wxButton(self, wxID_OK, 'OK', wxPoint(5, 365)).SetDefault()
-        self.Fit()
-
-
  #---------------------------------------------------------------------------
  #---------------------------------------------------------------------------