Checked gtk backend & simplified some icon related code.

Phil Elson · pelson · commit 25df1bb57dfd · 2012-07-29T21:40:42.000+01:00
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -359,15 +359,17 @@ def __init__(self, canvas, num):
 
         self.window = Gtk.Window()
         self.set_window_title("Figure %d" % num)
-        if (window_icon):
-            try:
-                self.window.set_icon_from_file(window_icon)
-            except:
-                # some versions of gtk throw a glib.GError but not
-                # all, so I am not sure how to catch it.  I am unhappy
-                # diong a blanket catch here, but an not sure what a
-                # better way is - JDH
-                verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
+        try:
+            self.window.set_icon_from_file(window_icon)
+        except (SystemExit, KeyboardInterrupt):
+            # re-raise exit type Exceptions
+            raise
+        except:
+            # some versions of gtk throw a glib.GError but not
+            # all, so I am not sure how to catch it.  I am unhappy
+            # doing a blanket catch here, but an not sure what a
+            # better way is - JDH
+            verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
 
         self.vbox = Gtk.Box()
         self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
@@ -562,12 +564,15 @@ def configure_subplots(self, button):
 
 
         window = Gtk.Window()
-        if (window_icon):
-            try: window.set_icon_from_file(window_icon)
-            except:
-                # we presumably already logged a message on the
-                # failure of the main plot, don't keep reporting
-                pass
+        try: 
+            window.set_icon_from_file(window_icon)
+        except (SystemExit, KeyboardInterrupt):
+            # re-raise exit type Exceptions
+            raise
+        except:
+            # we presumably already logged a message on the
+            # failure of the main plot, don't keep reporting
+            pass
         window.set_title("Subplot Configuration Tool")
         window.set_default_size(w, h)
         vbox = Gtk.Box()
@@ -963,7 +968,6 @@ def get_active_line(self):
         line = self.lines[ind]
         return line
 
-
     def get_active_linestyle(self):
         'get the active lineinestyle'
         ind = self.cbox_linestyles.get_active()
@@ -997,8 +1001,6 @@ def _update(self):
 
         line.figure.canvas.draw()
 
-
-
     def on_combobox_lineprops_changed(self, item):
         'update the widgets from the active line'
         if not self._inited: return
@@ -1044,17 +1046,14 @@ def on_dialog_lineprops_okbutton_clicked(self, button):
     def on_dialog_lineprops_cancelbutton_clicked(self, button):
         self.dlg.hide()
 
-# set icon used when windows are minimized
-try:
 
-    if sys.platform == 'win32':
-        icon_filename = 'matplotlib.png'
-    else:
-        icon_filename = 'matplotlib.svg'
-    window_icon = os.path.join(rcParams['datapath'], 'images', icon_filename)
-except:
-    window_icon = None
-    verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
+# Define the file to use as the GTk icon
+if sys.platform == 'win32':
+    icon_filename = 'matplotlib.png'
+else:
+    icon_filename = 'matplotlib.svg'
+window_icon = os.path.join(matplotlib.rcParams['datapath'], 'images', icon_filename)
+
 
 def error_msg_gtk(msg, parent=None):
     if parent is not None: # find the toplevel Gtk.Window
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -79,13 +79,14 @@ def new_figure_manager(num, *args, **kwargs):
     figure = FigureClass(*args, **kwargs)
     window = Tk.Tk()
  
-    # put a mpl icon on the window rather than the default tk icon. Tkinter
-    # doesn't allow colour icons on linux systems, but tk >=8.5 has a iconphoto
-    # command which we call directly. Source:
-    # http://mail.python.org/pipermail/tkinter-discuss/2006-November/000954.html
-    icon_fname = os.path.join(rcParams['datapath'], 'images', 'logo.gif')
-    icon_img = Tk.PhotoImage(file=icon_fname)
-    window.tk.call('wm', 'iconphoto', window._w, icon_img)
+    if Tk.TkVersion >= 8.5:
+        # put a mpl icon on the window rather than the default tk icon. Tkinter
+        # doesn't allow colour icons on linux systems, but tk >=8.5 has a iconphoto
+        # command which we call directly. Source:
+        # http://mail.python.org/pipermail/tkinter-discuss/2006-November/000954.html
+        icon_fname = os.path.join(rcParams['datapath'], 'images', 'matplotlib.gif')
+        icon_img = Tk.PhotoImage(file=icon_fname)
+        window.tk.call('wm', 'iconphoto', window._w, icon_img)
 
     canvas = FigureCanvasTkAgg(figure, master=window)
     figManager = FigureManagerTkAgg(canvas, num, window)
