gtkmm r999 - in trunk: . gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Thu Jul  3 15:09:41 2008
New Revision: 999
URL: http://svn.gnome.org/viewvc/gtkmm?rev=999&view=rev

Log:
2008-07-03  Murray Cumming  <murrayc murrayc com>

* gtk/src/toolbar.hg: Mark set/get_tooltips() as deprecated 
(because it is in GTK+ now).
* gtk/src/toolbar.ccg: Remove the define of GTK_DISABLE_DEPRECATED 
so the deprecated gtkmm methods still build.
get_tooltip_object(): Just return 0 because the implementation 
requires GTK_DISABLE_DEPRECATED, to get the odd alternative GTK+ 
API, and that is now too complicated. It is broken anyway - 
the fault of GTK+, not us.

Modified:
   trunk/ChangeLog
   trunk/gtk/src/toolbar.ccg
   trunk/gtk/src/toolbar.hg

Modified: trunk/gtk/src/toolbar.ccg
==============================================================================
--- trunk/gtk/src/toolbar.ccg	(original)
+++ trunk/gtk/src/toolbar.ccg	Thu Jul  3 15:09:41 2008
@@ -20,13 +20,6 @@
  * 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>
 #include <gtkmm/togglebutton.h>
@@ -96,7 +89,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
 

Modified: trunk/gtk/src/toolbar.hg
==============================================================================
--- trunk/gtk/src/toolbar.hg	(original)
+++ trunk/gtk/src/toolbar.hg	Thu Jul  3 15:09:41 2008
@@ -73,8 +73,8 @@
   _WRAP_METHOD(void set_toolbar_style(ToolbarStyle style), gtk_toolbar_set_style)
   _WRAP_METHOD(ToolbarStyle get_toolbar_style() const, gtk_toolbar_get_style)
 
-  _WRAP_METHOD(void set_tooltips(bool enable = true), gtk_toolbar_set_tooltips)
-  _WRAP_METHOD(bool get_tooltips() const, gtk_toolbar_get_tooltips)
+  _WRAP_METHOD(void set_tooltips(bool enable = true), gtk_toolbar_set_tooltips, deprecated "Use The toolkit-wide Gtk::Settings::property_gtk_enable_tooltips instead")
+  _WRAP_METHOD(bool get_tooltips() const, gtk_toolbar_get_tooltips, deprecated "Use The toolkit-wide Gtk::Settings::property_gtk_enable_tooltips instead")
 
   _WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style)