fixed some compiler warnings in wxaui

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 6b978e229111467262c8d741c100c28a86806e03..12eb24ad90b31d71cf1176bdd9028c22688c6f9f 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -36,8 +36,8 @@ import images
 
 # For debugging
 ##wx.Trap();
 
 # For debugging
 ##wx.Trap();

-##print "wx.VERSION_STRING = ", wx.VERSION_STRING
-##print os.getpid();
+##print "wx.VERSION_STRING = %s (%s)" % (wx.VERSION_STRING, wx.USE_UNICODE and 'unicode' or 'ansi')
+##print "pid:", os.getpid()

 ##raw_input("Press Enter...")
 
 
 ##raw_input("Press Enter...")
 
 


@@ -47,14 +47,33 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [

-        'StandardPaths',
-        'MediaCtrl',
-        'DatePickerCtrl',
-        'MouseGestures',
+        'AnalogClock',
+        'AUI_DockingWindowMgr',
+        'AUI_Notebook',
+        'CheckListCtrlMixin',
+        'ComboTreeBox',
+        'Pickers',
+        'PseudoDC',
+        'RichTextCtrl',
+        'Treebook',
+        'Toolbook',
+        'BitmapFromBuffer',
+        'RawBitmapAccess',
+        'DragScroller',
+        'DelayedResult',
+        'ExpandoTextCtrl',
+        'ButtonPanel',
+        'FlatNotebook',
+        'CustomTreeCtrl',
+        'AboutBox',
+        'AnimateCtrl',
+        'AlphaDrawing',
+        'GraphicsContext',

         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Frames and Dialogs', [
         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Frames and Dialogs', [

+        'AUI_DockingWindowMgr',

         'Dialog',
         'Frame',
         'MDIWindows',
         'Dialog',
         'Frame',
         'MDIWindows',


@@ -64,12 +83,14 @@ _treeList = [
 
     # the common dialogs
     ('Common Dialogs', [
 
     # the common dialogs
     ('Common Dialogs', [

+        'AboutBox',

         'ColourDialog',
         'DirDialog',
         'FileDialog',
         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',
         'ColourDialog',
         'DirDialog',
         'FileDialog',
         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',

+        'MultiChoiceDialog',

         'PageSetupDialog',
         'PrintDialog',
         'ProgressDialog',
         'PageSetupDialog',
         'PrintDialog',
         'ProgressDialog',


@@ -80,7 +101,6 @@ _treeList = [
     # dialogs from libraries
     ('More Dialogs', [
         'ImageBrowser',
     # dialogs from libraries
     ('More Dialogs', [
         'ImageBrowser',

-        'MultipleChoiceDialog',

         'ScrolledMessageDialog',
         ]),
 
         'ScrolledMessageDialog',
         ]),
 


@@ -91,7 +111,6 @@ _treeList = [
         'CheckBox',
         'CheckListBox',
         'Choice',
         'CheckBox',
         'CheckListBox',
         'Choice',

-        'Choicebook',

         'ComboBox',
         'Gauge',
         'Grid',
         'ComboBox',
         'Gauge',
         'Grid',


@@ -100,9 +119,7 @@ _treeList = [
         'ListCtrl',
         'ListCtrl_virtual',
         'ListCtrl_edit',
         'ListCtrl',
         'ListCtrl_virtual',
         'ListCtrl_edit',

-        'Listbook',

         'Menu',
         'Menu',

-        'Notebook',

         'PopupMenu',
         'PopupWindow',
         'RadioBox',
         'PopupMenu',
         'PopupWindow',
         'RadioBox',


@@ -124,11 +141,24 @@ _treeList = [
         'TreeCtrl',
         'Validator',
         ]),
         'TreeCtrl',
         'Validator',
         ]),

+    
+    ('"Book" Controls', [
+        'AUI_Notebook',
+        'Choicebook',
+        'Listbook',
+        'Notebook',
+        'Toolbook',
+        'Treebook',
+        ]),

 
     ('Custom Controls', [
 
     ('Custom Controls', [

-        'AnalogClockWindow',
+        'AnalogClock',
+        'ButtonPanel',

         'ColourSelect',
         'ColourSelect',

+        'ComboTreeBox',
+        'CustomTreeCtrl',

         'Editor',
         'Editor',

+        'FlatNotebook',

         'GenericButtons',
         'GenericDirCtrl',
         'LEDNumberCtrl',
         'GenericButtons',
         'GenericDirCtrl',
         'LEDNumberCtrl',


@@ -146,24 +176,30 @@ _treeList = [
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',

+        'CheckListCtrlMixin',

         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',

+        'ExpandoTextCtrl',

         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',
         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',

+        'FoldPanelBar',

         'HtmlWindow',
         'HtmlWindow',

+        'HyperLinkCtrl',

         'IntCtrl',
         'IntCtrl',

-        'MediaCtrl',

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

-        'MimeTypesManager',
+        'MediaCtrl',
+        'MultiSplitterWindow',
+        'Pickers',

         'PyCrust',
         'PyPlot',
         'PyShell',
         'PyCrust',
         'PyPlot',
         'PyShell',

+        'RichTextCtrl',

         'ScrolledPanel',
         'SplitTree',
         'StyledTextCtrl_1',
         'ScrolledPanel',
         'SplitTree',
         'StyledTextCtrl_1',


@@ -191,6 +227,7 @@ _treeList = [
 
     # ditto
     ('Process and Events', [
 
     # ditto
     ('Process and Events', [

+        'DelayedResult',

         'EventManager',
         'KeyEvents',
         'Process',
         'EventManager',
         'KeyEvents',
         'Process',


@@ -209,38 +246,43 @@ _treeList = [
 
     # Images
     ('Using Images', [
 
     # Images
     ('Using Images', [

+        'AlphaDrawing',
+        'AnimationCtrl',

         'ArtProvider',
         'ArtProvider',

+        'BitmapFromBuffer',

         'Cursor',
         'DragImage',
         'Image',
         'ImageAlpha',
         'ImageFromStream',
         'Mask',
         'Cursor',
         'DragImage',
         'Image',
         'ImageAlpha',
         'ImageFromStream',
         'Mask',

+        'RawBitmapAccess',

         'Throbber',
         ]),
 
     # Other stuff
     ('Miscellaneous', [
         'Throbber',
         ]),
 
     # Other stuff
     ('Miscellaneous', [

+        'AlphaDrawing',

         'ColourDB',
         ##'DialogUnits',   # needs more explanations
         'ColourDB',
         ##'DialogUnits',   # needs more explanations

+        'DragScroller',

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

+        'GraphicsContext',
+        'GLCanvas',

         'Joystick',
         'Joystick',

+        'MimeTypesManager',

         'MouseGestures',
         'OGL',
         'PrintFramework',
         'MouseGestures',
         'OGL',
         'PrintFramework',

+        'PseudoDC',

         'ShapedWindow',
         'Sound',
         'StandardPaths',
         'Unicode',
         ]),
 
         'ShapedWindow',
         'Sound',
         'StandardPaths',
         'Unicode',
         ]),
 

-    # need libs not coming with the demo
-    ('Samples using an external library', [
-        'GLCanvas',
-        ]),
-

 
     ('Check out the samples dir too', [
         ]),
 
     ('Check out the samples dir too', [
         ]),


@@ -449,9 +491,14 @@ try:
             if wx.Platform == '__WXMSW__':
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
                                   'fore:#000000,back:#FFFFFF,face:Courier New,size:9')
             if wx.Platform == '__WXMSW__':
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
                                   'fore:#000000,back:#FFFFFF,face:Courier New,size:9')

+            elif wx.Platform == '__WXMAC__':
+                # TODO: if this looks fine on Linux too, remove the Mac-specific case 
+                # and use this whenever OS != MSW.
+                self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
+                                  'fore:#000000,back:#FFFFFF,face:Courier')

             else:
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
             else:
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 

-                                  'fore:#000000,back:#FFFFFF,face:Courier,size:12')
+                                  'fore:#000000,back:#FFFFFF,face:Courier,size:9')

     
             # Clear styles and revert to default.
             self.StyleClearAll()
     
             # Clear styles and revert to default.
             self.StyleClearAll()


@@ -797,7 +844,8 @@ class DemoModules:
     def LoadDict(self, modID):
         if self.name != __name__:
             source = self.modules[modID][1]
     def LoadDict(self, modID):
         if self.name != __name__:
             source = self.modules[modID][1]

-            description = self.modules[modID][3]
+            #description = self.modules[modID][3]
+            description = self.modules[modID][2]

 
             try:
                 self.modules[modID][0] = {}
 
             try:
                 self.modules[modID][0] = {}


@@ -933,7 +981,7 @@ class DemoErrorPanel(wx.Panel):
         self.box = wx.BoxSizer(wx.VERTICAL)
 
         # Main Label
         self.box = wx.BoxSizer(wx.VERTICAL)
 
         # Main Label

-        self.box.Add(wx.StaticText(self, -1, "An error has occured while trying to run the demo")
+        self.box.Add(wx.StaticText(self, -1, "An error has occurred while trying to run the demo")

                      , 0, wx.ALIGN_CENTER | wx.TOP, 10)
 
         # Exception Information
                      , 0, wx.ALIGN_CENTER | wx.TOP, 10)
 
         # Exception Information


@@ -1076,8 +1124,7 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
 
 
     def OnTaskBarChange(self, evt):
 
 
     def OnTaskBarChange(self, evt):

-        names = [ "WXPdemo", "WXP", "Mondrian", "Test2m",
-                  "Blom08m", "Blom10m", "Blom15m" ]
+        names = [ "WXPdemo", "Mondrian", "Pencil", "Carrot" ]                  

         name = names[self.imgidx]
         
         getFunc = getattr(images, "get%sImage" % name)
         name = names[self.imgidx]
         
         getFunc = getattr(images, "get%sImage" % name)


@@ -1110,12 +1157,16 @@ class wxPythonDemo(wx.Frame):
         self.codePage = None
         self.shell = None
         self.firstTime = True
         self.codePage = None
         self.shell = None
         self.firstTime = True

+        self.finddlg = None

 
         icon = images.getWXPdemoIcon()
         self.SetIcon(icon)
 
 
         icon = images.getWXPdemoIcon()
         self.SetIcon(icon)
 

-        self.tbicon = DemoTaskBarIcon(self)
-
+        try:
+            self.tbicon = DemoTaskBarIcon(self)
+        except:
+            self.tbicon = None
+            

         wx.CallAfter(self.ShowTip)
 
         self.otherWin = None
         wx.CallAfter(self.ShowTip)
 
         self.otherWin = None


@@ -1163,22 +1214,6 @@ class wxPythonDemo(wx.Frame):
             menu.AppendMenu(wx.NewId(), item[0], submenu)
         self.mainmenu.Append(menu, '&Demo')
 
             menu.AppendMenu(wx.NewId(), item[0], submenu)
         self.mainmenu.Append(menu, '&Demo')
 

-        # Make a Demo Code menu
-        #TODO: Add new menu items
-        #       Like the option-enabled entries to select the
-        #       active module
-        #TODO: should we bother?
-
-        #menu = wx.Menu()
-        #saveID = wx.NewId()
-        #restoreID = wx.NewId()
-       # 
-        #menu.Append(saveID, '&Save\tCtrl-S', 'Save edited demo')
-        #menu.Append(restoreID, '&Delete Modified\tCtrl-R', 'Delete modified copy')
-        #self.Bind(wx.EVT_MENU, self.codePage.OnSave, id=saveID)
-        #self.Bind(wx.EVT_MENU, self.codePage.OnRestore, id=restoreID)
-        #self.mainmenu.Append(menu, 'Demo &Code')
-       # 

 
         # Make a Help menu
         menu = wx.Menu()
 
         # Make a Help menu
         menu = wx.Menu()


@@ -1189,20 +1224,23 @@ class wxPythonDemo(wx.Frame):
         shellItem = menu.Append(-1, 'Open Py&Shell Window\tF5',
                                 'An interactive interpreter window with the demo app and frame objects in the namesapce')
         menu.AppendSeparator()
         shellItem = menu.Append(-1, 'Open Py&Shell Window\tF5',
                                 'An interactive interpreter window with the demo app and frame objects in the namesapce')
         menu.AppendSeparator()

-        helpItem = menu.Append(-1, '&About\tCtrl-H', 'wxPython RULES!!!')
+        helpItem = menu.Append(-1, '&About wxPython Demo', 'wxPython RULES!!!')

         wx.App.SetMacAboutMenuItemId(helpItem.GetId())
 
         self.Bind(wx.EVT_MENU, self.OnOpenShellWindow, shellItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
         self.Bind(wx.EVT_MENU, self.OnHelpFind,  findItem)
         self.Bind(wx.EVT_MENU, self.OnFindNext,  findnextItem)
         wx.App.SetMacAboutMenuItemId(helpItem.GetId())
 
         self.Bind(wx.EVT_MENU, self.OnOpenShellWindow, shellItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
         self.Bind(wx.EVT_MENU, self.OnHelpFind,  findItem)
         self.Bind(wx.EVT_MENU, self.OnFindNext,  findnextItem)

-        self.Bind(wx.EVT_COMMAND_FIND, self.OnFind)
-        self.Bind(wx.EVT_COMMAND_FIND_NEXT, self.OnFind)
-        self.Bind(wx.EVT_COMMAND_FIND_CLOSE, self.OnFindClose)
+        self.Bind(wx.EVT_FIND, self.OnFind)
+        self.Bind(wx.EVT_FIND_NEXT, self.OnFind)
+        self.Bind(wx.EVT_FIND_CLOSE, self.OnFindClose)
+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFindItems, findItem)
+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFindItems, findnextItem)

         self.mainmenu.Append(menu, '&Help')
         self.SetMenuBar(self.mainmenu)
 
         self.finddata = wx.FindReplaceData()
         self.mainmenu.Append(menu, '&Help')
         self.SetMenuBar(self.mainmenu)
 
         self.finddata = wx.FindReplaceData()

+        self.finddata.SetFlags(wx.FR_DOWN)

 
         if 0:
             # This is another way to set Accelerators, in addition to
 
         if 0:
             # This is another way to set Accelerators, in addition to


@@ -1398,7 +1436,7 @@ class wxPythonDemo(wx.Frame):
         
         # o The RunTest() for all samples must now return a window that can
         #   be palced in a tab in the main notebook.
         
         # o The RunTest() for all samples must now return a window that can
         #   be palced in a tab in the main notebook.

-        # o If an error occurs (or has occured before) an error tab is created.
+        # o If an error occurs (or has occurred before) an error tab is created.

         
         if module is not None:
             wx.LogMessage("Running demo module...")
         
         if module is not None:
             wx.LogMessage("Running demo module...")


@@ -1515,25 +1553,40 @@ class wxPythonDemo(wx.Frame):
         about.Destroy()
 
     def OnHelpFind(self, event):
         about.Destroy()
 
     def OnHelpFind(self, event):

+        if self.finddlg != None:
+            return
+        

         self.nb.SetSelection(1)
         self.finddlg = wx.FindReplaceDialog(self, self.finddata, "Find",
         self.nb.SetSelection(1)
         self.finddlg = wx.FindReplaceDialog(self, self.finddata, "Find",

-                        wx.FR_NOUPDOWN |
-                        wx.FR_NOMATCHCASE |
-                        wx.FR_NOWHOLEWORD)
+                        wx.FR_NOMATCHCASE | wx.FR_NOWHOLEWORD)

         self.finddlg.Show(True)
 
         self.finddlg.Show(True)
 

+
+    def OnUpdateFindItems(self, evt):
+        evt.Enable(self.finddlg == None)
+
+

     def OnFind(self, event):
         editor = self.codePage.editor
         self.nb.SetSelection(1)
         end = editor.GetLastPosition()
         textstring = editor.GetRange(0, end).lower()
     def OnFind(self, event):
         editor = self.codePage.editor
         self.nb.SetSelection(1)
         end = editor.GetLastPosition()
         textstring = editor.GetRange(0, end).lower()

-        start = editor.GetSelection()[1]

         findstring = self.finddata.GetFindString().lower()
         findstring = self.finddata.GetFindString().lower()

-        loc = textstring.find(findstring, start)
+        backward = not (self.finddata.GetFlags() & wx.FR_DOWN)
+        if backward:
+            start = editor.GetSelection()[0]
+            loc = textstring.rfind(findstring, 0, start)
+        else:
+            start = editor.GetSelection()[1]
+            loc = textstring.find(findstring, start)

         if loc == -1 and start != 0:
             # string not found, start at beginning
         if loc == -1 and start != 0:
             # string not found, start at beginning

-            start = 0
-            loc = textstring.find(findstring, start)
+            if backward:
+                start = end
+                loc = textstring.rfind(findstring, 0, start)
+            else:
+                start = 0
+                loc = textstring.find(findstring, start)

         if loc == -1:
             dlg = wx.MessageDialog(self, 'Find String Not Found',
                           'Find String Not Found in Demo File',
         if loc == -1:
             dlg = wx.MessageDialog(self, 'Find String Not Found',
                           'Find String Not Found in Demo File',


@@ -1546,6 +1599,7 @@ class wxPythonDemo(wx.Frame):
                 return
             else:
                 self.finddlg.Destroy()
                 return
             else:
                 self.finddlg.Destroy()

+                self.finddlg = None

         editor.ShowPosition(loc)
         editor.SetSelection(loc, loc + len(findstring))
 
         editor.ShowPosition(loc)
         editor.SetSelection(loc, loc + len(findstring))
 


@@ -1559,6 +1613,7 @@ class wxPythonDemo(wx.Frame):
 
     def OnFindClose(self, event):
         event.GetDialog().Destroy()
 
     def OnFindClose(self, event):
         event.GetDialog().Destroy()

+        self.finddlg = None

 
 
     def OnOpenShellWindow(self, evt):
 
 
     def OnOpenShellWindow(self, evt):


@@ -1594,7 +1649,8 @@ class wxPythonDemo(wx.Frame):
         self.demoPage = None
         self.codePage = None
         self.mainmenu = None
         self.demoPage = None
         self.codePage = None
         self.mainmenu = None

-        self.tbicon.Destroy()
+        if self.tbicon is not None:
+            self.tbicon.Destroy()

         self.Destroy()
 
 
         self.Destroy()
 
 


@@ -1658,18 +1714,33 @@ class wxPythonDemo(wx.Frame):
 
 class MySplashScreen(wx.SplashScreen):
     def __init__(self):
 
 class MySplashScreen(wx.SplashScreen):
     def __init__(self):

-        bmp = wx.Image(opj("bitmaps/splash.gif")).ConvertToBitmap()
+        bmp = wx.Image(opj("bitmaps/splash.png")).ConvertToBitmap()

         wx.SplashScreen.__init__(self, bmp,
                                  wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
         wx.SplashScreen.__init__(self, bmp,
                                  wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,

-                                 3000, None, -1)
+                                 5000, None, -1)

         self.Bind(wx.EVT_CLOSE, self.OnClose)
         self.Bind(wx.EVT_CLOSE, self.OnClose)

+        self.fc = wx.FutureCall(2000, self.ShowMain)
+

 
     def OnClose(self, evt):
 
     def OnClose(self, evt):

+        # Make sure the default handler runs too so this window gets
+        # destroyed
+        evt.Skip()

         self.Hide()
         self.Hide()

+        
+        # if the timer is still running then go ahead and show the
+        # main frame now
+        if self.fc.IsRunning():
+            self.fc.Stop()
+            self.ShowMain()
+
+
+    def ShowMain(self):

         frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
         frame.Show()
         frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
         frame.Show()

-        evt.Skip()  # Make sure the default handler runs too...
-
+        if self.fc.IsRunning():
+            self.Raise()
+        

 
 class MyApp(wx.App):
     def OnInit(self):
 
 class MyApp(wx.App):
     def OnInit(self):


@@ -1678,6 +1749,8 @@ class MyApp(wx.App):
         the main frame when it is time to do so.
         """
 
         the main frame when it is time to do so.
         """
 

+        wx.SystemOptions.SetOptionInt("mac.window-plain-transition", 1)
+

         # For debugging
         #self.SetAssertMode(wx.PYAPP_ASSERT_DIALOG)
 
         # For debugging
         #self.SetAssertMode(wx.PYAPP_ASSERT_DIALOG)
 


@@ -1686,7 +1759,7 @@ class MyApp(wx.App):
         # initialization, finally creating and showing the main
         # application window(s).  In this case we have nothing else to
         # do so we'll delay showing the main frame until later (see
         # initialization, finally creating and showing the main
         # application window(s).  In this case we have nothing else to
         # do so we'll delay showing the main frame until later (see

-        # OnClose above) so the users can see the SplashScreen effect.        
+        # ShowMain above) so the users can see the SplashScreen effect.        

         splash = MySplashScreen()
         splash.Show()
 
         splash = MySplashScreen()
         splash.Show()