test wxString's char<->wchar_t ctors

[wxWidgets.git] / wxPython / src / _app_ex.py

diff --git a/wxPython/src/_app_ex.py b/wxPython/src/_app_ex.py
index 808743dd33f5421fe6f107ee09f9be6d2b57150b..f70c78c26f9600dd960fc06605ce1e6c835a2cc2 100644 (file)
--- a/wxPython/src/_app_ex.py
+++ b/wxPython/src/_app_ex.py
@@ -78,40 +78,45 @@ class App(wx.PyApp):
 
     Every application must have a ``wx.App`` instance, and all
     creation of UI objects should be delayed until after the
-    ``wx.App`` object has been created in order to ensure that the
-    gui platform and wxWidgets have been fully initialized.
+    ``wx.App`` object has been created in order to ensure that the gui
+    platform and wxWidgets have been fully initialized.
 
     Normally you would derive from this class and implement an
     ``OnInit`` method that creates a frame and then calls
     ``self.SetTopWindow(frame)``.
 
-    :see: `wx.PySimpleApp` for a simpler app class that can be used directly.
+    :see: `wx.PySimpleApp` for a simpler app class that can be used
+           directly.
     """
     
     outputWindowClass = PyOnDemandOutputWindow
 
-    def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False):
+    def __init__(self, redirect=_defRedirect, filename=None,
+                 useBestVisual=False, clearSigInt=True):
         """
         Construct a ``wx.App`` object.  
 
-        :param redirect: Should ``sys.stdout`` and ``sys.stderr``
-            be redirected?  Defaults to True on Windows and Mac,
-            False otherwise.  If `filename` is None then output
-            will be redirected to a window that pops up as
-            needed.  (You can control what kind of window is
-            created for the output by resetting the class
-            variable ``outputWindowClass`` to a class of your
-            choosing.)
+        :param redirect: Should ``sys.stdout`` and ``sys.stderr`` be
+            redirected?  Defaults to True on Windows and Mac, False
+            otherwise.  If `filename` is None then output will be
+            redirected to a window that pops up as needed.  (You can
+            control what kind of window is created for the output by
+            resetting the class variable ``outputWindowClass`` to a
+            class of your choosing.)
 
-        :param filename: The name of a file to redirect output
-            to, if redirect is True.
+        :param filename: The name of a file to redirect output to, if
+            redirect is True.
 
         :param useBestVisual: Should the app try to use the best
-            available visual provided by the system (only
-            relevant on systems that have more than one visual.)
-            This parameter must be used instead of calling
-            `SetUseBestVisual` later on because it must be set
-            before the underlying GUI toolkit is initialized.
+            available visual provided by the system (only relevant on
+            systems that have more than one visual.)  This parameter
+            must be used instead of calling `SetUseBestVisual` later
+            on because it must be set before the underlying GUI
+            toolkit is initialized.
+
+        :param clearSigInt: Should SIGINT be cleared?  This allows the
+            app to terminate upon a Ctrl-C in the console like other
+            GUI apps will.
 
         :note: You should override OnInit to do applicaition
             initialization to ensure that the system, toolkit and
@@ -128,6 +133,8 @@ This program needs access to the screen. Please run with 'pythonw',
 not 'python', and only when you are logged in on the main display of
 your Mac."""
                     _sys.exit(1)
+            except SystemExit:
+                raise
             except:
                 pass
 
@@ -140,11 +147,12 @@ your Mac."""
         # KeyboardInterrupt???)  but will later segfault on exit.  By
         # setting the default handler then the app will exit, as
         # expected (depending on platform.)
-        try:
-            import signal
-            signal.signal(signal.SIGINT, signal.SIG_DFL)
-        except:
-            pass
+        if clearSigInt:
+            try:
+                import signal
+                signal.signal(signal.SIGINT, signal.SIG_DFL)
+            except:
+                pass
 
         # Save and redirect the stdio to a window?
         self.stdioWin = None
@@ -220,14 +228,14 @@ class PySimpleApp(wx.App):
     :see: `wx.App` 
     """
 
-    def __init__(self, redirect=False, filename=None, useBestVisual=False):
+    def __init__(self, redirect=False, filename=None,
+                 useBestVisual=False, clearSigInt=True):
         """
         :see: `wx.App.__init__`
         """
-        wx.App.__init__(self, redirect, filename, useBestVisual)
+        wx.App.__init__(self, redirect, filename, useBestVisual, clearSigInt)
         
     def OnInit(self):
-        wx.InitAllImageHandlers()
         return True