From 56b229d99ec8ad086a83f715fba58ce9689bcca4 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 27 Dec 2010 18:59:06 +0000
Subject: [PATCH] cleanups and tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/app_ex.cpp   | 6 +++---
 src/app_ex.py    | 5 +++--
 src/event_ex.cpp | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app_ex.cpp b/src/app_ex.cpp
index 1b177863..ef0d2311 100644
--- a/src/app_ex.cpp
+++ b/src/app_ex.cpp
@@ -170,15 +170,15 @@ int wxPyApp::MainLoop()
 #endif
         DeletePendingObjects();
     }
-    bool initialized = wxTopLevelWindows.GetCount() != 0;
-    if (initialized) {
+    //bool initialized = wxTopLevelWindows.GetCount() != 0;
+    //if (initialized) {
         if ( m_exitOnFrameDelete == Later ) {
             m_exitOnFrameDelete = Yes;
         }
 
         retval = wxApp::MainLoop();
         OnExit();
-    }
+    //}
     return retval;
 }
 
diff --git a/src/app_ex.py b/src/app_ex.py
index 1b4ac376..9c721dbb 100644
--- a/src/app_ex.py
+++ b/src/app_ex.py
@@ -186,7 +186,7 @@ logged in on the main display of your Mac."""
         
 
     def __del__(self):
-        self.RestoreStdio()  # Just in case the MainLoop was overridden
+        self.RestoreStdio()  # Just in case the MainLoop was overridden without calling RestoreStio
 
         
     def Destroy(self):
@@ -202,8 +202,9 @@ logged in on the main display of your Mac."""
 
     def MainLoop(self):
         """Execute the main GUI event loop"""
-        wx.PyApp.MainLoop(self)
+        rv = wx.PyApp.MainLoop(self)
         self.RestoreStdio()
+        return rv
 
 
     def RedirectStdio(self, filename=None):
diff --git a/src/event_ex.cpp b/src/event_ex.cpp
index 6430c64a..9612c2a9 100644
--- a/src/event_ex.cpp
+++ b/src/event_ex.cpp
@@ -11,8 +11,6 @@ public:
     PyObject*   m_func;
 };
 
-
-
 IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxEvtHandler);
 
 wxPyCallback::wxPyCallback(PyObject* func) {