Revert name change

[~andy/gtk] / gtk / gtkmenutoolbutton.c

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 8b20766871e9a4f7d5f4cb99b4881a16e8cf57ff..b3d7ab25e02dc9f7221c88337e9a312ea721203e 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -19,9 +19,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#undef GTK_DISABLE_DEPRECATED /* GtkTooltips */
+
 #include "gtkmenutoolbutton.h"
-#include "gtkintl.h"
 #include "gtktogglebutton.h"
 #include "gtkarrow.h"
 #include "gtkhbox.h"
@@ -29,6 +31,7 @@
 #include "gtkmenu.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -57,8 +60,7 @@ enum
 enum
 {
   PROP_0,
-  PROP_MENU,
-  LAST_PROP
+  PROP_MENU
 };
 
 static gint signals[LAST_SIGNAL];
@@ -106,6 +108,17 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
 
   if (priv->box)
     {
+      gchar *tmp;
+
+      /* Transfer a possible tooltip to the new box */
+      g_object_get (priv->box, "tooltip-markup", &tmp, NULL);
+
+      if (tmp)
+        {
+         g_object_set (box, "tooltip-markup", tmp, NULL);
+         g_free (tmp);
+       }
+
       /* Note: we are not destroying the button and the arrow_button
        * here because they were removed from their container above
        */