fixed error in mouse capture test

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 6d5a116d187971cb41b3fc2963961d457ca78ad0..4bda0df3c8875c5db27de907efdc3cb6eb73c26b 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,60 +11,101 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 

-import sys, os
+import sys, os, time, string

 from   wxPython.wx import *
 from   wxPython.wx import *

-from   wxPython.lib.splashscreen import SplashScreen

 from   wxPython.html import wxHtmlWindow
 
 from   wxPython.html import wxHtmlWindow
 

+import images
+

 #---------------------------------------------------------------------------
 
 
 _treeList = [
 #---------------------------------------------------------------------------
 
 
 _treeList = [

-    ('New since last release', ['PyShellWindow',
+    ('New since last release', ['wxGenericDirCtrl',
+                                'wxImageFromStream',

                                 ]),
 
                                 ]),
 

-    ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
-
-    ('Non-Managed Windows', ['wxGrid', 'wxSashWindow',
-                             'wxScrolledWindow', 'wxSplitterWindow',
-                             'wxStatusBar', 'wxNotebook',
-                             'wxHtmlWindow',
-                             'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),
+    ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
+                 'wxGrid', 'wxSashWindow',
+                 'wxScrolledWindow', 'wxSplitterWindow',
+                 'wxStatusBar', 'wxNotebook',
+                 'wxHtmlWindow',
+                 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',
+                 'wxPopupWindow',
+                 'wxDynamicSashWindow',
+                 ]),

 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                         'wxSingleChoiceDialog', 'wxTextEntryDialog',
                         'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                         'wxSingleChoiceDialog', 'wxTextEntryDialog',
                         'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',

-                        'wxMessageDialog', 'wxProgressDialog']),
+                        'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog',
+                        ]),

 
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
 
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',

-                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
+                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
+                  'wxTextCtrl',

                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',

-                  'wxCalendarCtrl',
+                  'wxCalendarCtrl', 'wxToggleButton',
+                  'wxEditableListBox', 'wxLEDNumberCtrl',

                   ]),
 
                   ]),
 

-    ('Window Layout', ['wxLayoutConstraints', 'Sizers', 'OldSizers']),
+    ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']),

 
 

-    ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
+    ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop',
+                        'FontEnumerator',

                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',

-                        'wxDragImage', 'PyShellWindow',
+                        'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
+                        'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
+                        'ContextHelp', 'SplitTree',

                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',

-                          'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
-                          'FileBrowseButton', 'GenericButtons', 'wxEditor']),
-
-    ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
+                          'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
+                          'FileBrowseButton', 'GenericButtons', 'wxEditor',
+                          'ColourSelect', 'ImageBrowser',
+                          'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+                          'TablePrint',
+                          'wxRightTextCtrl',
+                          ]),
+
+    ('Cool Contribs', ['pyTree', 'hangman',
+                       #'SlashDot',
+                       'XMLtreeview'
+                       ]),

 
     ]
 
 #---------------------------------------------------------------------------
 
 
     ]
 
 #---------------------------------------------------------------------------
 

+class MyLog(wxPyLog):
+    def __init__(self, textCtrl, logTime=0):
+        wxPyLog.__init__(self)
+        self.tc = textCtrl
+        self.logTime = logTime
+
+    def DoLogString(self, message, timeStamp):
+        if self.logTime:
+            message = time.strftime("%X", time.localtime(timeStamp)) + \
+                      ": " + message
+        self.tc.AppendText(message + '\n')
+
+
+#---------------------------------------------------------------------------
+
+def opj(path):
+    """Convert paths to the platform-specific separator"""
+    return apply(os.path.join, tuple(string.split(path, '/')))
+
+
+#---------------------------------------------------------------------------
+

 class wxPythonDemo(wxFrame):
 class wxPythonDemo(wxFrame):

+

     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, -1, title, size = (800, 600),
                          style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, -1, title, size = (800, 600),
                          style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)


@@ -72,13 +113,31 @@ class wxPythonDemo(wxFrame):
         self.cwd = os.getcwd()
         self.curOverview = ""
 
         self.cwd = os.getcwd()
         self.curOverview = ""
 

+        if 1:
+            icon = wxIconFromXPMData(images.getMondrianData())
+        else:
+            # another way to do it
+            bmp = images.getMondrianBitmap()
+            icon = wxEmptyIcon()
+            icon.CopyFromBitmap(bmp)
+
+        self.SetIcon(icon)
+

         if wxPlatform == '__WXMSW__':
         if wxPlatform == '__WXMSW__':

