#include <string.h>
#include <locale.h>
#include "gtkcontainer.h"
+#include "gtkaccelmap.h"
#include "gtkiconfactory.h"
#include "gtkintl.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtkrc.h"
#include "gtkselection.h"
#include "gtksettings.h"
DIRECTION_CHANGED,
GRAB_NOTIFY,
CHILD_NOTIFY,
- ADD_ACCELERATOR,
- REMOVE_ACCELERATOR,
MNEMONIC_ACTIVATE,
GRAB_FOCUS,
FOCUS,
WINDOW_STATE_EVENT,
POPUP_MENU,
SHOW_HELP,
+ ACCEL_CLOSURES_CHANGED,
LAST_SIGNAL
};
GtkTextDirection previous_direction);
static void gtk_widget_real_grab_focus (GtkWidget *focus_widget);
-static void gtk_widget_real_show_help (GtkWidget *widget,
+static gboolean gtk_widget_real_show_help (GtkWidget *widget,
GtkWidgetHelpType help_type);
static void gtk_widget_dispatch_child_properties_changed (GtkWidget *object,
static void gtk_widget_set_style_internal (GtkWidget *widget,
GtkStyle *style,
gboolean initial_emission);
-static void gtk_widget_set_style_recurse (GtkWidget *widget,
- gpointer client_data);
static gint gtk_widget_event_internal (GtkWidget *widget,
GdkEvent *event);
static gboolean gtk_widget_real_mnemonic_activate (GtkWidget *widget,
static AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget);
static void gtk_widget_accessible_interface_init (AtkImplementorIface *iface);
static AtkObject* gtk_widget_ref_accessible (AtkImplementor *implementor);
+static void gtk_widget_invalidate_widget_windows (GtkWidget *widget,
+ GdkRegion *region);
+
/* --- variables --- */
static gpointer parent_class = NULL;
static GQuark quark_property_parser = 0;
static GQuark quark_aux_info = 0;
+static GQuark quark_accel_path = 0;
+static GQuark quark_accel_closures = 0;
static GQuark quark_event_mask = 0;
static GQuark quark_extension_event_mode = 0;
static GQuark quark_parent_window = 0;
quark_property_parser = g_quark_from_static_string ("gtk-rc-property-parser");
quark_aux_info = g_quark_from_static_string ("gtk-aux-info");
+ quark_accel_path = g_quark_from_static_string ("gtk-accel-path");
+ quark_accel_closures = g_quark_from_static_string ("gtk-accel-closures");
quark_event_mask = g_quark_from_static_string ("gtk-event-mask");
quark_extension_event_mode = g_quark_from_static_string ("gtk-extension-event-mode");
quark_parent_window = g_quark_from_static_string ("gtk-parent-window");
klass->direction_changed = gtk_widget_direction_changed;
klass->grab_notify = NULL;
klass->child_notify = NULL;
- klass->add_accelerator = (void*) gtk_accel_group_handle_add;
- klass->remove_accelerator = (void*) gtk_accel_group_handle_remove;
klass->mnemonic_activate = gtk_widget_real_mnemonic_activate;
klass->grab_focus = gtk_widget_real_grab_focus;
klass->focus = gtk_widget_real_focus;
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[HIDE] =
gtk_signal_new ("hide",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[MAP] =
gtk_signal_new ("map",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[UNMAP] =
gtk_signal_new ("unmap",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[REALIZE] =
gtk_signal_new ("realize",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[UNREALIZE] =
gtk_signal_new ("unrealize",
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[SIZE_REQUEST] =
g_signal_new ("size_request",
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkWidgetClass, size_request),
NULL, NULL,
- gtk_marshal_VOID__BOXED,
+ _gtk_marshal_VOID__BOXED,
GTK_TYPE_NONE, 1,
GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SIZE_ALLOCATE] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
- gtk_marshal_VOID__BOXED,
+ _gtk_marshal_VOID__BOXED,
GTK_TYPE_NONE, 1,
GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[STATE_CHANGED] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
- gtk_marshal_VOID__ENUM,
+ _gtk_marshal_VOID__ENUM,
GTK_TYPE_NONE, 1,
GTK_TYPE_STATE_TYPE);
widget_signals[PARENT_SET] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
widget_signals[HIERARCHY_CHANGED] =
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, hierarchy_changed),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
widget_signals[STYLE_SET] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_STYLE);
widget_signals[DIRECTION_CHANGED] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, direction_changed),
- gtk_marshal_VOID__ENUM,
+ _gtk_marshal_VOID__ENUM,
GTK_TYPE_NONE, 1,
GTK_TYPE_TEXT_DIRECTION);
widget_signals[GRAB_NOTIFY] =
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_notify),
- gtk_marshal_VOID__BOOLEAN,
+ _gtk_marshal_VOID__BOOLEAN,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
widget_signals[CHILD_NOTIFY] =
g_cclosure_marshal_VOID__PARAM,
G_TYPE_NONE,
1, G_TYPE_PARAM);
- widget_signals[ADD_ACCELERATOR] =
- gtk_accel_group_create_add (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
- GTK_SIGNAL_OFFSET (GtkWidgetClass, add_accelerator));
- widget_signals[REMOVE_ACCELERATOR] =
- gtk_accel_group_create_remove (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
- GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator));
widget_signals[MNEMONIC_ACTIVATE] =
g_signal_new ("mnemonic_activate",
GTK_CLASS_TYPE (object_class),
GTK_RUN_LAST,
GTK_SIGNAL_OFFSET (GtkWidgetClass, mnemonic_activate),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOOLEAN,
+ _gtk_marshal_BOOLEAN__BOOLEAN,
GTK_TYPE_BOOL, 1,
GTK_TYPE_BOOL);
widget_signals[GRAB_FOCUS] =
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_focus),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_signals[FOCUS] =
g_signal_new ("focus",
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, focus),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__ENUM,
+ _gtk_marshal_BOOLEAN__ENUM,
G_TYPE_BOOLEAN, 1,
GTK_TYPE_DIRECTION_TYPE);
widget_signals[EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[EVENT_AFTER] =
0,
0,
NULL, NULL,
- gtk_marshal_VOID__BOXED,
+ _gtk_marshal_VOID__BOXED,
G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[BUTTON_PRESS_EVENT] =
g_signal_new ("button_press_event",
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, button_press_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[BUTTON_RELEASE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, button_release_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SCROLL_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, scroll_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[MOTION_NOTIFY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, motion_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[DELETE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, delete_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[DESTROY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, destroy_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[EXPOSE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, expose_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[KEY_PRESS_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, key_press_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[KEY_RELEASE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, key_release_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[ENTER_NOTIFY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, enter_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[LEAVE_NOTIFY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, leave_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[CONFIGURE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, configure_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[FOCUS_IN_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, focus_in_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[FOCUS_OUT_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, focus_out_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[MAP_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, map_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[UNMAP_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, unmap_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[PROPERTY_NOTIFY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, property_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SELECTION_CLEAR_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, selection_clear_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SELECTION_REQUEST_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, selection_request_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SELECTION_NOTIFY_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, selection_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[SELECTION_RECEIVED] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, selection_received),
NULL, NULL,
- gtk_marshal_VOID__BOXED_UINT,
+ _gtk_marshal_VOID__BOXED_UINT,
G_TYPE_NONE, 2,
GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
G_TYPE_UINT);
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, selection_get),
NULL, NULL,
- gtk_marshal_VOID__BOXED_UINT_UINT,
+ _gtk_marshal_VOID__BOXED_UINT_UINT,
G_TYPE_NONE, 3,
GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
G_TYPE_UINT,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, proximity_in_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[PROXIMITY_OUT_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, proximity_out_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[DRAG_LEAVE] =
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave),
- gtk_marshal_VOID__OBJECT_UINT,
+ _gtk_marshal_VOID__OBJECT_UINT,
GTK_TYPE_NONE, 2,
GDK_TYPE_DRAG_CONTEXT,
GTK_TYPE_UINT);
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GDK_TYPE_DRAG_CONTEXT);
widget_signals[DRAG_END] =
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GDK_TYPE_DRAG_CONTEXT);
widget_signals[DRAG_DATA_DELETE] =
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GDK_TYPE_DRAG_CONTEXT);
widget_signals[DRAG_MOTION] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, drag_motion),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+ _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
G_TYPE_BOOLEAN, 4,
GDK_TYPE_DRAG_CONTEXT,
G_TYPE_INT,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, drag_drop),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+ _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
G_TYPE_BOOLEAN, 4,
GDK_TYPE_DRAG_CONTEXT,
G_TYPE_INT,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
NULL, NULL,
- gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
+ _gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
G_TYPE_NONE, 4,
GDK_TYPE_DRAG_CONTEXT,
GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
G_SIGNAL_RUN_LAST,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
NULL, NULL,
- gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
+ _gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
G_TYPE_NONE, 6,
GDK_TYPE_DRAG_CONTEXT,
G_TYPE_INT,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, visibility_notify_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[CLIENT_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, client_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[NO_EXPOSE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, no_expose_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[WINDOW_STATE_EVENT] =
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkWidgetClass, window_state_event),
_gtk_boolean_handled_accumulator, NULL,
- gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
widget_signals[POPUP_MENU] =
- gtk_signal_new ("popup_menu",
- GTK_RUN_LAST | GTK_RUN_ACTION,
+ g_signal_new ("popup_menu",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
+ _gtk_boolean_handled_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
+ widget_signals[SHOW_HELP] =
+ g_signal_new ("show_help",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
+ _gtk_boolean_handled_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__ENUM,
+ G_TYPE_BOOLEAN, 1, GTK_TYPE_WIDGET_HELP_TYPE);
+ widget_signals[ACCEL_CLOSURES_CHANGED] =
+ gtk_signal_new ("accel_closures_changed",
+ 0,
GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
+ 0,
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
- widget_signals[SHOW_HELP] =
- gtk_signal_new ("show_help",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
- gtk_marshal_NONE__ENUM,
- GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET_HELP_TYPE);
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_F10, GDK_SHIFT_MASK,
"show_help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_TOOLTIP);
-
gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_SHIFT_MASK,
"show_help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
_("Whether to draw the focus indicator inside widgets."),
TRUE,
G_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (klass,
+ g_param_spec_int ("focus-line-width",
+ _("Focus linewidth"),
+ _("Width, in pixels, of the focus indicator line."),
+ 0, G_MAXINT, 1,
+ G_PARAM_READWRITE));
+
+ gtk_widget_class_install_style_property (klass,
+ g_param_spec_string ("focus-line-pattern",
+ _("Focus line dash pattern"),
+ _("Dash pattern used to draw the focus indicator."),
+ "\1\1",
+ G_PARAM_READWRITE));
+ gtk_widget_class_install_style_property (klass,
+ g_param_spec_int ("focus-padding",
+ _("Focus padding"),
+ _("Width, in pixels, between focus indicator and the widget 'box'."),
+ 0, G_MAXINT, 1,
+ G_PARAM_READWRITE));
+ gtk_widget_class_install_style_property (klass,
+ g_param_spec_boxed ("cursor-color",
+ _("Cursor color"),
+ _("Color with which to draw insertion cursor"),
+ GDK_TYPE_COLOR,
+ G_PARAM_READABLE));
+ gtk_widget_class_install_style_property (klass,
+ g_param_spec_float ("cursor-aspect-ratio",
+ _("Cursor line aspect ratio"),
+ _("Aspect ratio with which to draw insertion cursor"),
+ 0.0, 1.0, 0.033,
+ G_PARAM_READABLE));
}
static void
const GValue *value,
GParamSpec *pspec)
{
- GtkWidget *widget;
-
- widget = GTK_WIDGET (object);
+ GtkWidget *widget = GTK_WIDGET (object);
switch (prop_id)
{
GValue *value,
GParamSpec *pspec)
{
- GtkWidget *widget;
-
- widget = GTK_WIDGET (object);
+ GtkWidget *widget = GTK_WIDGET (object);
switch (prop_id)
{
break;
case PROP_PARENT:
if (widget->parent)
- g_value_set_object (value, G_OBJECT (widget->parent));
+ g_value_set_object (value, widget->parent);
else
g_value_set_object (value, NULL);
break;
g_value_set_boolean (value, (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE));
break;
case PROP_STYLE:
- g_value_set_object (value, G_OBJECT (gtk_widget_get_style (widget)));
+ g_value_set_object (value, gtk_widget_get_style (widget));
break;
case PROP_EVENTS:
eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
(composite_child_stack ? GTK_COMPOSITE_CHILD : 0) |
GTK_DOUBLE_BUFFERED);
+ GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+ GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
+ GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
+
widget->style = gtk_widget_get_default_style ();
g_object_ref (widget->style);
}
g_object_unref (widget);
}
+/**
+ * gtk_widget_thaw_child_notify:
+ * @widget: a #GtkWidget
+ *
+ * Reverts the effect of a previous call to gtk_widget_freeze_child_notify().
+ */
void
gtk_widget_thaw_child_notify (GtkWidget *widget)
{
* gtk_widget_new:
* @type: type ID of the widget to create
* @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
*
* This is a convenience function for creating a widget and setting
* its properties in one go. For example you might write:
- * gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
- * 0.0, NULL) to create a left-aligned label. Equivalent to
+ * <literal>gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
+ * 0.0, NULL)</literal> to create a left-aligned label. Equivalent to
* gtk_object_new(), but returns a widget so you don't have to
* cast the object yourself.
*
* gtk_widget_set:
* @widget: a #GtkWidget
* @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
*
* Like gtk_object_set() - there's no reason to use this instead of
* gtk_object_set().
{
GObjectNotifyQueue *nqueue;
GtkWidget *toplevel;
- GtkWidget *ancestor;
GtkWidget *old_parent;
g_return_if_fail (GTK_IS_WIDGET (widget));
else
toplevel = NULL;
- if (GTK_IS_RESIZE_CONTAINER (widget))
- _gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
-
- /* Remove the widget and all its children from any ->resize_widgets list
- * of all the parents in our branch. This code should move into gtkcontainer.c
- * somwhen, since we mess around with ->resize_widgets, which is
- * actually not of our business.
- *
- * Two ways to make this prettier:
- * Write a g_slist_conditional_remove (GSList, gboolean (*)(gpointer))
- * Change resize_widgets to a GList
- */
- ancestor = widget->parent;
- while (ancestor)
- {
- GSList *slist;
- GSList *prev;
-
- if (!GTK_CONTAINER (ancestor)->resize_widgets)
- {
- ancestor = ancestor->parent;
- continue;
- }
-
- prev = NULL;
- slist = GTK_CONTAINER (ancestor)->resize_widgets;
- while (slist)
- {
- GtkWidget *child;
- GtkWidget *parent;
- GSList *last;
-
- last = slist;
- slist = last->next;
- child = last->data;
-
- parent = child;
- while (parent && (parent != widget))
- parent = parent->parent;
-
- if (parent == widget)
- {
- GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
-
- if (prev)
- prev->next = slist;
- else
- GTK_CONTAINER (ancestor)->resize_widgets = slist;
-
- g_slist_free_1 (last);
- }
- else
- prev = last;
- }
-
- ancestor = ancestor->parent;
- }
-
gtk_widget_queue_clear_child (widget);
/* Reset the width and height here, to force reallocation if we
* @widget: a #GtkWidget
* @widget_pointer: address of a variable that contains @widget
*
- * This function sets *@widget_pointer to NULL if @widget_pointer !=
- * NULL. It's intended to be used as a callback connected to the
+ * This function sets *@widget_pointer to %NULL if @widget_pointer !=
+ * %NULL. It's intended to be used as a callback connected to the
* "destroy" signal of a widget. You connect gtk_widget_destroyed()
* as a signal handler, and pass the address of your widget variable
* as user data. Then when the widget is destroyed, the variable will
- * be set to NULL. Useful for example to avoid multiple copies
+ * be set to %NULL. Useful for example to avoid multiple copies
* of the same dialog.
*
**/
static void
gtk_widget_real_show (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
if (!GTK_WIDGET_VISIBLE (widget))
{
GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
{
gtk_widget_ref (widget);
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
- if (!GTK_WIDGET_TOPLEVEL (widget) && GTK_WIDGET_REALIZED (widget))
+ if (!GTK_WIDGET_TOPLEVEL (widget))
gtk_widget_queue_resize (widget);
g_object_notify (G_OBJECT (widget), "visible");
gtk_widget_unref (widget);
static void
gtk_widget_real_hide (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
if (GTK_WIDGET_VISIBLE (widget))
{
GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
*
* Utility function; intended to be connected to the "delete_event"
* signal on a #GtkWindow. The function calls gtk_widget_hide() on its
- * argument, then returns %TRUE. If connected to "delete_event",
- * the result is that clicking the window manager close button for
- * will hide but not destroy the window. By default, GTK+ destroys
- * windows when "delete_event" is received.
+ * argument, then returns %TRUE. If connected to "delete_event", the
+ * result is that clicking the close button for a window (on the
+ * window frame, top right corner usually) will hide but not destroy
+ * the window. By default, GTK+ destroys windows when "delete_event"
+ * is received.
*
* Return value: %TRUE
**/
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[MAP]);
if (GTK_WIDGET_NO_WINDOW (widget))
- gtk_widget_queue_draw (widget);
+ gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
}
}
if (GTK_WIDGET_MAPPED (widget))
{
if (GTK_WIDGET_NO_WINDOW (widget))
- gtk_widget_queue_clear_child (widget);
+ gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
}
}
* @widget: a #GtkWidget
*
* Creates the GDK (windowing system) resources associated with a
- * widget. For example, widget->window will be created when a widget
+ * widget. For example, @widget->window will be created when a widget
* is realized. Normally realization happens implicitly; if you show
* a widget and all its parent containers, then the widget will be
* realized and mapped automatically.
*
* This function is only useful in widget implementations.
* Causes a widget to be unrealized (frees all GDK resources
- * associated with the widget, such as widget->window).
+ * associated with the widget, such as @widget->window).
*
**/
void
* gtk_widget_queue_draw_area(), though it once was. Now it just calls
* gtk_widget_queue_draw_area(). Originally
* gtk_widget_queue_clear_area() would force a redraw of the
- * background for GTK_NO_WINDOW widgets, and
+ * background for %GTK_NO_WINDOW widgets, and
* gtk_widget_queue_draw_area() would not. Now both functions ensure
* the background will be redrawn.
*
void
gtk_widget_queue_resize (GtkWidget *widget)
{
+ GdkRegion *region;
+
g_return_if_fail (GTK_IS_WIDGET (widget));
- gtk_widget_queue_clear (widget);
-
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ region = gdk_region_rectangle (&widget->allocation);
+ gtk_widget_invalidate_widget_windows (widget, region);
+ gdk_region_destroy (region);
+ }
+
_gtk_size_group_queue_resize (widget);
}
#endif /* G_ENABLE_DEBUG */
_gtk_size_group_compute_requisition (widget, requisition);
-
-#if 0
- if (requisition)
- gtk_widget_get_child_requisition (widget, requisition);
-
- gtk_widget_unref (widget);
-#endif
}
/**
* case it returns that geometry instead of the widget's requisition.
*
* This function differs from gtk_widget_size_request() in that
- * it retrieves the last size request value from widget->requisition,
+ * it retrieves the last size request value from @widget->requisition,
* while gtk_widget_size_request() actually calls the "size_request" method
- * on @widget to compute the size request and fill in widget->requisition,
- * and only then returns widget->requisition.
+ * on @widget to compute the size request and fill in @widget->requisition,
+ * and only then returns @widget->requisition.
*
* Because this function does not call the "size_request" method, it
- * can only be used when you know that widget->requisition is
+ * can only be used when you know that @widget->requisition is
* up-to-date, that is, gtk_widget_size_request() has been called
* since the last time a resize was queued. In general, only container
* implementations have this information; applications should use
_gtk_size_group_get_child_requisition (widget, requisition);
}
+static gboolean
+invalidate_predicate (GdkWindow *window,
+ gpointer data)
+{
+ gpointer user_data;
+
+ gdk_window_get_user_data (window, &user_data);
+
+ return (user_data == data);
+}
+
+/* Invalidate @region in widget->window and all children
+ * of widget->window owned by widget. @region is in the
+ * same coordinates as widget->allocation and will be
+ * modified by this call.
+ */
+static void
+gtk_widget_invalidate_widget_windows (GtkWidget *widget,
+ GdkRegion *region)
+{
+ if (!GTK_WIDGET_NO_WINDOW (widget))
+ {
+ int x, y;
+
+ gdk_window_get_position (widget->window, &x, &y);
+ gdk_region_offset (region, -x, -y);
+ }
+
+ gdk_window_invalidate_maybe_recurse (widget->window, region,
+ invalidate_predicate, widget);
+}
+
/**
* gtk_widget_size_allocate:
* @widget: a #GtkWidget
GtkAllocation *allocation)
{
GtkWidgetAuxInfo *aux_info;
- GtkAllocation real_allocation;
- gboolean needs_draw = FALSE;
+ GdkRectangle real_allocation;
+ GdkRectangle old_allocation;
+ gboolean alloc_needed;
+ gboolean size_changed;
+ gboolean position_changed;
g_return_if_fail (GTK_IS_WIDGET (widget));
-
+
+ alloc_needed = GTK_WIDGET_ALLOC_NEEDED (widget);
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_ALLOC_NEEDED);
+
+ old_allocation = widget->allocation;
real_allocation = *allocation;
aux_info =_gtk_widget_get_aux_info (widget, FALSE);
real_allocation.width = MAX (real_allocation.width, 1);
real_allocation.height = MAX (real_allocation.height, 1);
- if (GTK_WIDGET_NO_WINDOW (widget))
+ size_changed = (old_allocation.width != real_allocation.width ||
+ old_allocation.height != real_allocation.height);
+ position_changed = (old_allocation.x != real_allocation.x ||
+ old_allocation.y != real_allocation.y);
+
+ if (!alloc_needed && !size_changed && !position_changed)
+ return;
+
+ gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+
+ if (GTK_WIDGET_MAPPED (widget))
{
- if (widget->allocation.x != real_allocation.x ||
- widget->allocation.y != real_allocation.y ||
- widget->allocation.width != real_allocation.width ||
- widget->allocation.height != real_allocation.height)
+ if (GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_REDRAW_ON_ALLOC (widget) && position_changed)
{
- gtk_widget_queue_clear_child (widget);
- needs_draw = TRUE;
- }
- }
- else if (widget->allocation.width != real_allocation.width ||
- widget->allocation.height != real_allocation.height)
- {
- needs_draw = TRUE;
- }
+ /* Invalidate union(old_allaction,widget->allocation) in widget->window
+ */
+ GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+ gdk_region_union_with_rect (invalidate, &old_allocation);
- if (GTK_IS_RESIZE_CONTAINER (widget))
- _gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+ gdk_window_invalidate_region (widget->window, invalidate, FALSE);
+ gdk_region_destroy (invalidate);
+ }
+
+ if (size_changed)
+ {
+ if (GTK_WIDGET_REDRAW_ON_ALLOC (widget))
+ {
+ /* Invalidate union(old_allaction,widget->allocation) in widget->window and descendents owned by widget
+ */
+ GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+ gdk_region_union_with_rect (invalidate, &old_allocation);
- gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+ gtk_widget_invalidate_widget_windows (widget, invalidate);
+ gdk_region_destroy (invalidate);
+ }
+ }
+ }
- if (needs_draw)
+ if ((size_changed || position_changed) && widget->parent &&
+ GTK_WIDGET_REALIZED (widget->parent) && GTK_CONTAINER (widget->parent)->reallocate_redraws)
{
- gtk_widget_queue_draw (widget);
- if (widget->parent && GTK_CONTAINER (widget->parent)->reallocate_redraws)
- gtk_widget_queue_draw (widget->parent);
+ GdkRegion *invalidate = gdk_region_rectangle (&widget->parent->allocation);
+ gtk_widget_invalidate_widget_windows (widget->parent, invalidate);
+ gdk_region_destroy (invalidate);
}
}
gtk_widget_real_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget) &&
}
}
+typedef struct {
+ GClosure closure;
+ guint signal_id;
+} AccelClosure;
+
static void
-gtk_widget_stop_add_accelerator (GtkWidget *widget)
+closure_accel_activate (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ AccelClosure *aclosure = (AccelClosure*) closure;
+
+ if (GTK_WIDGET_IS_SENSITIVE (closure->data))
+ g_signal_emit (closure->data, aclosure->signal_id, 0);
- gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[ADD_ACCELERATOR]);
+ /* we handled the accelerator */
+ g_value_set_boolean (return_value, TRUE);
}
static void
-gtk_widget_stop_remove_accelerator (GtkWidget *widget)
+closures_destroy (gpointer data)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ GSList *slist, *closures = data;
- gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[REMOVE_ACCELERATOR]);
+ for (slist = closures; slist; slist = slist->next)
+ {
+ g_closure_invalidate (slist->data);
+ g_closure_unref (slist->data);
+ }
+ g_slist_free (closures);
}
-void
-gtk_widget_lock_accelerators (GtkWidget *widget)
+static GClosure*
+widget_new_accel_closure (GtkWidget *widget,
+ guint signal_id)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (!gtk_widget_accelerators_locked (widget))
+ AccelClosure *aclosure;
+ GClosure *closure = NULL;
+ GSList *slist, *closures;
+
+ closures = g_object_steal_qdata (G_OBJECT (widget), quark_accel_closures);
+ for (slist = closures; slist; slist = slist->next)
+ if (!gtk_accel_group_from_accel_closure (slist->data))
+ {
+ /* reuse this closure */
+ closure = slist->data;
+ break;
+ }
+ if (!closure)
{
- gtk_signal_connect (GTK_OBJECT (widget),
- "add_accelerator",
- GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
- NULL);
- gtk_signal_connect (GTK_OBJECT (widget),
- "remove_accelerator",
- GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
- NULL);
+ closure = g_closure_new_object (sizeof (AccelClosure), G_OBJECT (widget));
+ closures = g_slist_prepend (closures, g_closure_ref (closure));
+ g_closure_sink (closure);
+ g_closure_set_marshal (closure, closure_accel_activate);
}
+ g_object_set_qdata_full (G_OBJECT (widget), quark_accel_closures, closures, closures_destroy);
+
+ aclosure = (AccelClosure*) closure;
+ g_assert (closure->data == widget);
+ g_assert (closure->marshal == closure_accel_activate);
+ aclosure->signal_id = signal_id;
+
+ return closure;
}
+/**
+ * gtk_widget_add_accelerator
+ * @widget: widget to install an accelerator on
+ * @accel_signal: widget signal to emit on accelerator activation
+ * @accel_group: accel group for this widget, added to its toplevel
+ * @accel_key: GDK keyval of the accelerator
+ * @accel_mods: modifier key combination of the accelerator
+ * @accel_flags: flag accelerators, e.g. %GTK_ACCEL_VISIBLE
+ *
+ * Installs an accelerator for this @widget in @accel_group that causes
+ * @accel_signal to be emitted if the accelerator is activated.
+ * The @accel_group needs to be added to the widget's toplevel via
+ * gtk_window_add_accel_group(), and the signal must be of type %G_RUN_ACTION.
+ * Accelerators added through this function are not user changeable during
+ * runtime. If you want to support accelerators that can be changed by the
+ * user, use gtk_accel_map_add_entry() and gtk_widget_set_accel_path() or
+ * gtk_menu_item_set_accel_path() instead.
+ */
void
-gtk_widget_unlock_accelerators (GtkWidget *widget)
+gtk_widget_add_accelerator (GtkWidget *widget,
+ const gchar *accel_signal,
+ GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ GtkAccelFlags accel_flags)
{
+ GClosure *closure;
+ GSignalQuery query;
+
g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (gtk_widget_accelerators_locked (widget))
+ g_return_if_fail (accel_signal != NULL);
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+
+ g_signal_query (g_signal_lookup (accel_signal, G_OBJECT_TYPE (widget)), &query);
+ if (!query.signal_id ||
+ !(query.signal_flags & G_SIGNAL_ACTION) ||
+ query.return_type != G_TYPE_NONE ||
+ query.n_params)
{
- gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
- GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
- NULL);
- gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
- GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
- NULL);
+ /* hmm, should be elaborate enough */
+ g_warning (G_STRLOC ": widget `%s' has no activatable signal \"%s\" without arguments",
+ G_OBJECT_TYPE_NAME (widget), accel_signal);
+ return;
}
+
+ closure = widget_new_accel_closure (widget, query.signal_id);
+
+ g_object_ref (widget);
+
+ /* install the accelerator. since we don't map this onto an accel_path,
+ * the accelerator will automatically be locked.
+ */
+ gtk_accel_group_connect (accel_group,
+ accel_key,
+ accel_mods,
+ accel_flags | GTK_ACCEL_LOCKED,
+ closure);
+
+ g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+ g_object_unref (widget);
}
+/**
+ * gtk_widget_remove_accelerator:
+ * @widget: widget to install an accelerator on
+ * @accel_group: accel group for this widget
+ * @accel_key: GDK keyval of the accelerator
+ * @accel_mods: modifier key combination of the accelerator
+ * @returns: whether an accelerator was installed and could be removed
+ *
+ * Removes an accelerator from @widget, previously installed with
+ * gtk_widget_add_accelerator().
+ */
gboolean
-gtk_widget_accelerators_locked (GtkWidget *widget)
+gtk_widget_remove_accelerator (GtkWidget *widget,
+ GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods)
{
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+ GtkAccelGroupEntry *ag_entry;
+ GList *slist, *clist;
+ guint n;
- return gtk_signal_handler_pending_by_func (GTK_OBJECT (widget),
- widget_signals[ADD_ACCELERATOR],
- TRUE,
- GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
- NULL) > 0;
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+ ag_entry = gtk_accel_group_query (accel_group, accel_key, accel_mods, &n);
+ clist = gtk_widget_list_accel_closures (widget);
+ for (slist = clist; slist; slist = slist->next)
+ {
+ guint i;
+
+ for (i = 0; i < n; i++)
+ if (slist->data == (gpointer) ag_entry[i].closure)
+ {
+ gboolean is_removed = gtk_accel_group_disconnect (accel_group, slist->data);
+
+ g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+ g_list_free (clist);
+
+ return is_removed;
+ }
+ }
+ g_list_free (clist);
+
+ g_warning (G_STRLOC ": no accelerator (%u,%u) installed in accel group (%p) for %s (%p)",
+ accel_key, accel_mods, accel_group,
+ G_OBJECT_TYPE_NAME (widget), widget);
+
+ return FALSE;
}
-void
-gtk_widget_add_accelerator (GtkWidget *widget,
- const gchar *accel_signal,
- GtkAccelGroup *accel_group,
- guint accel_key,
- guint accel_mods,
- GtkAccelFlags accel_flags)
+/**
+ * gtk_widget_list_accel_closures
+ * @widget: widget to list accelerator closures for
+ * @returns: a newly allocated #GList of closures
+ *
+ * Lists the closures used by @widget for accelerator group connections
+ * with gtk_accel_group_connect_by_path() or gtk_accel_group_connect().
+ * The closures can be used to monitor accelerator changes on @widget,
+ * by connecting to the ::accel_changed signal of the #GtkAccelGroup of a
+ * closure which can be found out with gtk_accel_group_from_accel_closure().
+ */
+GList*
+gtk_widget_list_accel_closures (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (accel_group != NULL);
+ GSList *slist;
+ GList *clist = NULL;
- gtk_accel_group_add (accel_group,
- accel_key,
- accel_mods,
- accel_flags,
- (GObject*) widget,
- accel_signal);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+ for (slist = g_object_get_qdata (G_OBJECT (widget), quark_accel_closures); slist; slist = slist->next)
+ if (gtk_accel_group_from_accel_closure (slist->data))
+ clist = g_list_prepend (clist, slist->data);
+ return clist;
}
-void
-gtk_widget_remove_accelerator (GtkWidget *widget,
- GtkAccelGroup *accel_group,
- guint accel_key,
- guint accel_mods)
+typedef struct {
+ GQuark path_quark;
+ GtkWidget *widget;
+ GtkAccelGroup *accel_group;
+ GClosure *closure;
+} AccelPath;
+
+static void
+destroy_accel_path (gpointer data)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (accel_group != NULL);
+ AccelPath *apath = data;
+
+ gtk_accel_group_disconnect (apath->accel_group, apath->closure);
- gtk_accel_group_remove (accel_group,
- accel_key,
- accel_mods,
- (GObject*) widget);
+ /* closures_destroy takes care of unrefing the closure */
+ g_object_unref (apath->accel_group);
+
+ g_free (apath);
}
+
+/**
+ * gtk_widget_set_accel_path:
+ * @widget: a #GtkWidget
+ * @accel_path: path used to look up the the accelerator
+ * @accel_group: a #GtkAccelGroup.
+ *
+ * Given an accelerator group, @accel_group, and an accelerator path,
+ * @accel_path, sets up an accelerator in @accel_group so whenever the
+ * key binding that is defined for @accel_path is pressed, @widget
+ * will be activated. This removes any accelerators (for any
+ * accelerator group) installed by previous calls to
+ * gtk_widget_set_accel_path(). Associating accelerators with
+ * paths allows them to be modified by the user and the modifications
+ * to be saved for future use. (See gtk_accel_map_save().)
+ *
+ * This function is a low level function that would most likely
+ * be used by a menu creation system like #GtkItemFactory. If you
+ * use #GtkItemFactory, setting up accelerator paths will be done
+ * automatically.
+ *
+ * Even when you you aren't using #GtkItemFactory, if you only want to
+ * set up accelerators on menu items gtk_menu_item_set_accel_path()
+ * provides a somewhat more convenient interface.
+ **/
void
-gtk_widget_remove_accelerators (GtkWidget *widget,
- const gchar *accel_signal,
- gboolean visible_only)
+gtk_widget_set_accel_path (GtkWidget *widget,
+ const gchar *accel_path,
+ GtkAccelGroup *accel_group)
{
- GSList *slist;
- guint signal_id;
-
+ AccelPath *apath;
+
g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (accel_signal != NULL);
-
- signal_id = gtk_signal_lookup (accel_signal, GTK_OBJECT_TYPE (widget));
- g_return_if_fail (signal_id != 0);
-
- slist = gtk_accel_group_entries_from_object (G_OBJECT (widget));
- while (slist)
+ g_return_if_fail (GTK_WIDGET_GET_CLASS (widget)->activate_signal != 0);
+
+ if (accel_path)
{
- GtkAccelEntry *ac_entry;
-
- ac_entry = slist->data;
- slist = slist->next;
- if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE &&
- ac_entry->signal_id == signal_id)
- gtk_widget_remove_accelerator (GTK_WIDGET (widget),
- ac_entry->accel_group,
- ac_entry->accelerator_key,
- ac_entry->accelerator_mods);
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (_gtk_accel_path_is_valid (accel_path));
+
+ gtk_accel_map_add_entry (accel_path, 0, 0);
+ apath = g_new (AccelPath, 1);
+ apath->widget = widget;
+ apath->accel_group = g_object_ref (accel_group);
+ apath->path_quark = g_quark_from_string (accel_path);
+ apath->closure = widget_new_accel_closure (apath->widget, GTK_WIDGET_GET_CLASS (apath->widget)->activate_signal);
}
+ else
+ apath = NULL;
+
+ /* also removes possible old settings */
+ g_object_set_qdata_full (G_OBJECT (widget), quark_accel_path, apath, destroy_accel_path);
+
+ if (apath)
+ gtk_accel_group_connect_by_path (apath->accel_group, g_quark_to_string (apath->path_quark), apath->closure);
+
+ g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
}
-guint
-gtk_widget_accelerator_signal (GtkWidget *widget,
- GtkAccelGroup *accel_group,
- guint accel_key,
- guint accel_mods)
+const gchar*
+_gtk_widget_get_accel_path (GtkWidget *widget)
{
- GtkAccelEntry *ac_entry;
+ AccelPath *apath;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
- g_return_val_if_fail (accel_group != NULL, 0);
-
- ac_entry = gtk_accel_group_get_entry (accel_group, accel_key, accel_mods);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
- if (ac_entry && ac_entry->object == (GObject*) widget)
- return ac_entry->signal_id;
- return 0;
+ apath = g_object_get_qdata (G_OBJECT (widget), quark_accel_path);
+ return apath ? g_quark_to_string (apath->path_quark) : NULL;
}
gboolean
gtk_widget_real_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
- gboolean handled = FALSE;
-
- g_return_val_if_fail (GTK_IS_WIDGET (widget), handled);
- g_return_val_if_fail (event != NULL, handled);
-
- if (!handled)
- handled = gtk_bindings_activate (GTK_OBJECT (widget),
- event->keyval,
- event->state);
-
- return handled;
+ return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
}
static gboolean
gtk_widget_real_key_release_event (GtkWidget *widget,
GdkEventKey *event)
{
- gboolean handled = FALSE;
-
- g_return_val_if_fail (GTK_IS_WIDGET (widget), handled);
- g_return_val_if_fail (event != NULL, handled);
-
- if (!handled)
- handled = gtk_bindings_activate (GTK_OBJECT (widget),
- event->keyval,
- event->state | GDK_RELEASE_MASK);
-
- return handled;
+ return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
}
static gboolean
gtk_widget_real_focus_in_event (GtkWidget *widget,
GdkEventFocus *event)
{
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
gtk_widget_queue_draw (widget);
return FALSE;
gtk_widget_real_focus_out_event (GtkWidget *widget,
GdkEventFocus *event)
{
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
gtk_widget_queue_draw (widget);
return FALSE;
}
+#define WIDGET_REALIZED_FOR_EVENT(widget, event) \
+ (event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget))
+
/**
* gtk_widget_event:
* @widget: a #GtkWidget
GdkEvent *event)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
+ g_return_val_if_fail (WIDGET_REALIZED_FOR_EVENT (widget, event), TRUE);
if (event->type == GDK_EXPOSE)
{
* Very rarely-used function. This function is used to emit
* an expose event signals on a widget. This function is not
* normally used directly. The only time it is used is when
- * propagating an expose event to a child NO_WINDOW widget, and
- * that is normally done using gtk_container_propagate_expose.
+ * propagating an expose event to a child %NO_WINDOW widget, and
+ * that is normally done using gtk_container_propagate_expose().
*
* If you want to force an area of a window to be redrawn,
* use gdk_window_invalidate_rect() or gdk_window_invalidate_region().
* To cause the redraw to be done immediately, follow that call
- * with a call to gdk_window_procss_updates().
+ * with a call to gdk_window_process_updates().
*
* Return value: return from the event signal emission (%TRUE if the event was handled)
**/
gtk_widget_ref (widget);
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT], event, &return_val);
- return_val |= !GTK_WIDGET_REALIZED (widget);
+ return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
if (!return_val)
{
gint signal_num;
if (signal_num != -1)
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[signal_num], event, &return_val);
}
- if (GTK_WIDGET_REALIZED (widget))
+ if (WIDGET_REALIZED_FOR_EVENT (widget, event))
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT_AFTER], event);
else
return_val = TRUE;
gtk_widget_reparent_container_child (GtkWidget *widget,
gpointer client_data)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (client_data != NULL);
if (GTK_WIDGET_NO_WINDOW (widget))
gtk_widget_reparent_container_child (widget,
gtk_widget_get_parent_window (widget));
}
+
+ g_object_notify (G_OBJECT (widget), "parent");
}
}
* gtk_widget_region_intersect:
* @widget: a #GtkWidget
* @region: a #GdkRegion, in the same coordinate system as
- * widget->allocation. That is, relative to widget->window
- * for NO_WINDOW widgets; relative to the parent window
- * of widget->window for widgets with their own window.
+ * @widget->allocation. That is, relative to @widget->window
+ * for %NO_WINDOW widgets; relative to the parent window
+ * of @widget->window for widgets with their own window.
* @returns: A newly allocated region holding the intersection of @widget
* and @region. The coordinates of the return value are
- * relative to widget->window for NO_WINDOW widgets, and
- * relative to the parent window of widget->window for
+ * relative to @widget->window for %NO_WINDOW widgets, and
+ * relative to the parent window of @widget->window for
* widgets with their own window.
*
* Computes the intersection of a @widget's area and @region, returning
- * the intersection. The result may be empty, use #gdk_region_empty to
+ * the intersection. The result may be empty, use gdk_region_empty() to
* check.
**/
GdkRegion *
* Causes @widget to have the keyboard focus for the #GtkWindow it's
* inside. @widget must be a focusable widget, such as a #GtkEntry;
* something like #GtkFrame won't work. (More precisely, it must have the
- * #GTK_CAN_FOCUS flag set.)
+ * %GTK_CAN_FOCUS flag set.)
*
**/
void
{
g_return_if_fail (GTK_IS_WIDGET (widget));
+ if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ return;
+
g_object_ref (G_OBJECT (widget));
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
g_object_notify (G_OBJECT (widget), "has_focus");
static void
gtk_widget_real_grab_focus (GtkWidget *focus_widget)
{
- g_return_if_fail (GTK_IS_WIDGET (focus_widget));
-
if (GTK_WIDGET_CAN_FOCUS (focus_widget))
{
GtkWidget *toplevel;
if (widget == focus_widget)
{
- /* We call gtk_window_set_focus() here so that the
+ /* We call _gtk_window_internal_set_focus() here so that the
* toplevel window can request the focus if necessary.
* This is needed when the toplevel is a GtkPlug
*/
if (!GTK_WIDGET_HAS_FOCUS (widget))
- gtk_window_set_focus (GTK_WINDOW (toplevel), focus_widget);
+ _gtk_window_internal_set_focus (GTK_WINDOW (toplevel), focus_widget);
return;
}
widget = widget->parent;
}
if (GTK_IS_WINDOW (widget))
- gtk_window_set_focus (GTK_WINDOW (widget), focus_widget);
+ _gtk_window_internal_set_focus (GTK_WINDOW (widget), focus_widget);
}
}
-static void
+static gboolean
gtk_widget_real_show_help (GtkWidget *widget,
GtkWidgetHelpType help_type)
{
if (help_type == GTK_WIDGET_HELP_TOOLTIP)
- _gtk_tooltips_show_tip (widget);
+ {
+ _gtk_tooltips_toggle_keyboard_mode (widget);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
static gboolean
* @widget: a #GtkWidget
*
* Determines if the widget is the focus widget within its
- * toplevel. (This does not mean that the HAS_FOCUS flag is
- * necessarily set; HAS_FOCUS will only be set if the
+ * toplevel. (This does not mean that the %HAS_FOCUS flag is
+ * necessarily set; %HAS_FOCUS will only be set if the
* toplevel widget additionally has the global input focus.)
*
* Return value: %TRUE if the widget is the focus widget.
* @widget: a #GtkWidget
*
* Causes @widget to become the default widget. @widget must have the
- * #GTK_CAN_DEFAULT flag set; typically you have to set this flag
- * yourself by calling GTK_WIDGET_SET_FLAGS (@widget,
- * GTK_CAN_DEFAULT). The default widget is activated when the user
+ * %GTK_CAN_DEFAULT flag set; typically you have to set this flag
+ * yourself by calling <literal>GTK_WIDGET_SET_FLAGS (@widget,
+ * GTK_CAN_DEFAULT)</literal>. The default widget is activated when the user
* presses Enter in a window. Default widgets must be activatable,
* that is, gtk_widget_activate() should affect them.
*
gtk_widget_grab_default (GtkWidget *widget)
{
GtkWidget *window;
- GtkType window_type;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
- window_type = GTK_TYPE_WINDOW;
- window = widget->parent;
-
- while (window && !gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
- window = window->parent;
+ window = gtk_widget_get_toplevel (widget);
- if (window && gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
+ if (window && GTK_WIDGET_TOPLEVEL (window))
{
- gtk_window_set_default (GTK_WINDOW (window), widget);
- g_object_notify (G_OBJECT (widget), "has_default");
+ gtk_window_set_default (GTK_WINDOW (window), widget);
+ g_object_notify (G_OBJECT (widget), "has_default");
}
else
g_warning (G_STRLOC ": widget not within a GtkWindow");
GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
}
+/**
+ * gtk_widget_set_redraw_on_allocate:
+ * @widget: a #GtkWidget
+ * @redraw_on_allocate: if %TRUE, the entire widget will be redrawn
+ * when it is allocated to a new size. Otherwise, only the
+ * new portion of the widget will be redrawn.
+ *
+ * Sets whether a when a widgets size allocation changes, the entire
+ * widget is queued for drawing. By default, this setting is %TRUE and
+ * the entire widget is redrawn on every size change. If your widget
+ * leaves the upper left are unchanged when made bigger, turning this
+ * setting on will improve performance.
+
+ * Note that for %NO_WINDOW widgets setting this flag to %FALSE turns
+ * off all allocation on resizing: the widget will not even redraw if
+ * its position changes; this is to allow containers that don't draw
+ * anything to avoid excess invalidations. If you set this flag on a
+ * %NO_WINDOW widget that <emphasis>does</emphasis> draw on @widget->window,
+ * you are responsible for invalidating both the old and new allocation
+ * of the widget when the widget is moved and responsible for invalidating
+ * regions newly when the widget increases size.
+ **/
+void
+gtk_widget_set_redraw_on_allocate (GtkWidget *widget,
+ gboolean redraw_on_allocate)
+{
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (redraw_on_allocate)
+ GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+ else
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+}
+
/**
* gtk_widget_set_sensitive:
- * @widget: a @widget
+ * @widget: a #GtkWidget
* @sensitive: %TRUE to make the widget sensitive
*
* Sets the sensitivity of a widget. A widget is sensitive if the user
* can interact with it. Insensitive widgets are "grayed out" and the
* user can't interact with them. Insensitive widgets are known as
- * "inactive" in some other toolkits.
+ * "inactive", "disabled", or "ghosted" in some other toolkits.
*
**/
void
gtk_widget_propagate_state (widget, &data);
- gtk_widget_set_style_recurse (widget, NULL);
+ gtk_widget_reset_rc_styles (widget);
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], NULL);
if (GTK_WIDGET_ANCHORED (widget->parent))
* gtk_widget_set_style:
* @widget: a #GtkWidget
* @style: a #GtkStyle, or %NULL to remove the effect of a previous
- * gtk_widget_set_style and go back to the default style
+ * gtk_widget_set_style() and go back to the default style
*
- * Sets the #GtkStyle for a widget (widget->style). You probably don't
+ * Sets the #GtkStyle for a widget (@widget->style). You probably don't
* want to use this function; it interacts badly with themes, because
* themes work by replacing the #GtkStyle. Instead, use
* gtk_widget_modify_style().
* gtk_widget_ensure_style:
* @widget: a #GtkWidget
*
- * Ensures that @widget has a style (widget->style). Not a very useful
+ * Ensures that @widget has a style (@widget->style). Not a very useful
* function; most of the time, if you want the style, the widget is
* realized, and realized widgets are guaranteed to have a style
* already.
* gtk_widget_get_style:
* @widget: a #GtkWidget
*
- * Simply an accessor function that returns widget->style.
+ * Simply an accessor function that returns @widget->style.
*
* Return value: the widget's #GtkStyle
**/
* @widget: a #GtkWidget
* @style: the #GtkRcStyle holding the style modifications
*
- * Modify style values on the widget. Modifications made using this
- * technique take precendence over style values set via an RC file,
+ * Modifies style values on the widget. Modifications made using this
+ * technique take precedence over style values set via an RC file,
* however, they will be overriden if a style is explicitely set on
* the widget using gtk_widget_set_style(). The #GtkRcStyle structure
* is designed so each field can either be set or unset, so it is
* make your modifications to the returned style, then call
* gtk_widget_modify_style() with that style. On the other hand,
* if you first call gtk_widget_modify_style(), subsequent calls
- * to such functions gtk_widget_modify_fg() will be have a cumulative
- * effect with the inital modifications.
+ * to such functions gtk_widget_modify_fg() will have a cumulative
+ * effect with the initial modifications.
**/
void
gtk_widget_modify_style (GtkWidget *widget,
{
GtkRcStyle *old_style;
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_IS_RC_STYLE (style));
old_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
* gtk_widget_get_modifier_style:
* @widget: a #GtkWidget
*
- * Return the current modifier style for the widget. (As set by
+ * Returns the current modifier style for the widget. (As set by
* gtk_widget_modify_style().) If no style has previously set, a new
* #GtkRcStyle will be created with all values unset, and set as the
* modifier style for the widget. If you make changes to this rc
{
GtkRcStyle *rc_style;
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
quark_rc_style);
* @state: the state for which to set the foreground color.
* @color: the color to assign (does not need to be allocated).
*
- * Set the foreground color for a widget in a particular state. All
+ * Sets the foreground color for a widget in a particular state. All
* other style values are left untouched. See also
* gtk_widget_modify_style().
**/
* @state: the state for which to set the background color.
* @color: the color to assign (does not need to be allocated).
*
- * Set the background color for a widget in a particular state. All
+ * Sets the background color for a widget in a particular state. All
* other style values are left untouched. See also
* gtk_widget_modify_style().
**/
* @state: the state for which to set the text color.
* @color: the color to assign (does not need to be allocated).
*
- * Set the text color for a widget in a particular state. All other
+ * Sets the text color for a widget in a particular state. All other
* style values are left untouched. The text color is the foreground
- * color used along with the base color (see gtk_widget_modify_base)
+ * color used along with the base color (see gtk_widget_modify_base())
* for widgets such as #GtkEntry and #GtkTextView. See also
* gtk_widget_modify_style().
**/
* @state: the state for which to set the base color.
* @color: the color to assign (does not need to be allocated).
*
- * Set the base color for a widget in a particular state.
+ * Sets the base color for a widget in a particular state.
* All other style values are left untouched. The base color
* is the background color used along with the text color
- * (see gtk_widget_modify_text) for widgets such as #GtkEntry
+ * (see gtk_widget_modify_text()) for widgets such as #GtkEntry
* and #GtkTextView. See also gtk_widget_modify_style().
**/
void
* @widget: a #GtkWidget
* @font_desc: the font description to use
*
- * Set the font to use for a widget. All other style values are left
+ * Sets the font to use for a widget. All other style values are left
* untouched. See also gtk_widget_modify_style().
**/
void
GtkStyle *style,
gboolean initial_emission)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (style != NULL);
-
g_object_ref (G_OBJECT (widget));
g_object_freeze_notify (G_OBJECT (widget));
g_object_unref (previous_style);
if (widget->parent && !initial_emission)
- {
- GtkRequisition old_requisition;
-
- old_requisition = widget->requisition;
- gtk_widget_size_request (widget, NULL);
-
- if ((old_requisition.width != widget->requisition.width) ||
- (old_requisition.height != widget->requisition.height))
- gtk_widget_queue_resize (widget);
- else if (GTK_WIDGET_DRAWABLE (widget))
- gtk_widget_queue_clear (widget);
- }
+ gtk_widget_queue_resize (widget);
}
else if (initial_emission)
gtk_signal_emit (GTK_OBJECT (widget),
g_object_unref (G_OBJECT (widget));
}
-static void
-gtk_widget_set_style_recurse (GtkWidget *widget,
- gpointer client_data)
-{
- if (GTK_WIDGET_RC_STYLE (widget))
- gtk_widget_reset_rc_style (widget);
-
- if (GTK_IS_CONTAINER (widget))
- gtk_container_forall (GTK_CONTAINER (widget),
- gtk_widget_set_style_recurse,
- NULL);
-}
-
static void
gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
gpointer client_data)
* @widget: a #GtkWidget
* @previous_toplevel: Previous toplevel
*
- * Propagate changes in the anchored state to a widget and all
- * children, unsetting or setting the ANCHORED flag, and
- * emitting hierarchy_changed.
+ * Propagates changes in the anchored state to a widget and all
+ * children, unsetting or setting the %ANCHORED flag, and
+ * emitting ::hierarchy_changed.
**/
void
_gtk_widget_propagate_hierarchy_changed (GtkWidget *widget,
g_object_unref (previous_toplevel);
}
+static void
+reset_rc_styles_recurse (GtkWidget *widget, gpointer data)
+{
+ if (GTK_WIDGET_RC_STYLE (widget))
+ gtk_widget_reset_rc_style (widget);
+
+ if (GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget),
+ reset_rc_styles_recurse,
+ NULL);
+}
+
void
gtk_widget_reset_rc_styles (GtkWidget *widget)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
- gtk_widget_set_style_recurse (widget, NULL);
+ reset_rc_styles_recurse (widget, NULL);
}
+/**
+ * gtk_widget_get_default_style:
+ *
+ * Returns the default style used by all widgets initially.
+ *
+ * Returns: the default style. This #GtkStyle object is owned by GTK+ and
+ * should not be modified or freed.
+ */
GtkStyle*
gtk_widget_get_default_style (void)
{
* gtk_widget_get_pango_context:
* @widget: a #GtkWidget
*
- * Get a #PangoContext with the appropriate colormap, font description
+ * Gets a #PangoContext with the appropriate colormap, font description
* and base direction for this widget. Unlike the context returned
* by gtk_widget_create_pango_context(), this context is owned by
* the widget (it can be used as long as widget exists), and will
/**
* gtk_widget_create_pango_context:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
*
- * Create a new pango context with the appropriate colormap,
+ * Creates a new #PangoContext with the appropriate colormap,
* font description, and base direction for drawing text for
- * this widget. See also gtk_widget_get_pango_context()
+ * this widget. See also gtk_widget_get_pango_context().
*
* Return value: the new #PangoContext
**/
/**
* gtk_widget_create_pango_layout:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
* @text: text to set on the layout (can be %NULL)
*
- * Create a new #PangoLayout with the appropriate colormap,
+ * Creates a new #PangoLayout with the appropriate colormap,
* font description, and base direction for drawing text for
* this widget.
*
return retval;
}
-/*************************************************************
+/**
* gtk_widget_set_parent_window:
- * Set a non default parent window for widget
- *
- * arguments:
- * widget:
- * parent_window
- *
- * results:
- *************************************************************/
-
+ * @widget: a #GtkWidget.
+ * @parent_window: the new parent window.
+ *
+ * Sets a non default parent window for @widget.
+ **/
void
gtk_widget_set_parent_window (GtkWidget *widget,
GdkWindow *parent_window)
return GTK_WIDGET_CHILD_VISIBLE (widget);
}
-/*************************************************************
+/**
* gtk_widget_get_parent_window:
- * Get widget's parent window
- *
- * arguments:
- * widget:
- *
- * results:
- * parent window
- *************************************************************/
-
+ * @widget: a #GtkWidget.
+ * @returns: the parent window of @widget.
+ *
+ * Gets @widget's parent window.
+ **/
GdkWindow *
gtk_widget_get_parent_window (GtkWidget *widget)
{
*
*
* Sets the position of a widget. The funny "u" in the name comes from
- * the "user position" hint specified by the X window system, and
+ * the "user position" hint specified by the X Window System, and
* exists for legacy reasons. This function doesn't work if a widget
* is inside a container; it's only really useful on #GtkWindow.
*
* to set #GTK_WIN_POS_CENTER_ON_PARENT, don't do the centering
* manually.
*
- * Note that although x and y can be individually unset, the position
- * is not honoured unless both x and y are set.
+ * Note that although @x and @y can be individually unset, the position
+ * is not honoured unless both @x and @y are set.
**/
void
gtk_widget_set_uposition (GtkWidget *widget,
gint *eventp;
g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
gint *eventp;
g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
-
+
eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
if (events)
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_set_events (widget->window,
- gdk_window_get_events (widget->window) | events);
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ {
+ GList *children = gdk_window_get_children (widget->window);
+ GList *tmp_list = children;
+
+ while (tmp_list)
+ {
+ GdkWindow *window = tmp_list->data;
+ gpointer user_data;
+
+ gdk_window_get_user_data (window, &user_data);
+ if (user_data == widget)
+ gdk_window_set_events (window, gdk_window_get_events (window) | events);
+ tmp_list = tmp_list->next;
+ }
+
+ g_list_free (children);
+ }
+ else
+ {
+ gdk_window_set_events (widget->window, gdk_window_get_events (widget->window) | events);
+ }
}
g_object_notify (G_OBJECT (widget), "events");
* returned widget; it should not be unreferenced.
*
* Note the difference in behavior vs. gtk_widget_get_ancestor();
- * gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW) would return
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)</literal>
+ * would return
* %NULL if @widget wasn't inside a toplevel window, and if the
- * window was inside a GtkWindow-derived widget which was in turn
- * inside the toplevel GtkWindow. While the second case may
- * seem unlikely, it actually happens when a GtkPlug is embedded
- * inside a GtkSocket within the same application
+ * window was inside a #GtkWindow-derived widget which was in turn
+ * inside the toplevel #GtkWindow. While the second case may
+ * seem unlikely, it actually happens when a #GtkPlug is embedded
+ * inside a #GtkSocket within the same application.
*
- * To reliably find the toplevel GtkWindow, use
- * gtk_widget_get_toplevel() and check if the TOPLEVEL flags
+ * To reliably find the toplevel #GtkWindow, use
+ * gtk_widget_get_toplevel() and check if the %TOPLEVEL flags
* is set on the result.
- *
- * GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
- * if (GTK_WIDGET_TOPLEVEL (toplevel))
- * {
- * [ Perform action on toplevel. ]
- * }
+ * <informalexample><programlisting>
+ * <!>GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+ * <!>if (GTK_WIDGET_TOPLEVEL (toplevel))
+ * <!> {
+ * <!> [ Perform action on toplevel. ]
+ * <!> }
+ * </programlisting></informalexample>
*
- * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor
+ * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor.
**/
GtkWidget*
gtk_widget_get_toplevel (GtkWidget *widget)
* @widget_type: ancestor type
*
* Gets the first ancestor of @widget with type @widget_type. For example,
- * gtk_widget_get_ancestor (widget, GTK_TYPE_BOX) gets the first #GtkBox that's
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_BOX)</literal> gets the
+ * first #GtkBox that's
* an ancestor of @widget. No reference will be added to the returned widget;
* it should not be unreferenced. See note about checking for a toplevel
- * GtkWindow in the docs for gtk_widget_get_toplevel().
+ * #GtkWindow in the docs for gtk_widget_get_toplevel().
*
* Return value: the ancestor widget, or %NULL if not found
**/
* gtk_widget_get_settings:
* @widget: a #GtkWidget
*
- * Get the settings object holding the settings (global property
+ * Gets the settings object holding the settings (global property
* settings, RC file information, etc) used for this widget.
*
* Return value: the relevant #GtkSettings object
* @widget: a #GtkWidget
* @colormap: a colormap
*
- * Set the colormap for the widget to the given value. Widget must not
+ * Sets the colormap for the widget to the given value. Widget must not
* have been previously realized. This probably should only be used
- * from an init() function (i.e. from the constructor for the widget).
+ * from an <function>init()</function> function (i.e. from the constructor
+ * for the widget).
*
**/
void
*
* Obtains the location of the mouse pointer in widget coordinates.
* Widget coordinates are a bit odd; for historical reasons, they are
- * defined as widget->window coordinates for widgets that are not
- * #GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
- * widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
+ * defined as @widget->window coordinates for widgets that are not
+ * #GTK_NO_WINDOW widgets, and are relative to @widget->allocation.x,
+ * @widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
*
**/
void
static GQuark quark_composite_name = 0;
+/**
+ * gtk_widget_set_composite_name:
+ * @widget: a #GtkWidget.
+ * @name: the name to set.
+ *
+ * Sets a widgets composite name. The widget must be
+ * a composite child of its parent; see gtk_widget_push_composite_child().
+ **/
void
gtk_widget_set_composite_name (GtkWidget *widget,
const gchar *name)
g_free);
}
+/**
+ * gtk_widget_get_composite_name:
+ * @widget: a #GtkWidget.
+ * @returns: the composite name of @widget, or %NULL if @widget is not
+ * a composite child. The string should not be freed when it is no
+ * longer needed.
+ *
+ * Obtains the composite name of a widget.
+ **/
gchar*
gtk_widget_get_composite_name (GtkWidget *widget)
{
return NULL;
}
+/**
+ * gtk_widget_push_composite_child:
+ *
+ * Makes all newly-created widgets as composite children until
+ * the corresponding gtk_widget_pop_composite_child() call.
+ *
+ * A composite child is a child that's an implementation detail of the
+ * container it's inside and should not be visible to people using the
+ * container. Composite children aren't treated differently by GTK (but
+ * see gtk_container_foreach() vs. gtk_container_forall()), but e.g. GUI
+ * builders might want to treat them in a different way.
+ *
+ * Here is a simple example:
+ * <informalexample><programlisting>
+ * <!> gtk_widget_push_composite_child (<!>);
+ * <!> scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
+ * <!> gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
+ * <!> gtk_widget_pop_composite_child (<!>);
+ * <!> gtk_widget_set_parent (scrolled_window->hscrollbar,
+ * <!> GTK_WIDGET (scrolled_window));
+ * <!> gtk_widget_ref (scrolled_window->hscrollbar);
+ * </programlisting></informalexample>
+ **/
void
gtk_widget_push_composite_child (void)
{
composite_child_stack++;
}
+/**
+ * gtk_widget_pop_composite_child:
+ *
+ * Cancels the effect of a previous call to gtk_widget_push_composite_child().
+ **/
void
gtk_widget_pop_composite_child (void)
{
void
gtk_widget_push_colormap (GdkColormap *cmap)
{
- g_return_if_fail (cmap != NULL);
+ g_return_if_fail (GDK_IS_COLORMAP (cmap));
colormap_stack = g_slist_prepend (colormap_stack, cmap);
}
void
gtk_widget_set_default_colormap (GdkColormap *colormap)
{
+ g_return_if_fail (GDK_IS_COLORMAP (colormap));
+
if (default_colormap != colormap)
{
if (default_colormap)
* @widget: a #GtkWidget
* @dir: the new direction
*
- * Set the reading direction on a particular widget. This direction
+ * Sets the reading direction on a particular widget. This direction
* controls the primary direction for widgets containing text,
* and also the direction in which the children of a container are
* packed. The ability to set the direction is present in order
* reading directions can be done. Generally, applications will
* let the default reading direction present, except for containers
* where the containers are arranged in an order that is explicitely
- * visual rather than logical (such as buttons for text justificiation).
+ * visual rather than logical (such as buttons for text justification).
*
* If the direction is set to %GTK_TEXT_DIR_NONE, then the value
* set by gtk_widget_set_default_direction() will be used.
* gtk_widget_get_direction:
* @widget: a #GtkWidget
*
- * Get the reading direction for a particular widget. See
+ * Gets the reading direction for a particular widget. See
* gtk_widget_set_direction().
*
* Return value: the reading direction for the widget.
* @dir: the new default direction. This cannot be
* %GTK_TEXT_DIR_NONE.
*
- * Set the default reading direction for widgets where the
+ * Sets the default reading direction for widgets where the
* direction has not been explicitly set by gtk_widget_set_direction().
**/
void
/**
* gtk_widget_get_default_direction:
*
- * Return value: the current default direction. See
- * gtk_widget_set_direction().
+ * Obtains the current default reading direction. See
+ * gtk_widget_set_default_direction().
+ *
+ * Return value: the current default direction.
**/
GtkTextDirection
gtk_widget_get_default_direction (void)
static void
gtk_widget_real_destroy (GtkObject *object)
{
- GtkWidget *widget;
+ /* gtk_object_destroy() will already hold a refcount on object */
+ GtkWidget *widget = GTK_WIDGET (object);
- /* gtk_object_destroy() will already hold a refcount on object
- */
- widget = GTK_WIDGET (object);
+ /* wipe accelerator closures (keep order) */
+ g_object_set_qdata (G_OBJECT (widget), quark_accel_path, NULL);
+ g_object_set_qdata (G_OBJECT (widget), quark_accel_closures, NULL);
gtk_grab_remove (widget);
- gtk_selection_remove_all (widget);
g_object_unref (widget->style);
widget->style = gtk_widget_get_default_style ();
GtkAccessible *accessible;
gtk_grab_remove (widget);
- gtk_selection_remove_all (widget);
g_object_unref (widget->style);
widget->style = NULL;
static void
gtk_widget_real_map (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_WIDGET_REALIZED (widget) == TRUE);
if (!GTK_WIDGET_MAPPED (widget))
static void
gtk_widget_real_unmap (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
if (GTK_WIDGET_MAPPED (widget))
{
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
static void
gtk_widget_real_realize (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_WIDGET_NO_WINDOW (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
static void
gtk_widget_real_unrealize (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
if (GTK_WIDGET_MAPPED (widget))
gtk_widget_real_unmap (widget);
widget->window = NULL;
}
+ gtk_selection_remove_all (widget);
+
GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
}
gtk_widget_real_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
requisition->width = widget->requisition.width;
requisition->height = widget->requisition.height;
}
{
GtkWidget *window;
- window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
- if (window)
+ window = gtk_widget_get_toplevel (widget);
+ if (window && GTK_WIDGET_TOPLEVEL (window))
gtk_window_set_focus (GTK_WINDOW (window), NULL);
}
static void
gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info)
{
- g_return_if_fail (aux_info != NULL);
-
g_mem_chunk_free (aux_info_mem_chunk, aux_info);
}
g_free (info);
}
-/*****************************************
+/**
* gtk_widget_shape_combine_mask:
- * set a shape for this widgets' gdk window, this allows for
- * transparent windows etc., see gdk_window_shape_combine_mask
- * for more information
- *
- * arguments:
- *
- * results:
- *****************************************/
+ * @widget: a #GtkWidget.
+ * @shape_mask: shape to be added, or %NULL to remove an existing shape.
+ * @offset_x: X position of shape mask with respect to @window.
+ * @offset_y: Y position of shape mask with respect to @window.
+ *
+ * Sets a shape for this widget's GDK window. This allows for
+ * transparent windows etc., see gdk_window_shape_combine_mask()
+ * for more information.
+ **/
void
gtk_widget_shape_combine_mask (GtkWidget *widget,
GdkBitmap *shape_mask,
gtk_reset_shapes_recurse (widget, list->data);
}
+/**
+ * gtk_widget_reset_shapes:
+ * @widget: a #GtkWidget.
+ *
+ * Recursively resets the shape on this widget and its descendants.
+ **/
void
gtk_widget_reset_shapes (GtkWidget *widget)
{
gtk_widget_class_install_style_property_parser (class, pspec, parser);
}
+/**
+ * gtk_widget_style_get_property:
+ * @widget: a #GtkWidget
+ * @property_name: the name of a style property
+ * @value: location to return the property value
+ *
+ * Gets the value of a style property of @widget.
+ */
void
gtk_widget_style_get_property (GtkWidget *widget,
const gchar *property_name,
g_object_unref (widget);
}
+/**
+ * gtk_widget_style_get_valist:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @var_args: a <type>va_list</type> of pairs of property names and
+ * locations to return the property values, starting with the location
+ * for @first_property_name.
+ *
+ * Non-vararg variant of gtk_widget_style_get(). Used primarily by language
+ * bindings.
+ */
void
gtk_widget_style_get_valist (GtkWidget *widget,
const gchar *first_property_name,
g_object_unref (widget);
}
+/**
+ * gtk_widget_style_get:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @Varargs: pairs of property names and locations to
+ * return the property values, starting with the location for
+ * @first_property_name, terminated by %NULL.
+ *
+ * Gets the values of a multiple style properties of @widget.
+ */
void
gtk_widget_style_get (GtkWidget *widget,
const gchar *first_property_name,
/**
* gtk_widget_path:
* @widget: a #GtkWidget
- * @path_length: location to store length of the path
- * @path: location to store allocated path string
- * @path_reversed: location to store allocated reverse path string
+ * @path_length: location to store length of the path, or %NULL
+ * @path: location to store allocated path string, or %NULL
+ * @path_reversed: location to store allocated reverse path string, or %NULL
*
* Obtains the full path to @widget. The path is simply the name of a
* widget and all its parents in the container hierarchy, separated by
**/
void
gtk_widget_path (GtkWidget *widget,
- guint *path_length_p,
- gchar **path_p,
- gchar **path_reversed_p)
+ guint *path_length,
+ gchar **path,
+ gchar **path_reversed)
{
static gchar *rev_path = NULL;
- static guint path_len = 0;
+ static guint tmp_path_len = 0;
guint len;
g_return_if_fail (GTK_IS_WIDGET (widget));
string = gtk_widget_get_name (widget);
l = strlen (string);
- while (path_len <= len + l + 1)
+ while (tmp_path_len <= len + l + 1)
{
- path_len += INIT_PATH_SIZE;
- rev_path = g_realloc (rev_path, path_len);
+ tmp_path_len += INIT_PATH_SIZE;
+ rev_path = g_realloc (rev_path, tmp_path_len);
}
s = string + l - 1;
d = rev_path + len;
}
while (widget);
- if (path_length_p)
- *path_length_p = len - 1;
- if (path_reversed_p)
- *path_reversed_p = g_strdup (rev_path);
- if (path_p)
+ if (path_length)
+ *path_length = len - 1;
+ if (path_reversed)
+ *path_reversed = g_strdup (rev_path);
+ if (path)
{
- *path_p = g_strdup (rev_path);
- g_strreverse (*path_p);
+ *path = g_strdup (rev_path);
+ g_strreverse (*path);
}
}
/**
* gtk_widget_class_path:
* @widget: a #GtkWidget
- * @path_length: location to store the length of the class path
- * @path: location to store the class path as an allocated string
- * @path_reversed: location to store the reverse class path as an allocated string
+ * @path_length: location to store the length of the class path, or %NULL
+ * @path: location to store the class path as an allocated string, or %NULL
+ * @path_reversed: location to store the reverse class path as an allocated string, or %NULL
*
* Same as gtk_widget_path(), but always uses the name of a widget's type,
* never uses a custom name set with gtk_widget_set_name().
**/
void
gtk_widget_class_path (GtkWidget *widget,
- guint *path_length_p,
- gchar **path_p,
- gchar **path_reversed_p)
+ guint *path_length,
+ gchar **path,
+ gchar **path_reversed)
{
static gchar *rev_path = NULL;
- static guint path_len = 0;
+ static guint tmp_path_len = 0;
guint len;
g_return_if_fail (GTK_IS_WIDGET (widget));
string = gtk_type_name (GTK_WIDGET_TYPE (widget));
l = strlen (string);
- while (path_len <= len + l + 1)
+ while (tmp_path_len <= len + l + 1)
{
- path_len += INIT_PATH_SIZE;
- rev_path = g_realloc (rev_path, path_len);
+ tmp_path_len += INIT_PATH_SIZE;
+ rev_path = g_realloc (rev_path, tmp_path_len);
}
s = string + l - 1;
d = rev_path + len;
}
while (widget);
- if (path_length_p)
- *path_length_p = len - 1;
- if (path_reversed_p)
- *path_reversed_p = g_strdup (rev_path);
- if (path_p)
+ if (path_length)
+ *path_length = len - 1;
+ if (path_reversed)
+ *path_reversed = g_strdup (rev_path);
+ if (path)
{
- *path_p = g_strdup (rev_path);
- g_strreverse (*path_p);
+ *path = g_strdup (rev_path);
+ g_strreverse (*path);
}
}
+/**
+ * gtk_requisition_copy:
+ * @requisition: a #GtkRequisition.
+ * @returns: a copy of @requisition.
+ *
+ * Copies a #GtkRequisition.
+ **/
GtkRequisition *
gtk_requisition_copy (const GtkRequisition *requisition)
{
return (GtkRequisition *)g_memdup (requisition, sizeof (GtkRequisition));
}
+/**
+ * gtk_requisition_free:
+ * @requisition: a #GtkRequisition.
+ *
+ * Frees a #GtkRequisition.
+ **/
void
gtk_requisition_free (GtkRequisition *requisition)
{
g_free (requisition);
}
-AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
+GType
+gtk_requisition_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+ (GBoxedCopyFunc) gtk_requisition_copy,
+ (GBoxedFreeFunc) gtk_requisition_free);
+
+ return our_type;
+}
+
+AtkObject*
+gtk_widget_get_accessible (GtkWidget *widget)
{
GtkWidgetClass *klass;
return klass->get_accessible (widget);
}
-AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
+static AtkObject*
+gtk_widget_real_get_accessible (GtkWidget *widget)
{
AtkObject* accessible;
g_object_ref (G_OBJECT (accessible));
return accessible;
}
-
projects / ~andy / gtk / blobdiff