Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 057b4ca

Browse files
jdh2358jdh2358
committed
Merged revisions 7353,7358-7359 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7353 | jdh2358 | 2009-08-04 13:46:41 -0500 (Tue, 04 Aug 2009) | 1 line attach gtk events to mpl events -- fixes sf bug 2816580 ........ r7358 | jdh2358 | 2009-08-04 21:29:12 -0500 (Tue, 04 Aug 2009) | 1 line some fixes for osx builds on rc2 ........ r7359 | jdh2358 | 2009-08-05 06:06:13 -0500 (Wed, 05 Aug 2009) | 1 line remove dup gui event in enter/leave events in gtk ........ svn path=/trunk/matplotlib/; revision=7363
1 parent d0268e4 commit 057b4ca

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎doc/_templates/indexsidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h3>News</h3>
44
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
55
to support matplotlib development.</p>
66

7-
<p>A release candidate rc1 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
7+
<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
88
</p>
99

1010
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.

‎lib/matplotlib/backends/backend_gtk.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,37 +197,37 @@ def scroll_event(self, widget, event):
197197
step = 1
198198
else:
199199
step = -1
200-
FigureCanvasBase.scroll_event(self, x, y, step)
200+
FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
201201
return False # finish event propagation?
202202

203203
def button_press_event(self, widget, event):
204204
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
205205
x = event.x
206206
# flipy so y=0 is bottom of canvas
207207
y = self.allocation.height - event.y
208-
FigureCanvasBase.button_press_event(self, x, y, event.button)
208+
FigureCanvasBase.button_press_event(self, x, y, event.button, guiEvent=event)
209209
return False # finish event propagation?
210210

211211
def button_release_event(self, widget, event):
212212
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
213213
x = event.x
214214
# flipy so y=0 is bottom of canvas
215215
y = self.allocation.height - event.y
216-
FigureCanvasBase.button_release_event(self, x, y, event.button)
216+
FigureCanvasBase.button_release_event(self, x, y, event.button, guiEvent=event)
217217
return False # finish event propagation?
218218

219219
def key_press_event(self, widget, event):
220220
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
221221
key = self._get_key(event)
222222
if _debug: print "hit", key
223-
FigureCanvasBase.key_press_event(self, key)
223+
FigureCanvasBase.key_press_event(self, key, guiEvent=event)
224224
return False # finish event propagation?
225225

226226
def key_release_event(self, widget, event):
227227
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
228228
key = self._get_key(event)
229229
if _debug: print "release", key
230-
FigureCanvasBase.key_release_event(self, key)
230+
FigureCanvasBase.key_release_event(self, key, guiEvent=event)
231231
return False # finish event propagation?
232232

233233
def motion_notify_event(self, widget, event):
@@ -239,7 +239,7 @@ def motion_notify_event(self, widget, event):
239239

240240
# flipy so y=0 is bottom of canvas
241241
y = self.allocation.height - y
242-
FigureCanvasBase.motion_notify_event(self, x, y)
242+
FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
243243
return False # finish event propagation?
244244

245245
def leave_notify_event(self, widget, event):

‎release/osx/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
PYVERSION=2.6
1+
PYVERSION=2.5
22
PYTHON=python${PYVERSION}
33
SRCDIR=${PWD}
44
ZLIBVERSION=1.2.3
55
PNGVERSION=1.2.33
66
FREETYPEVERSION=2.3.7
7-
MPLVERSION=0.99.0.rc1
7+
MPLVERSION=0.99.0.rc2
88
BDISTMPKGVERSION=0.4.4
99
MPLSRC=matplotlib-${MPLVERSION}
1010
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -88,7 +88,7 @@ installers:
8888
cp ../data/setup.cfg . &&\
8989
export CFLAGS=${CFLAGS} &&\
9090
export LDFLAGS=${LDFLAGS} &&\
91-
bdist_mpkg &&\
91+
/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
9292
${PYTHON} setupegg.py bdist_egg &&\
9393
cd dist && \
9494
zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg

‎release/osx/README.txt‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Dir Contents
77
-------------
88

99
* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
10-
mpkg installers.
10+
mpkg installers.
1111

1212
* :file:`data` - some config files and patches needed for the build
1313

@@ -19,15 +19,21 @@ Dir Contents
1919
How to build
2020
--------------
2121

22-
* You need a python framework build , numpy and wxpython to build the
22+
* You need a python framework build, numpy and wxpython to build the
2323
mpl installers (wx requires this and we need wx to build the wxagg
24-
extension). You can get the three required dependencies as
25-
Installer apps, eg:
24+
extension). I recommend building python from src as a framework build::
2625

26+
./configure --enable-universalsdk --enable-framework
27+
sudo make install
2728

28-
http://www.python.org/ftp/python/2.6.2/python-2.6.2-macosx2009-04-16.dmg
29-
http://downloads.sourceforge.net/project/numpy/NumPy/1.3.0/numpy-1.3.0-py2.6-macosx10.5.dmg?use_mirror=voxel
30-
http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
29+
and build numpy from src too since the 2.5 numpy installer doesn't work
30+
with a python built from src::
31+
32+
sudo python setup.py install
33+
34+
you can use the pre-built installer for wx::
35+
36+
http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
3137

3238
* You need to make sure to unset PKG_CONFIG_PATH to make sure the
3339
static linking below is respected. Otherwise the mpl build script

0 commit comments

Comments
 (0)