summaryrefslogtreecommitdiff
path: root/gtk/gtktoolshell.h
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2009-07-13 19:13:59 +0200
committerMurray Cumming <murrayc@murrayc.com>2009-07-13 19:13:59 +0200
commitdad6e7343c1fbdbbe2a6ca765aabcf8b887933c9 (patch)
tree1f2565ca69346eccdac3580e16c75a717995e869 /gtk/gtktoolshell.h
parent8a294b8bb75236c52519dcb39794bedad15498df (diff)
downloadgtk+-dad6e7343c1fbdbbe2a6ca765aabcf8b887933c9.tar.gz
ToolShell: Add ellipsize, text-orientation, text-alignment and size-group.
* gtk/gtktoolshell.c: Added vfuncs to get/set ellipsize, text-orientation, text-alignment and size-group plus getter/setters to invoke these vfuncs. * gtk/gtktoolitem.[h|c]: Added getters and setters to get/set these from the parent GtkToolShell. This is in the style of the existing "properties". * gtk/gtktoolbutton.c: Updated to use the extra properties. * docs/reference/gtk/gtk-sections.txt * gtk/gtk.symbols: Updated to mention the new functions. These new "properties" are used by GtkToolPalette.
Diffstat (limited to 'gtk/gtktoolshell.h')
-rw-r--r--gtk/gtktoolshell.h46
1 files changed, 30 insertions, 16 deletions
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index be49304445..0605a4006b 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -29,6 +29,8 @@
#include <gtk/gtkenums.h>
+#include <pango/pango.h>
+#include <gtk/gtksizegroup.h>
G_BEGIN_DECLS
@@ -43,11 +45,15 @@ typedef struct _GtkToolShellIface GtkToolShellIface;
/**
* GtkToolShellIface:
- * @get_icon_size: mandatory implementation of gtk_tool_shell_get_icon_size().
- * @get_orientation: mandatory implementation of gtk_tool_shell_get_orientation().
- * @get_style: mandatory implementation of gtk_tool_shell_get_style().
- * @get_relief_style: optional implementation of gtk_tool_shell_get_relief_style().
- * @rebuild_menu: optional implementation of gtk_tool_shell_rebuild_menu().
+ * @get_icon_size: mandatory implementation of gtk_tool_shell_get_icon_size().
+ * @get_orientation: mandatory implementation of gtk_tool_shell_get_orientation().
+ * @get_style: mandatory implementation of gtk_tool_shell_get_style().
+ * @get_relief_style: optional implementation of gtk_tool_shell_get_relief_style().
+ * @rebuild_menu: optional implementation of gtk_tool_shell_rebuild_menu().
+ * @get_text_orientation: optional implementation of gtk_tool_shell_get_text_orientation().
+ * @get_text_alignment: optional implementation of gtk_tool_shell_get_text_alignment().
+ * @get_ellipsize_mode: optional implementation of gtk_tool_shell_get_ellipsize_mode().
+ * @get_text_size_group: optional implementation of gtk_tool_shell_get_text_size_group().
*
* Virtual function table for the #GtkToolShell interface.
*/
@@ -57,20 +63,28 @@ struct _GtkToolShellIface
GTypeInterface g_iface;
/*< public >*/
- GtkIconSize (*get_icon_size) (GtkToolShell *shell);
- GtkOrientation (*get_orientation) (GtkToolShell *shell);
- GtkToolbarStyle (*get_style) (GtkToolShell *shell);
- GtkReliefStyle (*get_relief_style) (GtkToolShell *shell);
- void (*rebuild_menu) (GtkToolShell *shell);
+ GtkIconSize (*get_icon_size) (GtkToolShell *shell);
+ GtkOrientation (*get_orientation) (GtkToolShell *shell);
+ GtkToolbarStyle (*get_style) (GtkToolShell *shell);
+ GtkReliefStyle (*get_relief_style) (GtkToolShell *shell);
+ void (*rebuild_menu) (GtkToolShell *shell);
+ GtkOrientation (*get_text_orientation) (GtkToolShell *shell);
+ gfloat (*get_text_alignment) (GtkToolShell *shell);
+ PangoEllipsizeMode (*get_ellipsize_mode) (GtkToolShell *shell);
+ GtkSizeGroup * (*get_text_size_group) (GtkToolShell *shell);
};
-GType gtk_tool_shell_get_type (void) G_GNUC_CONST;
+GType gtk_tool_shell_get_type (void) G_GNUC_CONST;
-GtkIconSize gtk_tool_shell_get_icon_size (GtkToolShell *shell);
-GtkOrientation gtk_tool_shell_get_orientation (GtkToolShell *shell);
-GtkToolbarStyle gtk_tool_shell_get_style (GtkToolShell *shell);
-GtkReliefStyle gtk_tool_shell_get_relief_style (GtkToolShell *shell);
-void gtk_tool_shell_rebuild_menu (GtkToolShell *shell);
+GtkIconSize gtk_tool_shell_get_icon_size (GtkToolShell *shell);
+GtkOrientation gtk_tool_shell_get_orientation (GtkToolShell *shell);
+GtkToolbarStyle gtk_tool_shell_get_style (GtkToolShell *shell);
+GtkReliefStyle gtk_tool_shell_get_relief_style (GtkToolShell *shell);
+void gtk_tool_shell_rebuild_menu (GtkToolShell *shell);
+GtkOrientation gtk_tool_shell_get_text_orientation (GtkToolShell *shell);
+gfloat gtk_tool_shell_get_text_alignment (GtkToolShell *shell);
+PangoEllipsizeMode gtk_tool_shell_get_ellipsize_mode (GtkToolShell *shell);
+GtkSizeGroup * gtk_tool_shell_get_text_size_group (GtkToolShell *shell);
G_END_DECLS