-            self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
-            self.SetIcon(self.icon)
+            # setup a taskbar icon, and catch some events from it
+            self.tbicon = wxTaskBarIcon()
+            self.tbicon.SetIcon(icon, "wxPython Demo")
+            EVT_TASKBAR_LEFT_DCLICK(self.tbicon, self.OnTaskBarActivate)
+            EVT_TASKBAR_RIGHT_UP(self.tbicon, self.OnTaskBarMenu)
+            EVT_MENU(self.tbicon, self.TBMENU_RESTORE, self.OnTaskBarActivate)
+            EVT_MENU(self.tbicon, self.TBMENU_CLOSE, self.OnTaskBarClose)
+

 
         self.otherWin = None
         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)
 
         self.otherWin = None
         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)

+        EVT_ICONIZE(self, self.OnIconfiy)
+        EVT_MAXIMIZE(self, self.OnMaximize)

 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)
 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)


@@ -86,8 +145,11 @@ class wxPythonDemo(wxFrame):
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 

+        def EmptyHandler(evt): pass
+        EVT_ERASE_BACKGROUND(splitter, EmptyHandler)
+        EVT_ERASE_BACKGROUND(splitter2, EmptyHandler)

 
 

-        # Prevent TreeCtrl from displaying all items after destruction
+        # Prevent TreeCtrl from displaying all items after destruction when true

         self.dying = false
 
         # Make a File menu
         self.dying = false
 
         # Make a File menu


@@ -150,17 +212,34 @@ class wxPythonDemo(wxFrame):
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook

-        self.nb = wxNotebook(splitter2, -1)
+        self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN)
+
+        # Set up a wxHtmlWindow on the Overview Notebook page
+        # we put it in a panel first because there seems to be a
+        # refresh bug of some sort (wxGTK) when it is directly in
+        # the notebook...
+        if 0:  # the old way
+            self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
+            self.nb.AddPage(self.ovr, "Overview")
+
+        else:  # hopefully I can remove this hacky code soon, see bug #216861
+            panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
+            self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
+            self.nb.AddPage(panel, "Overview")

 
 

-        # Set up a TextCtrl on the Overview Notebook page
-        self.ovr = wxHtmlWindow(self.nb, -1)
-        self.nb.AddPage(self.ovr, "Overview")
+            def OnOvrSize(evt, ovr=self.ovr):
+                ovr.SetSize(evt.GetSize())
+
+            EVT_SIZE(panel, OnOvrSize)
+            EVT_ERASE_BACKGROUND(panel, EmptyHandler)
+
+
+        self.SetOverview("Overview", overview)

 
 
         # Set up a TextCtrl on the Demo Code Notebook page
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
 
 
         # Set up a TextCtrl on the Demo Code Notebook page
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)

-        self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))

         self.nb.AddPage(self.txt, "Demo Code")
 
 
         self.nb.AddPage(self.txt, "Demo Code")
 
 


@@ -168,7 +247,8 @@ class wxPythonDemo(wxFrame):
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         # Set the wxWindows log target to be this textctrl
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         # Set the wxWindows log target to be this textctrl

-        wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+        #wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+        wxLog_SetActiveTarget(MyLog(self.log))

 
 
 
 
 
 


@@ -215,12 +295,13 @@ class wxPythonDemo(wxFrame):
     def OnItemExpanded(self, event):
         item = event.GetItem()
         wxLogMessage("OnItemExpanded: %s" % self.tree.GetItemText(item))
     def OnItemExpanded(self, event):
         item = event.GetItem()
         wxLogMessage("OnItemExpanded: %s" % self.tree.GetItemText(item))

+        event.Skip()

 
     #---------------------------------------------
     def OnItemCollapsed(self, event):
         item = event.GetItem()
         wxLogMessage("OnItemCollapsed: %s" % self.tree.GetItemText(item))
 
     #---------------------------------------------
     def OnItemCollapsed(self, event):
         item = event.GetItem()
         wxLogMessage("OnItemCollapsed: %s" % self.tree.GetItemText(item))

-
+        event.Skip()

 
     #---------------------------------------------
     def OnTreeLeftDown(self, event):
 
     #---------------------------------------------
     def OnTreeLeftDown(self, event):


@@ -228,8 +309,7 @@ class wxPythonDemo(wxFrame):
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():
             self.SetOverview(self.tree.GetItemText(item), self.curOverview)
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():
             self.SetOverview(self.tree.GetItemText(item), self.curOverview)

-        else:
-            event.Skip()
+        event.Skip()

 
     #---------------------------------------------
     def OnSelChanged(self, event):
 
     #---------------------------------------------
     def OnSelChanged(self, event):


@@ -301,13 +381,12 @@ class wxPythonDemo(wxFrame):
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')

