diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-07-08 10:58:23 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-07-08 10:58:23 +0000 |
| commit | b3b16bebcf3a28475190b764091442e7be18fdb2 (patch) | |
| tree | 75edd6971e54295d8931fcac765bcfa49097f9ee /gtk/gtktoolitem.h | |
| parent | f74f620ca9ad6f1279fc00aff0a8d4111f3bb8bd (diff) | |
| download | gtk+-b3b16bebcf3a28475190b764091442e7be18fdb2.tar.gz | |
fix a type check, (#116947, Krasimir Angelov)
Tue Jul 8 12:50:20 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbutton.c (gtk_tool_button_get_icon_widget): fix a
type check, (#116947, Krasimir Angelov)
* gtk/gtktoolbar.c: Use new GtkToolItem accessors.
* gtk/gtktoolitem.[ch]: Use a private struct to hold the instance
data. Not instance private data yet, because of bug 116921.
* gtk/gtktoolitem.h: new accessors:
gtk_tool_item_get_homogeneous ()
gtk_tool_item_get_expand ()
gtk_tool_item_get_pack_end ()
gtk_tool_item_get_use_drag_window ()
Diffstat (limited to 'gtk/gtktoolitem.h')
| -rw-r--r-- | gtk/gtktoolitem.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index d48a7113c7..27498bb14f 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -28,11 +28,12 @@ #include <gtk/gtkmenuitem.h> #define GTK_TYPE_TOOL_ITEM (gtk_tool_item_get_type ()) -#define GTK_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOL_ITEM, GtkToolItem)) +#define GTK_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem)) #define GTK_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass)) -#define GTK_IS_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_ITEM)) -#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOOL_ITEM)) -#define GTK_TOOL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_ITEM, GtkToolItemClass)) +#define GTK_IS_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_TOOL_ITEM)) +#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((o), GTK_TYPE_TOOL_ITEM)) +#define GTK_TOOL_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTK_TYPE_TOOL_ITEM, GtkToolItemClass)) +#define GTK_TOOL_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOL_ITEM, GtkToolItemPrivate)) typedef struct _GtkToolItem GtkToolItem; typedef struct _GtkToolItemClass GtkToolItemClass; @@ -42,22 +43,7 @@ struct _GtkToolItem { GtkBin parent; - /*< private >*/ - gchar *tip_text; - gchar *tip_private; - - GdkWindow *drag_window; - - guint visible_horizontal : 1; - guint visible_vertical : 1; - guint homogeneous : 1; - guint expand : 1; - guint pack_end : 1; - guint use_drag_window : 1; - guint overflow_item : 1; - - GtkWidget *menu_item; - gchar *menu_item_id; + GtkToolItemPrivate *priv; }; struct _GtkToolItemClass @@ -77,28 +63,41 @@ GType gtk_tool_item_get_type (void); GtkToolItem *gtk_tool_item_new (void); void gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item); + void gtk_tool_item_set_homogeneous (GtkToolItem *tool_item, gboolean homogeneous); +gboolean gtk_tool_item_get_homogeneous (GtkToolItem *tool_item); + void gtk_tool_item_set_expand (GtkToolItem *tool_item, gboolean expand); +gboolean gtk_tool_item_get_expand (GtkToolItem *tool_item); + void gtk_tool_item_set_pack_end (GtkToolItem *tool_item, gboolean pack_end); +gboolean gtk_tool_item_get_pack_end (GtkToolItem *tool_item); + void gtk_tool_item_set_tooltip (GtkToolItem *tool_item, GtkTooltips *tooltips, const gchar *tip_text, const gchar *tip_private); + void gtk_tool_item_set_use_drag_window (GtkToolItem *toolitem, gboolean use_drag_window); +gboolean gtk_tool_item_get_use_drag_window (GtkToolItem *toolitem); + void gtk_tool_item_set_visible_horizontal (GtkToolItem *toolitem, gboolean visible_horizontal); gboolean gtk_tool_item_get_visible_horizontal (GtkToolItem *toolitem); + void gtk_tool_item_set_visible_vertical (GtkToolItem *toolitem, gboolean visible_horizontal); gboolean gtk_tool_item_get_visible_vertical (GtkToolItem *toolitem); + GtkIconSize gtk_tool_item_get_icon_size (GtkToolItem *tool_item); GtkOrientation gtk_tool_item_get_orientation (GtkToolItem *tool_item); GtkToolbarStyle gtk_tool_item_get_toolbar_style (GtkToolItem *tool_item); GtkReliefStyle gtk_tool_item_get_relief_style (GtkToolItem *tool_item); + GtkWidget * gtk_tool_item_retrieve_proxy_menu_item (GtkToolItem *tool_item); GtkWidget * gtk_tool_item_get_proxy_menu_item (GtkToolItem *tool_item, const gchar *menu_item_id); @@ -106,5 +105,8 @@ void gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item, const gchar *menu_item_id, GtkWidget *menu_item); +/* internal function */ +GdkWindow *_gtk_tool_item_get_drag_window (GtkToolItem *tool_item); + #endif /* __GTK_TOOL_ITEM_H__ */ |