Automatically disable wxDialupManager for wxMac and wxCocoa,

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 8c9b6d4ab11594376bfb77cdb23cef9014d4990d..ab5e8d6612869836a5b55099635776ee243a1b50 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -47,10 +47,8 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
-        'StockButtons',
-        'Ticker',
-        'Choicebook',
-        'ListCtrl_edit',
+        'StandardPaths',
+        'MediaCtrl',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -154,6 +152,7 @@ _treeList = [
         'FloatCanvas',
         'HtmlWindow',
         'IntCtrl',
+        'MediaCtrl',
         'MVCTree',   
         'MaskedEditControls',
         'MaskedNumCtrl',
@@ -228,6 +227,7 @@ _treeList = [
         'PrintFramework',
         'ShapedWindow',
         'Sound',
+        'StandardPaths',
         'Unicode',
         ]),
 
@@ -254,9 +254,10 @@ class MyLog(wx.PyLog):
         self.logTime = logTime
 
     def DoLogString(self, message, timeStamp):
-        if self.logTime:
-            message = time.strftime("%X", time.localtime(timeStamp)) + \
-                      ": " + message
+        #print message, timeStamp
+        #if self.logTime:
+        #    message = time.strftime("%X", time.localtime(timeStamp)) + \
+        #              ": " + message
         if self.tc:
             self.tc.AppendText(message + '\n')
 
@@ -317,7 +318,7 @@ class MessagePanel(wx.Panel):
         box.Add((10,10), 2)
 
         self.SetSizer(box)
-        
+        self.Fit()
         
 
 #---------------------------------------------------------------------------
@@ -515,13 +516,13 @@ except ImportError:
         def GetText(self):
             return self.GetValue()
 
-        def GetPositionFromLine(line):
+        def GetPositionFromLine(self, line):
             return self.XYToPosition(0,line)
 
         def GotoLine(self, line):
-            pos = self.editor.GetPositionFromLine(line)
-            self.editor.SetInsertionPoint(pos)
-            self.editor.ShowPosition(pos)
+            pos = self.GetPositionFromLine(line)
+            self.SetInsertionPoint(pos)
+            self.ShowPosition(pos)
 
         def SelectLine(self, line):
             start = self.GetPositionFromLine(line)