Added support for current version of "emxomf".

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 8c9b6d4ab11594376bfb77cdb23cef9014d4990d..980e9e9a5615b527ec49335ce1cae151833f9a88 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -47,10 +47,8 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [

-        'StockButtons',
-        'Ticker',
-        'Choicebook',
-        'ListCtrl_edit',
+        'StandardPaths',
+        'MediaCtrl',

         ]),
 
     # managed windows == things with a (optional) caption you can close
         ]),
 
     # managed windows == things with a (optional) caption you can close


@@ -114,6 +112,7 @@ _treeList = [
         'SpinCtrl',
         'SplitterWindow',
         'StaticBitmap',
         'SpinCtrl',
         'SplitterWindow',
         'StaticBitmap',

+        'StaticBox',

         'StaticText',
         'StatusBar',
         'StockButtons',
         'StaticText',
         'StatusBar',
         'StockButtons',


@@ -154,6 +153,7 @@ _treeList = [
         'FloatCanvas',
         'HtmlWindow',
         'IntCtrl',
         'FloatCanvas',
         'HtmlWindow',
         'IntCtrl',

+        'MediaCtrl',

         'MVCTree',   
         'MaskedEditControls',
         'MaskedNumCtrl',
         'MVCTree',   
         'MaskedEditControls',
         'MaskedNumCtrl',


@@ -194,7 +194,7 @@ _treeList = [
         'PythonEvents',
         'Threads',
         'Timer',
         'PythonEvents',
         'Threads',
         'Timer',

-        ##'infoframe',    # needs better explaination and some fixing
+        ##'infoframe',    # needs better explanation and some fixing

         ]),
 
     # Clipboard and DnD
         ]),
 
     # Clipboard and DnD


@@ -219,7 +219,7 @@ _treeList = [
     # Other stuff
     ('Miscellaneous', [
         'ColourDB',
     # Other stuff
     ('Miscellaneous', [
         'ColourDB',

-        ##'DialogUnits',   # needs more explainations
+        ##'DialogUnits',   # needs more explanations

         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',
         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',


@@ -228,6 +228,7 @@ _treeList = [
         'PrintFramework',
         'ShapedWindow',
         'Sound',
         'PrintFramework',
         'ShapedWindow',
         'Sound',

+        'StandardPaths',

         'Unicode',
         ]),
 
         'Unicode',
         ]),
 


@@ -254,9 +255,10 @@ class MyLog(wx.PyLog):
         self.logTime = logTime
 
     def DoLogString(self, message, timeStamp):
         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')
 
         if self.tc:
             self.tc.AppendText(message + '\n')
 


@@ -317,7 +319,7 @@ class MessagePanel(wx.Panel):
         box.Add((10,10), 2)
 
         self.SetSizer(box)
         box.Add((10,10), 2)
 
         self.SetSizer(box)

-        
+        self.Fit()

         
 
 #---------------------------------------------------------------------------
         
 
 #---------------------------------------------------------------------------


@@ -515,13 +517,13 @@ except ImportError:
         def GetText(self):
             return self.GetValue()
 
         def GetText(self):
             return self.GetValue()
 

-        def GetPositionFromLine(line):
+        def GetPositionFromLine(self, line):

             return self.XYToPosition(0,line)
 
         def GotoLine(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)
 
         def SelectLine(self, line):
             start = self.GetPositionFromLine(line)


@@ -666,7 +668,7 @@ class DemoCodePanel(wx.Panel):
             try:
                 os.makedirs(GetModifiedDirectory())
                 if not os.path.exists(GetModifiedDirectory()):
             try:
                 os.makedirs(GetModifiedDirectory())
                 if not os.path.exists(GetModifiedDirectory()):

-                    wx.LogMessage("BUG: Created demo directory but it still doesn't exit")
+                    wx.LogMessage("BUG: Created demo directory but it still doesn't exist")

                     raise AssetionError
             except:
                 wx.LogMessage("Error creating demo directory: %s" % GetModifiedDirectory())
                     raise AssetionError
             except:
                 wx.LogMessage("Error creating demo directory: %s" % GetModifiedDirectory())