X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolbutton.h;h=144607fbb6f23379276a8342876b23e96bf3fe75;hb=dc331ccb171151d737112d8dc55b25709271d2c7;hp=236905bb416b5be5aad76dbc1b28ff5db349b1e5;hpb=dbdc43be4cb6f297c58a07a437e40bcec068e52a;p=~andy%2Fgtk

diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 236905bb4..144607fbb 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -1,6 +1,6 @@
 /* gtktoolbutton.h
  *
- * Copyright (C) 2002 Anders Carlsson <andersca@codefactory.se>
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
  * Copyright (C) 2002 James Henstridge <james@daa.com.au>
  * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk>
  *
@@ -15,15 +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/>.
  */
 
 #ifndef __GTK_TOOL_BUTTON_H__
 #define __GTK_TOOL_BUTTON_H__
 
-#include "gtktoolitem.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
@@ -31,7 +33,7 @@ G_BEGIN_DECLS
 #define GTK_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButton))
 #define GTK_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
 #define GTK_IS_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
-#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
+#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_BUTTON))
 #define GTK_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
 
 typedef struct _GtkToolButton        GtkToolButton;
@@ -49,7 +51,7 @@ struct _GtkToolButton
 struct _GtkToolButtonClass
 {
   GtkToolItemClass parent_class;
- 
+
   GType button_type;
 
   /* signal */
@@ -62,20 +64,23 @@ struct _GtkToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_tool_button_get_type       (void);
+GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
 GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
 					     const gchar *label);
 GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
 
 void                  gtk_tool_button_set_label         (GtkToolButton *button,
 							 const gchar   *label);
-G_CONST_RETURN gchar *gtk_tool_button_get_label         (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_label         (GtkToolButton *button);
 void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
 							 gboolean       use_underline);
 gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
 void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
 							 const gchar   *stock_id);
-G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_stock_id      (GtkToolButton *button);
+void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
+							 const gchar   *icon_name);
+const gchar *         gtk_tool_button_get_icon_name     (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
 							 GtkWidget     *icon_widget);
 GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
@@ -83,7 +88,7 @@ void                  gtk_tool_button_set_label_widget  (GtkToolButton *button,
 							 GtkWidget     *label_widget);
 GtkWidget *           gtk_tool_button_get_label_widget  (GtkToolButton *button);
 
-								   
+
 /* internal function */
 GtkWidget *_gtk_tool_button_get_button (GtkToolButton *button);