Commit 837775af authored by Matthias Clasen's avatar Matthias Clasen

Fix up docs, and set up the aliasing machinery

parent 7f9b5571
...@@ -4198,6 +4198,7 @@ gtk_tool_shell_get_style ...@@ -4198,6 +4198,7 @@ gtk_tool_shell_get_style
gtk_tool_shell_get_text_alignment gtk_tool_shell_get_text_alignment
gtk_tool_shell_get_text_orientation gtk_tool_shell_get_text_orientation
gtk_tool_shell_rebuild_menu gtk_tool_shell_rebuild_menu
gtk_tool_shell_get_text_size_group
<SUBSECTION Standard> <SUBSECTION Standard>
GTK_IS_TOOL_SHELL GTK_IS_TOOL_SHELL
...@@ -4460,42 +4461,6 @@ GTK_TOOLTIPS_GET_CLASS ...@@ -4460,42 +4461,6 @@ GTK_TOOLTIPS_GET_CLASS
gtk_tooltips_get_type gtk_tooltips_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>gtktoolpalette</FILE>
<TITLE>GtkToolPalette</TITLE>
GtkToolPalette
gtk_tool_palette_new
gtk_tool_palette_get_exclusive
gtk_tool_palette_set_exclusive
gtk_tool_palette_get_expand
gtk_tool_palette_set_expand
gtk_tool_palette_get_group_position
gtk_tool_palette_set_group_position
gtk_tool_palette_get_icon_size
gtk_tool_palette_set_icon_size
gtk_tool_palette_get_style
gtk_tool_palette_set_style
gtk_tool_palette_unset_style
gtk_tool_palette_add_drag_dest
gtk_tool_palette_get_drag_item
gtk_tool_palette_get_drag_target_group
gtk_tool_palette_get_drag_target_item
gtk_tool_palette_get_drop_group
gtk_tool_palette_get_drop_item
gtk_tool_palette_set_drag_source
<SUBSECTION Standard>
GtkToolPaletteClass
GTK_TOOL_PALETTE
GTK_IS_TOOL_PALETTE
GTK_TYPE_TOOL_PALETTE
GTK_TOOL_PALETTE_CLASS
GTK_IS_TOOL_PALETTE_CLASS
GTK_TOOL_PALETTE_GET_CLASS
<SUBSECTION Private>
gtk_tool_palette_get_type
GtkToolPalettePrivate
</SECTION>
<SECTION> <SECTION>
<FILE>gtktoolitemgroup</FILE> <FILE>gtktoolitemgroup</FILE>
<TITLE>GtkToolItemGroup</TITLE> <TITLE>GtkToolItemGroup</TITLE>
...@@ -4508,6 +4473,7 @@ gtk_tool_item_group_get_n_items ...@@ -4508,6 +4473,7 @@ gtk_tool_item_group_get_n_items
gtk_tool_item_group_get_label gtk_tool_item_group_get_label
gtk_tool_item_group_get_label_widget gtk_tool_item_group_get_label_widget
gtk_tool_item_group_get_nth_item gtk_tool_item_group_get_nth_item
gtk_tool_item_group_get_header_relief
gtk_tool_item_group_insert gtk_tool_item_group_insert
gtk_tool_item_group_new gtk_tool_item_group_new
gtk_tool_item_group_set_collapsed gtk_tool_item_group_set_collapsed
...@@ -4515,6 +4481,7 @@ gtk_tool_item_group_set_ellipsize ...@@ -4515,6 +4481,7 @@ gtk_tool_item_group_set_ellipsize
gtk_tool_item_group_set_item_position gtk_tool_item_group_set_item_position
gtk_tool_item_group_set_label gtk_tool_item_group_set_label
gtk_tool_item_group_set_label_widget gtk_tool_item_group_set_label_widget
gtk_tool_item_group_set_header_relief
<SUBSECTION Standard> <SUBSECTION Standard>
GtkToolItemGroupClass GtkToolItemGroupClass
GTK_TOOL_ITEM_GROUP GTK_TOOL_ITEM_GROUP
...@@ -4528,7 +4495,7 @@ gtk_tool_item_group_get_type ...@@ -4528,7 +4495,7 @@ gtk_tool_item_group_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>GtkToolPalette</FILE> <FILE>gtktoolpalette</FILE>
<TITLE>GtkToolPalette</TITLE> <TITLE>GtkToolPalette</TITLE>
GtkToolPalette GtkToolPalette
gtk_tool_palette_new gtk_tool_palette_new
...@@ -4541,17 +4508,19 @@ gtk_tool_palette_set_group_position ...@@ -4541,17 +4508,19 @@ gtk_tool_palette_set_group_position
gtk_tool_palette_get_icon_size gtk_tool_palette_get_icon_size
gtk_tool_palette_set_icon_size gtk_tool_palette_set_icon_size
gtk_tool_palette_unset_icon_size gtk_tool_palette_unset_icon_size
gtk_tool_palette_get_orientation
gtk_tool_palette_set_orientation
gtk_tool_palette_get_style gtk_tool_palette_get_style
gtk_tool_palette_set_style gtk_tool_palette_set_style
gtk_tool_palette_unset_style
gtk_tool_palette_add_drag_dest gtk_tool_palette_add_drag_dest
gtk_tool_palette_get_drag_item gtk_tool_palette_get_drag_item
gtk_tool_palette_get_drag_target_group gtk_tool_palette_get_drag_target_group
gtk_tool_palette_get_drag_target_item gtk_tool_palette_get_drag_target_item
gtk_tool_palette_get_drop_group gtk_tool_palette_get_drop_group
gtk_tool_palette_get_drop_item gtk_tool_palette_get_drop_item
GtkToolPaletteDragTargets
gtk_tool_palette_set_drag_source gtk_tool_palette_set_drag_source
gtk_tool_palette_get_hadjustment
gtk_tool_palette_get_vadjustment
<SUBSECTION Standard> <SUBSECTION Standard>
GtkToolPaletteClass GtkToolPaletteClass
GTK_TOOL_PALETTE GTK_TOOL_PALETTE
......
...@@ -729,6 +729,34 @@ create_toolbar (void) ...@@ -729,6 +729,34 @@ create_toolbar (void)
return new_widget_info ("toolbar", widget, SMALL); return new_widget_info ("toolbar", widget, SMALL);
} }
static WidgetInfo *
create_toolpalette (void)
{
GtkWidget *widget, *group;
GtkToolItem *item;
widget = gtk_tool_palette_new ();
group = gtk_tool_item_group_new ("Tools");
gtk_container_add (GTK_CONTAINER (widget), group);
item = gtk_tool_button_new_from_stock (GTK_STOCK_ABOUT);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
item = gtk_tool_button_new_from_stock (GTK_STOCK_FILE);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
item = gtk_tool_button_new_from_stock (GTK_STOCK_CONNECT);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
group = gtk_tool_item_group_new ("More tools");
gtk_container_add (GTK_CONTAINER (widget), group);
item = gtk_tool_button_new_from_stock (GTK_STOCK_CUT);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
item = gtk_tool_button_new_from_stock (GTK_STOCK_EXECUTE);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
item = gtk_tool_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
return new_widget_info ("toolpalette", widget, MEDIUM);
}
static WidgetInfo * static WidgetInfo *
create_menubar (void) create_menubar (void)
{ {
...@@ -1005,6 +1033,7 @@ get_all_widgets (void) ...@@ -1005,6 +1033,7 @@ get_all_widgets (void)
{ {
GList *retval = NULL; GList *retval = NULL;
retval = g_list_prepend (retval, create_toolpalette ());
retval = g_list_prepend (retval, create_spinner ()); retval = g_list_prepend (retval, create_spinner ());
retval = g_list_prepend (retval, create_about_dialog ()); retval = g_list_prepend (retval, create_about_dialog ());
retval = g_list_prepend (retval, create_accel_label ()); retval = g_list_prepend (retval, create_accel_label ());
......
...@@ -4442,6 +4442,56 @@ gtk_tool_item_toolbar_reconfigured ...@@ -4442,6 +4442,56 @@ gtk_tool_item_toolbar_reconfigured
#endif #endif
#endif #endif
#if IN_HEADER(__GTK_TOOL_ITEM_GROUP_H__)
#if IN_FILE(__GTK_TOOL_ITEM_GROUP_C__)
gtk_tool_item_group_get_type G_GNUC_CONST
gtk_tool_item_group_new
gtk_tool_item_group_set_label
gtk_tool_item_group_set_label_widget
gtk_tool_item_group_set_collapsed
gtk_tool_item_group_set_ellipsize
gtk_tool_item_group_set_header_relief
gtk_tool_item_group_get_label
gtk_tool_item_group_get_label_widget
gtk_tool_item_group_get_ellipsize
gtk_tool_item_group_get_header_relief
gtk_tool_item_group_insert
gtk_tool_item_group_set_item_position
gtk_tool_item_group_get_item_position
gtk_tool_item_group_get_n_items
gtk_tool_item_group_get_nth_item
gtk_tool_item_group_get_drop_item
#endif
#endif
#if IN_HEADER(__GTK_TOOL_PALETTE_H__)
#if IN_FILE(__GTK_TOOL_PALETTE_C__)
gtk_tool_palette_get_type G_GNUC_CONST
gtk_tool_palette_new
gtk_tool_palette_set_group_position
gtk_tool_palette_set_exclusive
gtk_tool_palette_set_expand
gtk_tool_palette_get_group_position
gtk_tool_palette_get_exclusive
gtk_tool_palette_get_expand
gtk_tool_palette_set_icon_size
gtk_tool_palette_unset_icon_size
gtk_tool_palette_set_style
gtk_tool_palette_unset_style
gtk_tool_palette_get_icon_size
gtk_tool_palette_get_style
gtk_tool_palette_get_drop_item
gtk_tool_palette_get_drop_group
gtk_tool_palette_get_drag_item
gtk_tool_palette_set_drag_source
gtk_tool_palette_add_drag_dest
gtk_tool_palette_get_hadjustment
gtk_tool_palette_get_vadjustment
gtk_tool_palette_get_drag_target_item G_GNUC_CONST
gtk_tool_palette_get_drag_target_group G_GNUC_CONST
#endif
#endif
#if IN_HEADER(__GTK_TOOLTIP_H__) #if IN_HEADER(__GTK_TOOLTIP_H__)
#if IN_FILE(__GTK_TOOLTIP_C__) #if IN_FILE(__GTK_TOOLTIP_C__)
gtk_tooltip_get_type G_GNUC_CONST gtk_tooltip_get_type G_GNUC_CONST
......
This diff is collapsed.
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TOOL_ITEM_GROUP (gtk_tool_item_group_get_type()) #define GTK_TYPE_TOOL_ITEM_GROUP (gtk_tool_item_group_get_type ())
#define GTK_TOOL_ITEM_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroup)) #define GTK_TOOL_ITEM_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroup))
#define GTK_TOOL_ITEM_GROUP_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST(cls, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass)) #define GTK_TOOL_ITEM_GROUP_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
#define GTK_IS_TOOL_ITEM_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GTK_TYPE_TOOL_ITEM_GROUP)) #define GTK_IS_TOOL_ITEM_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_TOOL_ITEM_GROUP))
#define GTK_IS_TOOL_ITEM_GROUP_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE(obj, GTK_TYPE_TOOL_ITEM_GROUP)) #define GTK_IS_TOOL_ITEM_GROUP_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_TOOL_ITEM_GROUP))
#define GTK_TOOL_ITEM_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass)) #define GTK_TOOL_ITEM_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
typedef struct _GtkToolItemGroup GtkToolItemGroup; typedef struct _GtkToolItemGroup GtkToolItemGroup;
typedef struct _GtkToolItemGroupClass GtkToolItemGroupClass; typedef struct _GtkToolItemGroupClass GtkToolItemGroupClass;
......
This diff is collapsed.
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TOOL_PALETTE (gtk_tool_palette_get_type()) #define GTK_TYPE_TOOL_PALETTE (gtk_tool_palette_get_type ())
#define GTK_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_TOOL_PALETTE, GtkToolPalette)) #define GTK_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_TOOL_PALETTE, GtkToolPalette))
#define GTK_TOOL_PALETTE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST(cls, GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass)) #define GTK_TOOL_PALETTE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
#define GTK_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GTK_TYPE_TOOL_PALETTE)) #define GTK_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_TOOL_PALETTE))
#define GTK_IS_TOOL_PALETTE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE(obj, GTK_TYPE_TOOL_PALETTE)) #define GTK_IS_TOOL_PALETTE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_TOOL_PALETTE))
#define GTK_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass)) #define GTK_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
typedef struct _GtkToolPalette GtkToolPalette; typedef struct _GtkToolPalette GtkToolPalette;
typedef struct _GtkToolPaletteClass GtkToolPaletteClass; typedef struct _GtkToolPaletteClass GtkToolPaletteClass;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
/** /**
* SECTION:gtktoolshell * SECTION:gtktoolshell
* @short_description: Interface for containers containing GtkToolItem widgets. * @Short_description: Interface for containers containing GtkToolItem widgets
* @Title: GtkToolShell * @Title: GtkToolShell
* *
* The #GtkToolShell interface allows container widgets to provide additional * The #GtkToolShell interface allows container widgets to provide additional
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment