gtkmm r1125 - in branches/gtkmm-2-12: . gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 24 08:02:12 2009
New Revision: 1125
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1125&view=rev

Log:
Increased version.

Modified:
   branches/gtkmm-2-12/ChangeLog
   branches/gtkmm-2-12/gtk/src/toolbar.ccg

Modified: branches/gtkmm-2-12/gtk/src/toolbar.ccg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/toolbar.ccg	(original)
+++ branches/gtkmm-2-12/gtk/src/toolbar.ccg	Tue Mar 24 08:02:12 2009
@@ -20,12 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//Define this to make sure that we don't use any of the deprecated GtkToolbar API.
-//Normally we just deprecate it in gtkmm too,
-//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
-//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
 
-#define GTK_DISABLE_DEPRECATED
 
 #include <glib.h>
 #include <gtkmm/button.h>
@@ -96,7 +91,7 @@
 Tooltips* Toolbar::get_tooltips_object() const
 {
   //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
-  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
+  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
 }
 #endif //GTKMM_DISABLE_DEPRECATED