reverted wxapp outside show

jdh2358 · jdh2358 · commit 56b9c940bdcd · 2005-03-19T15:19:54.000Z
svn path=/trunk/matplotlib/; revision=1092
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 New entries should be added at the top
+
+2005-03-19 Reverted wxapp handling because it crashed win32 - JDH
+
 2005-03-18 Add .number attribute to figure objects returned by figure() - FP
 
+===========================================================================
+2005-03-18 0.73 released
+
 2005-03-16 Fixed labelsep bug
 
 2005-03-16 Applied Darren's ticker fix for small ranges - JDH
diff --git a/MANIFEST b/MANIFEST
@@ -537,6 +537,7 @@ lib/matplotlib/mathtext.py
 lib/matplotlib/mlab.py
 lib/matplotlib/patches.py
 lib/matplotlib/pylab.py
+lib/matplotlib/pylab.py.~1.48.~
 lib/matplotlib/pyparsing.py
 lib/matplotlib/table.py
 lib/matplotlib/text.py
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -113,8 +113,8 @@
     print >>sys.stderr, "Matplotlib backend_wx requires wxPython be installed"
     sys.exit()    
 
-# wxapp = wxPySimpleApp()
-# wxapp.SetExitOnFrameDelete(True)
+wxapp = wxPySimpleApp()
+wxapp.SetExitOnFrameDelete(True)
 
 
 #!!! this is the call that is causing the exception swallowing !!!
@@ -1156,8 +1156,8 @@ def show():
         figwin.canvas.draw()
  
     if show._needmain and not matplotlib.is_interactive():
-        wxapp = wx.PySimpleApp()
-        wxapp.SetExitOnFrameDelete(True)
+        #wxapp = wx.PySimpleApp()
+        #wxapp.SetExitOnFrameDelete(True)
         wxapp.MainLoop()
         show._needmain = False        
 show._needmain = True
diff --git a/setup.py b/setup.py
@@ -163,8 +163,11 @@ def add_dateutil():
         BUILD_GTK=0
     except RuntimeError:
         print 'pygtk present but import failed'
-    build_gdk(ext_modules, packages, NUMERIX)
+    
 
+if BUILD_GTK:
+    build_gdk(ext_modules, packages, NUMERIX)
+    
 if BUILD_GTKAGG:
     try:
         import gtk
