fixing 'id' objc.h collisions

[wxWidgets.git] / wxPython / samples / pydocview / PyDocViewDemo.py

diff --git a/wxPython/samples/pydocview/PyDocViewDemo.py b/wxPython/samples/pydocview/PyDocViewDemo.py
index 7f7790d145a21f1dbdeebe9fd80f7c0f116a5215..a2a6d56684a12e3f3627badc94e4faef5728c90e 100644 (file)
--- a/wxPython/samples/pydocview/PyDocViewDemo.py
+++ b/wxPython/samples/pydocview/PyDocViewDemo.py
@@ -12,12 +12,12 @@
 
 
 import sys
 
 
 import sys

+import os.path

 import wx
 import wx.lib.docview as docview
 import wx.lib.pydocview as pydocview
 import TextEditor
 import FindService
 import wx
 import wx.lib.docview as docview
 import wx.lib.pydocview as pydocview
 import TextEditor
 import FindService

-import os.path

 _ = wx.GetTranslation
 
 
 _ = wx.GetTranslation
 
 


@@ -27,14 +27,15 @@ _ = wx.GetTranslation
 
 class TextEditorApplication(pydocview.DocApp):
 
 
 class TextEditorApplication(pydocview.DocApp):
 

-
+    SPLASH = "splash.png"
+    

     def OnInit(self):
         # Call the super - this is important!!!
         pydocview.DocApp.OnInit(self)
 
         # Show the splash dialog while everything is loading up
     def OnInit(self):
         # Call the super - this is important!!!
         pydocview.DocApp.OnInit(self)
 
         # Show the splash dialog while everything is loading up

-        if os.path.exists("splash.jpg"):
-            self.ShowSplash("splash.jpg")
+        if os.path.exists(TextEditorApplication.SPLASH):
+            self.ShowSplash(TextEditorApplication.SPLASH)

 
         # Set the name and the icon
         self.SetAppName(_("wxPython PyDocView Demo"))
 
         # Set the name and the icon
         self.SetAppName(_("wxPython PyDocView Demo"))


@@ -60,11 +61,11 @@ class TextEditorApplication(pydocview.DocApp):
         # Install services - these can install menu and toolbar items
         textService           = self.InstallService(TextEditor.TextService())
         findService           = self.InstallService(FindService.FindService())
         # Install services - these can install menu and toolbar items
         textService           = self.InstallService(TextEditor.TextService())
         findService           = self.InstallService(FindService.FindService())

-        optionsService        = self.InstallService(pydocview.DocOptionsService())
+        optionsService        = self.InstallService(pydocview.DocOptionsService(supportedModes=wx.lib.docview.DOC_MDI))

         windowMenuService     = self.InstallService(pydocview.WindowMenuService())
         filePropertiesService = self.InstallService(pydocview.FilePropertiesService())
         windowMenuService     = self.InstallService(pydocview.WindowMenuService())
         filePropertiesService = self.InstallService(pydocview.FilePropertiesService())

-        if os.path.exists("splash.jpg"):
-            aboutService      = self.InstallService(pydocview.AboutService(image=wx.Image("splash.jpg")))
+        if os.path.exists(TextEditorApplication.SPLASH):
+            aboutService      = self.InstallService(pydocview.AboutService(image=wx.Image(TextEditorApplication.SPLASH)))

         else:
             aboutService      = self.InstallService(pydocview.AboutService())
             
         else:
             aboutService      = self.InstallService(pydocview.AboutService())
             


@@ -82,13 +83,15 @@ class TextEditorApplication(pydocview.DocApp):
             textTemplate.CreateDocument('', docview.DOC_NEW).OnNewDocument()
 
         # Close the splash dialog
             textTemplate.CreateDocument('', docview.DOC_NEW).OnNewDocument()
 
         # Close the splash dialog

-        if os.path.exists("splash.jpg"):
+        if os.path.exists(TextEditorApplication.SPLASH):

             self.CloseSplash()
         
         # Show the tips dialog
         if os.path.exists("tips.txt"):
             wx.CallAfter(self.ShowTip, wx.GetApp().GetTopWindow(), wx.CreateFileTipProvider("tips.txt", 0))
 
             self.CloseSplash()
         
         # Show the tips dialog
         if os.path.exists("tips.txt"):
             wx.CallAfter(self.ShowTip, wx.GetApp().GetTopWindow(), wx.CreateFileTipProvider("tips.txt", 0))
 

+        wx.UpdateUIEvent.SetUpdateInterval(1000)  # Overhead of updating menus was too much.  Change to update every N milliseconds.
+

         # Tell the framework that everything is great
         return True
 
         # Tell the framework that everything is great
         return True