SC 30/09/2004

Steve Chaplin · Steve Chaplin · commit 9518e0c09472 · 2004-09-29T16:10:03.000Z
svn path=/trunk/matplotlib/; revision=551
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 New entries should be added at the top
 
 ==============================================================
+2004-09-30 Add GTK+ 2.4 support for the message in the toolbar. SC
 
 
 
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -593,8 +593,8 @@ def show(mainloop=True):
         manager.window.show()
         
     if show._needmain and mainloop:
-        if gtk.pygtk_version > (2,3,90):  gtk.main()
-        else:                             gtk.mainloop()
+        if gtk.pygtk_version >= (2,3,97):  gtk.main()
+        else:                              gtk.mainloop()
         show._needmain = False
 show._needmain = True
 
@@ -615,7 +615,7 @@ def show_xvfb():
         manager.window.show()
         
     gtk.idle_add(_quit_after_print_xvfb)
-    if gtk.pygtk_version > (2,3,90):
+    if gtk.pygtk_version >= (2,3,97):
         gtk.main()
     else:
         gtk.mainloop()
@@ -1067,18 +1067,12 @@ def idle_draw(*args):
         
 
     def _init_toolbar(self):
-        #self.set_border_width(5)
         self.set_style(gtk.TOOLBAR_ICONS)
 
-        if gtk.pygtk_version > (2,3,90):
+        if gtk.pygtk_version >= (2,3,97):
             self._init_toolbar2_4()
         else:
             self._init_toolbar2_2()
-        self.append_space()
-        self.message = gtk.Label()
-        self.message.show()
-        self.append_widget(self.message, '', '')
-
 
 
     def _init_toolbar2_2(self):
@@ -1088,7 +1082,6 @@ def _init_toolbar2_2(self):
             if text is None:
                  self.append_space()
                  continue
-
             
             fname = os.path.join(basedir, image_file)
             image = gtk.Image()
@@ -1100,6 +1093,12 @@ def _init_toolbar2_2(self):
                                  getattr(self, callback)
                                  )
 
+        self.append_space()
+
+        self.message = gtk.Label()
+        self.append_widget(self.message, None, None)
+        self.message.show()
+
         self.fileselect = FileSelection(path=None,
                                         title='Save the figure')
 
@@ -1121,6 +1120,16 @@ def _init_toolbar2_4(self):
             tbutton.connect('clicked', getattr(self, callback))
             tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
 
+        toolitem = gtk.SeparatorToolItem()
+        self.insert(toolitem, -1)
+        toolitem.set_draw(False)  # set_draw() not making separator invisible, bug #143692 fixed Jun 06 2004, will be in GTK+ 2.6
+        toolitem.set_expand(True)
+
+        toolitem = gtk.ToolItem()
+        self.insert(toolitem, -1)
+        self.message = gtk.Label()
+        toolitem.add(self.message)
+
         self.show_all()
 
         self.fileselect = FileChooserDialog(title='Save the figure',
@@ -1184,10 +1193,9 @@ def __init__(self, canvas, window=None):
         self.canvas = canvas
         self.win    = window
         
-        #self.set_border_width(5)
         self.set_style(gtk.TOOLBAR_ICONS)
 
-        if gtk.pygtk_version > (2,3,90):
+        if gtk.pygtk_version >= (2,3,97):
             self._create_toolitems_2_4()
             self.update = self._update_2_4
             self.fileselect = FileChooserDialog(title='Save the figure',
@@ -1438,7 +1446,7 @@ def get_filename_from_user(self, path=None, title=None):
         return filename
     
 
-if gtk.pygtk_version > (2,3,90):
+if gtk.pygtk_version >= (2,3,97):
     class FileChooserDialog(gtk.FileChooserDialog):
         """GTK+ 2.4 file selector which remembers the last
         file/directory selected

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`New entries should be added at the top`
`2`	`2`
`3`	`3`	`==============================================================`
	`4`	`+2004-09-30 Add GTK+ 2.4 support for the message in the toolbar. SC`
`4`	`5`
`5`	`6`
`6`	`7`