Change demo to not try to drop the table when it thinks it is creating it for the...

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 7379e4db9ff74426deb0b5785320e3de28089f17..076240ec1d87124e31c5f45e5ffa7ca688510934 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -16,11 +16,13 @@ from   wxPython.wx import *
 from   wxPython.lib.splashscreen import SplashScreen
 from   wxPython.html import wxHtmlWindow
 
 from   wxPython.lib.splashscreen import SplashScreen
 from   wxPython.html import wxHtmlWindow
 

+import images
+

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

-    ('New since last release', ['LayoutAnchors', "FancyText",
+    ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe',

                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),


@@ -57,7 +59,7 @@ _treeList = [
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
                           'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
                           'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',

-                          'PyShellWindow',
+                          'PyShellWindow', 'ColourSelect', 'ImageBrowser',

                           ]),
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
                           ]),
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),


@@ -75,10 +77,10 @@ class wxPythonDemo(wxFrame):
         self.cwd = os.getcwd()
         self.curOverview = ""
 
         self.cwd = os.getcwd()
         self.curOverview = ""
 

-        if wxPlatform == '__WXMSW__':
-            icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
-            self.SetIcon(icon)
+        icon = wxIconFromXPMData(images.getMondrianData())
+        self.SetIcon(icon)

 
 

+        if wxPlatform == '__WXMSW__':

             # setup a taskbar icon, and catch some events from it
             self.tbicon = wxTaskBarIcon()
             self.tbicon.SetIcon(icon, "wxPython Demo")
             # setup a taskbar icon, and catch some events from it
             self.tbicon = wxTaskBarIcon()
             self.tbicon.SetIcon(icon, "wxPython Demo")


@@ -91,6 +93,8 @@ class wxPythonDemo(wxFrame):
         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)


@@ -172,7 +176,7 @@ class wxPythonDemo(wxFrame):
             self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
             self.nb.AddPage(self.ovr, "Overview")
 
             self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
             self.nb.AddPage(self.ovr, "Overview")
 

-        else:  # hopefully I can remove this hacky code soon
+        else:  # hopefully I can remove this hacky code soon, see bug #216861

             panel = wxPanel(self.nb, -1)
             self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
             self.nb.AddPage(panel, "Overview")
             panel = wxPanel(self.nb, -1)
             self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
             self.nb.AddPage(panel, "Overview")


@@ -403,6 +407,19 @@ class wxPythonDemo(wxFrame):
         wxGetApp().ProcessIdle()
 
 
         wxGetApp().ProcessIdle()
 
 

+    #---------------------------------------------
+    def OnIconfiy(self, evt):
+        wxLogMessage("OnIconfiy")
+        evt.Skip()
+
+    #---------------------------------------------
+    def OnMaximize(self, evt):
+        wxLogMessage("OnMaximize")
+        evt.Skip()
+
+
+
+

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