* Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
* Copyright (C) 2002 James Henstridge <james@daa.com.au>
* Copyright (C) 2003, 2004 Soeren Sandmann <sandmann@daimi.au.dk>
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#undef GTK_DISABLE_DEPRECATED
#include "config.h"
+
+#include <math.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+
#include "gtkarrow.h"
-#include "gtktoolbar.h"
-#include "gtktoolshell.h"
-#include "gtkradiotoolbutton.h"
-#include "gtkseparatortoolitem.h"
-#include "gtkmenu.h"
-#include "gtkradiobutton.h"
-#include "gtktoolbar.h"
#include "gtkbindings.h"
-#include <gdk/gdkkeysyms.h>
-#include "gtkmarshalers.h"
+#include "gtkhbox.h"
+#include "gtkimage.h"
+#include "gtklabel.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkmenu.h"
+#include "gtkorientable.h"
+#include "gtkradiobutton.h"
+#include "gtkradiotoolbutton.h"
+#include "gtkseparatormenuitem.h"
+#include "gtkseparatortoolitem.h"
#include "gtkstock.h"
-#include "gtklabel.h"
+#include "gtktoolbar.h"
+#include "gtktoolshell.h"
+#include "gtkvbox.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include <string.h>
-#include "gtkhbox.h"
-#include "gtkvbox.h"
-#include "gtkimage.h"
-#include "gtkseparatormenuitem.h"
#include "gtkalias.h"
-#include <math.h>
typedef struct _ToolbarContent ToolbarContent;
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data,
gint position,
gboolean use_stock);
#define GTK_TOOLBAR_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate))
-static guint toolbar_signals [LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_CODE (GtkToolbar, gtk_toolbar, GTK_TYPE_CONTAINER,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_TOOL_SHELL, toolbar_tool_shell_iface_init))
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TOOL_SHELL,
+ toolbar_tool_shell_iface_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
+ NULL))
+
+static guint toolbar_signals[LAST_SIGNAL] = { 0 };
+
static void
add_arrow_bindings (GtkBindingSet *binding_set,
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, 0,
- "move_focus", 1,
+ "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, dir);
gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
- "move_focus", 1,
+ "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, dir);
}
{
gtk_binding_entry_add_signal (binding_set,
GDK_Tab, GDK_CONTROL_MASK | modifiers,
- "move_focus", 1,
+ "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Tab, GDK_CONTROL_MASK | modifiers,
- "move_focus", 1,
+ "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
-static void
-toolbar_tool_shell_iface_init (GtkToolShellIface *iface)
-{
- iface->get_icon_size = toolbar_get_icon_size;
- iface->get_orientation = toolbar_get_orientation;
- iface->get_style = toolbar_get_style;
- iface->get_relief_style = toolbar_get_relief_style;
- iface->rebuild_menu = toolbar_rebuild_menu;
-}
-
static void
gtk_toolbar_class_init (GtkToolbarClass *klass)
{
* Return value: return %TRUE if the signal was handled, %FALSE if not
*/
toolbar_signals[POPUP_CONTEXT_MENU] =
- g_signal_new (I_("popup_context_menu"),
+ g_signal_new (I_("popup-context-menu"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu),
* Return value: %TRUE if the signal was handled, %FALSE if not
*/
toolbar_signals[FOCUS_HOME_OR_END] =
- g_signal_new_class_handler (I_("focus_home_or_end"),
+ g_signal_new_class_handler (I_("focus-home-or-end"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_toolbar_focus_home_or_end),
G_TYPE_BOOLEAN);
/* properties */
- g_object_class_install_property (gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum ("orientation",
- P_("Orientation"),
- P_("The orientation of the toolbar"),
- GTK_TYPE_ORIENTATION,
- GTK_ORIENTATION_HORIZONTAL,
- GTK_PARAM_READWRITE));
-
+ g_object_class_override_property (gobject_class,
+ PROP_ORIENTATION,
+ "orientation");
+
g_object_class_install_property (gobject_class,
PROP_TOOLBAR_STYLE,
g_param_spec_enum ("toolbar-style",
*/
g_object_class_install_property (gobject_class,
PROP_ICON_SIZE,
- g_param_spec_enum ("icon-size",
- P_("Icon size"),
- P_("Size of icons in this toolbar"),
- GTK_TYPE_ICON_SIZE,
- DEFAULT_ICON_SIZE,
- GTK_PARAM_READWRITE));
+ g_param_spec_int ("icon-size",
+ P_("Icon size"),
+ P_("Size of icons in this toolbar"),
+ 0, G_MAXINT,
+ DEFAULT_ICON_SIZE,
+ GTK_PARAM_READWRITE));
/**
* GtkToolbar:icon-size-set:
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT,
GTK_PARAM_READABLE));
-
- gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-style",
- P_("Toolbar style"),
- P_("Whether default toolbars have text only, text and icons, icons only, etc."),
- GTK_TYPE_TOOLBAR_STYLE,
- DEFAULT_TOOLBAR_STYLE,
- GTK_PARAM_READWRITE));
-
- gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size",
- P_("Toolbar icon size"),
- P_("Size of icons in default toolbars"),
- GTK_TYPE_ICON_SIZE,
- DEFAULT_ICON_SIZE,
- GTK_PARAM_READWRITE));
binding_set = gtk_binding_set_by_class (klass);
add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
- "focus_home_or_end", 1,
+ "focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
- "focus_home_or_end", 1,
+ "focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
- "focus_home_or_end", 1,
+ "focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
- "focus_home_or_end", 1,
+ "focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);
add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
g_type_class_add_private (gobject_class, sizeof (GtkToolbarPrivate));
}
+static void
+toolbar_tool_shell_iface_init (GtkToolShellIface *iface)
+{
+ iface->get_icon_size = toolbar_get_icon_size;
+ iface->get_orientation = toolbar_get_orientation;
+ iface->get_style = toolbar_get_style;
+ iface->get_relief_style = toolbar_get_relief_style;
+ iface->rebuild_menu = toolbar_rebuild_menu;
+}
+
static void
gtk_toolbar_init (GtkToolbar *toolbar)
{
g_object_ref_sink (toolbar->tooltips);
priv->arrow_button = gtk_toggle_button_new ();
- g_signal_connect (priv->arrow_button, "button_press_event",
+ g_signal_connect (priv->arrow_button, "button-press-event",
G_CALLBACK (gtk_toolbar_arrow_button_press), toolbar);
g_signal_connect (priv->arrow_button, "clicked",
G_CALLBACK (gtk_toolbar_arrow_button_clicked), toolbar);
switch (prop_id)
{
case PROP_ORIENTATION:
- gtk_toolbar_set_orientation (toolbar, g_value_get_enum (value));
+ g_signal_emit (toolbar, toolbar_signals[ORIENTATION_CHANGED], 0,
+ g_value_get_enum (value));
break;
case PROP_TOOLBAR_STYLE:
gtk_toolbar_set_style (toolbar, g_value_get_enum (value));
gtk_toolbar_set_tooltips (toolbar, g_value_get_boolean (value));
break;
case PROP_ICON_SIZE:
- gtk_toolbar_set_icon_size (toolbar, g_value_get_enum (value));
+ gtk_toolbar_set_icon_size (toolbar, g_value_get_int (value));
break;
case PROP_ICON_SIZE_SET:
if (g_value_get_boolean (value))
g_value_set_boolean (value, gtk_toolbar_get_tooltips (toolbar));
break;
case PROP_ICON_SIZE:
- g_value_set_enum (value, gtk_toolbar_get_icon_size (toolbar));
+ g_value_set_int (value, gtk_toolbar_get_icon_size (toolbar));
break;
case PROP_ICON_SIZE_SET:
g_value_set_boolean (value, toolbar->icon_size_set);
gdk_window_destroy (priv->event_window);
priv->event_window = NULL;
}
-
- if (GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize)
- GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
+
+ GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
}
static gint
}
}
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+
priv->is_sliding = FALSE;
priv->idle_id = 0;
GTK_WIDGET (toolbar),
menu_detached);
- g_signal_connect (priv->menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
+ g_signal_connect (priv->menu, "deactivate",
+ G_CALLBACK (menu_deactivated), toolbar);
}
gtk_container_foreach (GTK_CONTAINER (priv->menu), remove_item, NULL);
* gtk_toolbar_set_orientation:
* @toolbar: a #GtkToolbar.
* @orientation: a new #GtkOrientation.
- *
+ *
* Sets whether a toolbar should appear horizontally or vertically.
+ *
+ * Deprecated: 2.16: Use gtk_orientable_set_orientation() instead.
**/
void
gtk_toolbar_set_orientation (GtkToolbar *toolbar,
/**
* gtk_toolbar_get_orientation:
* @toolbar: a #GtkToolbar
- *
+ *
* Retrieves the current orientation of the toolbar. See
* gtk_toolbar_set_orientation().
*
* Return value: the orientation
+ *
+ * Deprecated: 2.16: Use gtk_orientable_get_orientation() instead.
**/
GtkOrientation
gtk_toolbar_get_orientation (GtkToolbar *toolbar)
* @icon: a #GtkWidget that should be used as the button's icon.
* @callback: the function to be executed when the button is pressed.
* @user_data: a pointer to any data you wish to be passed to the callback.
- *
+ *
* Inserts a new item into the toolbar. You must specify the position
* in the toolbar where it will be inserted.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar item as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget *
gtk_toolbar_append_item (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data)
{
return gtk_toolbar_insert_element (toolbar, GTK_TOOLBAR_CHILD_BUTTON,
* @icon: a #GtkWidget that should be used as the button's icon.
* @callback: the function to be executed when the button is pressed.
* @user_data: a pointer to any data you wish to be passed to the callback.
- *
+ *
* Adds a new button to the beginning (top or left edges) of the given toolbar.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar item as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget *
gtk_toolbar_prepend_item (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data)
{
return gtk_toolbar_insert_element (toolbar, GTK_TOOLBAR_CHILD_BUTTON,
* @callback: the function to be executed when the button is pressed.
* @user_data: a pointer to any data you wish to be passed to the callback.
* @position: the number of widgets to insert this item after.
- *
+ *
* Inserts a new item into the toolbar. You must specify the position in the
* toolbar where it will be inserted.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar item as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget *
gtk_toolbar_insert_item (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data,
gint position)
{
* except that underscores used to mark mnemonics are removed.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Returns: the inserted widget
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
*/
GtkWidget*
gtk_toolbar_insert_stock (GtkToolbar *toolbar,
const gchar *stock_id,
const char *tooltip_text,
const char *tooltip_private_text,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data,
gint position)
{
/**
* gtk_toolbar_append_space:
* @toolbar: a #GtkToolbar.
- *
+ *
* Adds a new space to the end of the toolbar.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
void
gtk_toolbar_append_space (GtkToolbar *toolbar)
/**
* gtk_toolbar_prepend_space:
* @toolbar: a #GtkToolbar.
- *
+ *
* Adds a new space to the beginning of the toolbar.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
void
gtk_toolbar_prepend_space (GtkToolbar *toolbar)
* gtk_toolbar_insert_space:
* @toolbar: a #GtkToolbar
* @position: the number of widgets after which a space should be inserted.
- *
+ *
* Inserts a new space in the toolbar at the specified position.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
void
gtk_toolbar_insert_space (GtkToolbar *toolbar,
* gtk_toolbar_remove_space:
* @toolbar: a #GtkToolbar.
* @position: the index of the space to remove.
- *
+ *
* Removes a space from the specified position.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
void
gtk_toolbar_remove_space (GtkToolbar *toolbar,
* @widget: a #GtkWidget to add to the toolbar.
* @tooltip_text: the element's tooltip.
* @tooltip_private_text: used for context-sensitive help about this toolbar element.
- *
+ *
* Adds a widget to the end of the given toolbar.
- **/
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
+ **/
void
gtk_toolbar_append_widget (GtkToolbar *toolbar,
GtkWidget *widget,
* @widget: a #GtkWidget to add to the toolbar.
* @tooltip_text: the element's tooltip.
* @tooltip_private_text: used for context-sensitive help about this toolbar element.
- *
+ *
* Adds a widget to the beginning of the given toolbar.
- **/
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
+ **/
void
gtk_toolbar_prepend_widget (GtkToolbar *toolbar,
GtkWidget *widget,
* @position: the number of widgets to insert this widget after.
*
* Inserts a widget in the toolbar at the given position.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
void
gtk_toolbar_insert_widget (GtkToolbar *toolbar,
* be %NULL.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar element as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget*
gtk_toolbar_append_element (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data)
{
return gtk_toolbar_insert_element (toolbar, type, widget, text,
* be %NULL.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar element as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget *
gtk_toolbar_prepend_element (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data)
{
return gtk_toolbar_insert_element (toolbar, type, widget, text,
* be %NULL.
*
* @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
- * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ * arguments. Use G_CALLBACK() to cast the function to #GCallback.
*
* Return value: the new toolbar element as a #GtkWidget.
+ *
+ * Deprecated: 2.4: Use gtk_toolbar_insert() instead.
**/
GtkWidget *
gtk_toolbar_insert_element (GtkToolbar *toolbar,
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data,
gint position)
{
const char *tooltip_text,
const char *tooltip_private_text,
GtkWidget *icon,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data,
gint position,
gboolean use_stock)
projects / ~andy / gtk / blobdiff