X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolbutton.h;h=144607fbb6f23379276a8342876b23e96bf3fe75;hb=32aa7f0582febb614c41e4130ad34ac44ef6efd2;hp=bc1bb43691b94aa384097b2debfd304d2507e2cf;hpb=d0c713bfee6d532442d097a32415dd340dd66056;p=~andy%2Fgtk

diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index bc1bb4369..144607fbb 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -15,18 +15,16 @@
  * 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_BUTTON_H__
 #define __GTK_TOOL_BUTTON_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
@@ -73,16 +71,16 @@ 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);
-G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
+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);