From: <jd...@us...> - 2007-10-21 16:02:11
|
Revision: 3975 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3975&view=rev Author: jdh2358 Date: 2007-10-21 09:02:07 -0700 (Sun, 21 Oct 2007) Log Message: ----------- added a show method for gtk fig manager Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/__init__.py trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py trunk/matplotlib/setup.py trunk/matplotlib/setupext.py Modified: trunk/matplotlib/lib/matplotlib/__init__.py =================================================================== --- trunk/matplotlib/lib/matplotlib/__init__.py 2007-10-20 21:57:26 UTC (rev 3974) +++ trunk/matplotlib/lib/matplotlib/__init__.py 2007-10-21 16:02:07 UTC (rev 3975) @@ -55,7 +55,7 @@ """ from __future__ import generators -NEWCONFIG = True +NEWCONFIG = False __version__ = '0.90.1' __revision__ = '$Revision$' Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py =================================================================== --- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2007-10-20 21:57:26 UTC (rev 3974) +++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2007-10-21 16:02:07 UTC (rev 3975) @@ -390,7 +390,7 @@ self.window = gtk.Window() self.window.set_title("Figure %d" % num) - + self.vbox = gtk.VBox() self.window.add(self.vbox) self.vbox.show() @@ -439,7 +439,10 @@ gtk.main_level() >= 1: gtk.main_quit() - + def show(self): + # show the figure window + self.window.show() + def full_screen_toggle (self): self._full_screen_flag = not self._full_screen_flag if self._full_screen_flag: Modified: trunk/matplotlib/setup.py =================================================================== --- trunk/matplotlib/setup.py 2007-10-20 21:57:26 UTC (rev 3974) +++ trunk/matplotlib/setup.py 2007-10-21 16:02:07 UTC (rev 3975) @@ -24,8 +24,8 @@ # it. It makes very nice antialiased output and also supports alpha # blending BUILD_AGG = 1 -BUILD_GTKAGG = 'auto' -BUILD_GTK = 'auto' +BUILD_GTKAGG = 1 +BUILD_GTK = 1 # build TK GUI with Agg renderer ; requires Tkinter Python extension # and Tk includes @@ -271,7 +271,7 @@ # packagers: set rc['numerix'] and rc['backend'] here to override the auto # defaults, eg #rc['numerix'] = numpy -#rc['backend'] = GTKAgg +#rc['backend'] = 'GTKAgg' if sys.platform=='win32': rc = dict(backend='TkAgg', numerix='numpy') template = file('matplotlibrc.template').read() Modified: trunk/matplotlib/setupext.py =================================================================== --- trunk/matplotlib/setupext.py 2007-10-20 21:57:26 UTC (rev 3974) +++ trunk/matplotlib/setupext.py 2007-10-21 16:02:07 UTC (rev 3975) @@ -43,9 +43,10 @@ import os + basedir = { 'win32' : ['win32_static',], - 'linux2' : ['/usr/local', '/usr',], + 'linux2' : ['/usr/local', '/usr'], 'linux' : ['/usr/local', '/usr',], 'cygwin' : ['/usr/local', '/usr',], 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local', @@ -170,6 +171,7 @@ if sys.platform == 'win32': has_pkgconfig.cache = False else: + #print 'environ', os.environ['PKG_CONFIG_PATH'] status, output = commands.getstatusoutput("pkg-config --help") has_pkgconfig.cache = (status == 0) return has_pkgconfig.cache @@ -192,6 +194,9 @@ status, output = commands.getstatusoutput( "%s %s %s" % (pkg_config_exec, flags, packages)) + #if packages.startswith('pygtk'): + # print 'status', status, output + # raise SystemExit if status == 0: for token in output.split(): attr = _flags.get(token[:2], None) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |