Show More
@@ -4,7 +4,7 b'' | |||||
4 | All the matplotlib support code was co-developed with John Hunter, |
|
4 | All the matplotlib support code was co-developed with John Hunter, | |
5 | matplotlib's author. |
|
5 | matplotlib's author. | |
6 |
|
6 | |||
7 |
$Id: Shell.py |
|
7 | $Id: Shell.py 2120 2007-02-27 15:48:24Z fperez $""" | |
8 |
|
8 | |||
9 | #***************************************************************************** |
|
9 | #***************************************************************************** | |
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
@@ -645,7 +645,7 b' class IPShellGTK(threading.Thread):' | |||||
645 | if sys.platform != 'win32': |
|
645 | if sys.platform != 'win32': | |
646 | try: |
|
646 | try: | |
647 | if self.gtk.gtk_version[0] >= 2: |
|
647 | if self.gtk.gtk_version[0] >= 2: | |
648 | self.gtk.threads_init() |
|
648 | self.gtk.gdk.threads_init() | |
649 | except AttributeError: |
|
649 | except AttributeError: | |
650 | pass |
|
650 | pass | |
651 | except RuntimeError: |
|
651 | except RuntimeError: | |
@@ -658,10 +658,11 b' class IPShellGTK(threading.Thread):' | |||||
658 | 'Note that matplotlib will most likely not work in its ' |
|
658 | 'Note that matplotlib will most likely not work in its ' | |
659 | 'current state!') |
|
659 | 'current state!') | |
660 | self.IP.InteractiveTB() |
|
660 | self.IP.InteractiveTB() | |
|
661 | ||||
661 | self.start() |
|
662 | self.start() | |
662 | self.gtk.threads_enter() |
|
663 | self.gtk.gdk.threads_enter() | |
663 | self.gtk_mainloop() |
|
664 | self.gtk_mainloop() | |
664 | self.gtk.threads_leave() |
|
665 | self.gtk.gdk.threads_leave() | |
665 | self.join() |
|
666 | self.join() | |
666 |
|
667 | |||
667 | def on_timer(self): |
|
668 | def on_timer(self): |
@@ -1,3 +1,8 b'' | |||||
|
1 | 2007-02-27 Fernando Perez <Fernando.Perez@colorado.edu> | |||
|
2 | ||||
|
3 | * IPython/Shell.py (IPShellGTK.mainloop): update threads calls to | |||
|
4 | avoid a DeprecationWarning from GTK. | |||
|
5 | ||||
1 | 2007-02-22 Fernando Perez <Fernando.Perez@colorado.edu> |
|
6 | 2007-02-22 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
7 | |||
3 | * IPython/genutils.py (clock): I modified clock() to return total |
|
8 | * IPython/genutils.py (clock): I modified clock() to return total |
General Comments 0
You need to be logged in to leave comments.
Login now