-            #text = '<font size="-1"><pre>' + text + '</pre></font>'

         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 
     #---------------------------------------------
     # Menu methods
         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 
     #---------------------------------------------
     # Menu methods

-    def OnFileExit(self, event):
+    def OnFileExit(self, *event):

         self.Close()
 
 
         self.Close()
 
 


@@ -323,8 +402,11 @@ class wxPythonDemo(wxFrame):
         self.dying = true
         self.window = None
         self.mainmenu = None
         self.dying = true
         self.window = None
         self.mainmenu = None

+        if hasattr(self, "tbicon"):
+            del self.tbicon

         self.Destroy()
 
         self.Destroy()
 

+

     #---------------------------------------------
     def OnIdle(self, event):
         if self.otherWin:
     #---------------------------------------------
     def OnIdle(self, event):
         if self.otherWin:


@@ -342,47 +424,99 @@ class wxPythonDemo(wxFrame):
             self.tree.SelectItem(selectedDemo)
             self.tree.EnsureVisible(selectedDemo)
 
             self.tree.SelectItem(selectedDemo)
             self.tree.EnsureVisible(selectedDemo)
 

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

 
 

-class MyApp(wxApp):
-    def OnInit(self):
-        wxInitAllImageHandlers()
+    #---------------------------------------------
+    def OnTaskBarActivate(self, evt):
+        if self.IsIconized():
+            self.Iconize(false)
+        if not self.IsShown():
+            self.Show(true)
+        self.Raise()
+
+    #---------------------------------------------
+
+    TBMENU_RESTORE = 1000
+    TBMENU_CLOSE   = 1001
+
+    def OnTaskBarMenu(self, evt):
+        menu = wxMenu()
+        menu.Append(self.TBMENU_RESTORE, "Restore wxPython Demo")
+        menu.Append(self.TBMENU_CLOSE,   "Close")
+        self.tbicon.PopupMenu(menu)
+        menu.Destroy()
+
+    #---------------------------------------------
+    def OnTaskBarClose(self, evt):
+        self.Close()
+
+        # because of the way wxTaskBarIcon.PopupMenu is implemented we have to
+        # prod the main idle handler a bit to get the window to actually close
+        wxGetApp().ProcessIdle()
+
+
+    #---------------------------------------------
+    def OnIconfiy(self, evt):
+        wxLogMessage("OnIconfiy")
+        evt.Skip()
+
+    #---------------------------------------------
+    def OnMaximize(self, evt):
+        wxLogMessage("OnMaximize")
+        evt.Skip()

 
 

-        self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
-                              duration=4000, callback=self.AfterSplash)
-        self.splash.Show(true)
-        wxYield()
-        return true

 
 
 
 

-    def AfterSplash(self):
-        self.splash.Close(true)
+
+#---------------------------------------------------------------------------
+#---------------------------------------------------------------------------
+
+class MySplashScreen(wxSplashScreen):
+    def __init__(self):
+        bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap()
+        wxSplashScreen.__init__(self, bmp,
+                                wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+                                4000, None, -1)
+        EVT_CLOSE(self, self.OnClose)
+
+    def OnClose(self, evt):

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

-        self.SetTopWindow(frame)

         self.ShowTip(frame)
         self.ShowTip(frame)

-
+        self.Destroy()

 
     def ShowTip(self, frame):
         try:
 
     def ShowTip(self, frame):
         try:

-            showTipText = open("data/showTips").read()
+            showTipText = open(opj("data/showTips")).read()

             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)

-        print showTip, index

         if showTip:
         if showTip:

-            tp = wxCreateFileTipProvider("data/tips.txt", index)
+            tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)

             showTip = wxShowTip(frame, tp)
             index = tp.GetCurrentTip()
             showTip = wxShowTip(frame, tp)
             index = tp.GetCurrentTip()

-            open("data/showTips", "w").write(str( (showTip, index) ))
+            open(opj("data/showTips"), "w").write(str( (showTip, index) ))
+
+
+
+class MyApp(wxApp):
+    def OnInit(self):
+        """
+        Create and show the splash screen.  It will then create and show
+        the main frame when it is time to do so.
+        """
+        wxInitAllImageHandlers()
+        splash = MySplashScreen()
+        splash.Show()
+        wxYield()
+        return true
+

 
 
 #---------------------------------------------------------------------------
 
 def main():
     try:
 
 
 #---------------------------------------------------------------------------
 
 def main():
     try:

-        demoPath = os.path.split(__file__)[0]
+        demoPath = os.path.dirname(__file__)

         os.chdir(demoPath)
     except:
         pass
         os.chdir(demoPath)
     except:
         pass