X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolitem.h;h=1a623916f5038b3a2eae93dd16dd5512c106e72b;hb=0ba92bc26d1b716f2f9c0543593f13cd5a92c521;hp=1293585f6dbb2dcce1ac973861a32f3251d44354;hpb=59207896851a3bc0cb46761d1baab0f478a65edb;p=~andy%2Fgtk
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 1293585f6..1a623916f 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -15,17 +15,19 @@
* 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 .
*/
#ifndef __GTK_TOOL_ITEM_H__
#define __GTK_TOOL_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
-#include
#include
+#include
G_BEGIN_DECLS
@@ -55,10 +57,6 @@ struct _GtkToolItemClass
/* signals */
gboolean (* create_menu_proxy) (GtkToolItem *tool_item);
void (* toolbar_reconfigured) (GtkToolItem *tool_item);
- gboolean (* set_tooltip) (GtkToolItem *tool_item,
- GtkTooltips *tooltips,
- const gchar *tip_text,
- const gchar *tip_private);
/* Padding for future expansion */
void (* _gtk_reserved1) (void);
@@ -67,7 +65,7 @@ struct _GtkToolItemClass
void (* _gtk_reserved4) (void);
};
-GType gtk_tool_item_get_type (void);
+GType gtk_tool_item_get_type (void) G_GNUC_CONST;
GtkToolItem *gtk_tool_item_new (void);
void gtk_tool_item_set_homogeneous (GtkToolItem *tool_item,
@@ -77,32 +75,35 @@ 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_tooltip_text (GtkToolItem *tool_item,
+ const gchar *text);
+void gtk_tool_item_set_tooltip_markup (GtkToolItem *tool_item,
+ const gchar *markup);
-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,
+void gtk_tool_item_set_use_drag_window (GtkToolItem *tool_item,
gboolean use_drag_window);
-gboolean gtk_tool_item_get_use_drag_window (GtkToolItem *toolitem);
+gboolean gtk_tool_item_get_use_drag_window (GtkToolItem *tool_item);
-void gtk_tool_item_set_visible_horizontal (GtkToolItem *toolitem,
+void gtk_tool_item_set_visible_horizontal (GtkToolItem *tool_item,
gboolean visible_horizontal);
-gboolean gtk_tool_item_get_visible_horizontal (GtkToolItem *toolitem);
+gboolean gtk_tool_item_get_visible_horizontal (GtkToolItem *tool_item);
-void gtk_tool_item_set_visible_vertical (GtkToolItem *toolitem,
+void gtk_tool_item_set_visible_vertical (GtkToolItem *tool_item,
gboolean visible_vertical);
-gboolean gtk_tool_item_get_visible_vertical (GtkToolItem *toolitem);
+gboolean gtk_tool_item_get_visible_vertical (GtkToolItem *tool_item);
gboolean gtk_tool_item_get_is_important (GtkToolItem *tool_item);
void gtk_tool_item_set_is_important (GtkToolItem *tool_item,
gboolean is_important);
+PangoEllipsizeMode gtk_tool_item_get_ellipsize_mode (GtkToolItem *tool_item);
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);
+gfloat gtk_tool_item_get_text_alignment (GtkToolItem *tool_item);
+GtkOrientation gtk_tool_item_get_text_orientation (GtkToolItem *tool_item);
+GtkSizeGroup * gtk_tool_item_get_text_size_group (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,
@@ -112,8 +113,11 @@ void gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item,
GtkWidget *menu_item);
void gtk_tool_item_rebuild_menu (GtkToolItem *tool_item);
-/* internal function */
-void _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
+void gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
+
+/* private */
+
+gboolean _gtk_tool_item_create_menu_proxy (GtkToolItem *tool_item);
G_END_DECLS