X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkaction.h;h=1cac38f237bdaf654b14afdde1ff35dfed362516;hb=3c8e1c92a85b2e41161698f141747ced2c574f32;hp=999c38f6e87297e29af39ce14070dcc909bec472;hpb=77d4d3cdae0739c0a5643fb23891f8790f05c074;p=~andy%2Fgtk
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 999c38f6e..1cac38f23 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -14,9 +14,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. 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 .
*/
/*
@@ -28,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ACTION_H__
+#define __GTK_ACTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
#include
G_BEGIN_DECLS
@@ -55,8 +53,7 @@ struct _GtkAction
GObject object;
/*< private >*/
-
- GtkActionPrivate *GSEAL (private_data);
+ GtkActionPrivate *private_data;
};
struct _GtkActionClass
@@ -80,6 +77,7 @@ struct _GtkActionClass
GtkWidget *(* create_menu) (GtkAction *action);
/* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
@@ -90,7 +88,7 @@ GtkAction *gtk_action_new (const gchar *name,
const gchar *label,
const gchar *tooltip,
const gchar *stock_id);
-G_CONST_RETURN gchar* gtk_action_get_name (GtkAction *action);
+const gchar* gtk_action_get_name (GtkAction *action);
gboolean gtk_action_is_sensitive (GtkAction *action);
gboolean gtk_action_get_sensitive (GtkAction *action);
void gtk_action_set_sensitive (GtkAction *action,
@@ -108,7 +106,7 @@ GtkWidget * gtk_action_create_menu (GtkAction *action);
GSList * gtk_action_get_proxies (GtkAction *action);
void gtk_action_connect_accelerator (GtkAction *action);
void gtk_action_disconnect_accelerator (GtkAction *action);
-G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction *action);
+const gchar *gtk_action_get_accel_path (GtkAction *action);
GClosure *gtk_action_get_accel_closure (GtkAction *action);
void gtk_action_block_activate (GtkAction *action);
void gtk_action_unblock_activate (GtkAction *action);
@@ -133,22 +131,22 @@ void _gtk_action_sync_menu_visible (GtkAction *action,
void gtk_action_set_label (GtkAction *action,
const gchar *label);
-G_CONST_RETURN gchar *gtk_action_get_label (GtkAction *action);
+const gchar * gtk_action_get_label (GtkAction *action);
void gtk_action_set_short_label (GtkAction *action,
const gchar *short_label);
-G_CONST_RETURN gchar *gtk_action_get_short_label (GtkAction *action);
+const gchar * gtk_action_get_short_label (GtkAction *action);
void gtk_action_set_tooltip (GtkAction *action,
const gchar *tooltip);
-G_CONST_RETURN gchar *gtk_action_get_tooltip (GtkAction *action);
+const gchar * gtk_action_get_tooltip (GtkAction *action);
void gtk_action_set_stock_id (GtkAction *action,
const gchar *stock_id);
-G_CONST_RETURN gchar *gtk_action_get_stock_id (GtkAction *action);
+const gchar * gtk_action_get_stock_id (GtkAction *action);
void gtk_action_set_gicon (GtkAction *action,
GIcon *icon);
GIcon *gtk_action_get_gicon (GtkAction *action);
void gtk_action_set_icon_name (GtkAction *action,
const gchar *icon_name);
-G_CONST_RETURN gchar *gtk_action_get_icon_name (GtkAction *action);
+const gchar * gtk_action_get_icon_name (GtkAction *action);
void gtk_action_set_visible_horizontal (GtkAction *action,
gboolean visible_horizontal);
gboolean gtk_action_get_visible_horizontal (GtkAction *action);