Merge #3 from the 2.6 branch, containing last set of changes before

the 2.6.2 release.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/MDIWindows.py

@@ -35,12 +35,19 @@ class TestPanel(wx.Panel):
         exe, spawn = self.GetPyExecutable()
         spawn(os.P_NOWAIT, exe, exe, "MDISashDemo.py")
 
-
+    # TODO: This hack can be removed once we fix the way the Python
+    # app bundles are generated so that they are not bundling and 
+    # pointing to an otherwise unused and non-GUI-friendly version of
+    # Python on OS X.
     def GetPyExecutable(self):
         if 'wxMac' in wx.PlatformInfo:
             # sys.executable will be wrong if running the demo from
-            # an app bundle.  Just find pythonw on the path instead.
-            return 'pythonw' + sys.version[:3], os.spawnlp
+            # an app bundle.  But the bundle is always using a system
+            # framework so just hardcode the path to it.
+            if sys.version[:3] == "2.4":
+                return '/usr/local/bin/pythonw', os.spawnl
+            else:
+                return '/usr/bin/pythonw', os.spawnl    
         else:
             return sys.executable, os.spawnl