X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolitem.h;h=1a623916f5038b3a2eae93dd16dd5512c106e72b;hb=bb3c56abe2e7916126bd4f8234dee080b5381941;hp=882530ad9850ac754ee2ecf2e5b6a959aaeea417;hpb=dc21c8ef0693c55afff9aff8944d23502d95717d;p=~andy%2Fgtk

diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 882530ad9..1a623916f 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -15,20 +15,17 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TOOL_ITEM_H__
 #define __GTK_TOOL_ITEM_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
-#include <gtk/gtktooltips.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtksizegroup.h>
 
@@ -50,7 +47,7 @@ struct _GtkToolItem
   GtkBin parent;
 
   /*< private >*/
-  GtkToolItemPrivate *GSEAL (priv);
+  GtkToolItemPrivate *priv;
 };
 
 struct _GtkToolItemClass
@@ -60,14 +57,6 @@ struct _GtkToolItemClass
   /* signals */
   gboolean   (* create_menu_proxy)    (GtkToolItem *tool_item);
   void       (* toolbar_reconfigured) (GtkToolItem *tool_item);
-#ifndef GTK_DISABLE_DEPRECATED
-  gboolean   (* set_tooltip)	      (GtkToolItem *tool_item,
-				       GtkTooltips *tooltips,
-				       const gchar *tip_text,
-				       const gchar *tip_private);
-#else
-  gpointer _set_tooltip;
-#endif
 
   /* Padding for future expansion */
   void (* _gtk_reserved1) (void);