2,
GTK_PARAM_READABLE));
- /**
- * GtkSettings::gtk-button-images:
- *
- * Whether images should be shown on buttons
- *
- * Since: 2.4
- */
- gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images",
- P_("Show button images"),
- P_("Whether images should be shown on buttons"),
- TRUE,
- GTK_PARAM_READWRITE));
-
g_type_class_add_private (gobject_class, sizeof (GtkButtonPrivate));
}
if (priv->image_position == GTK_POS_LEFT ||
priv->image_position == GTK_POS_RIGHT)
- box = gtk_hbox_new (FALSE, image_spacing);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, image_spacing);
else
- box = gtk_vbox_new (FALSE, image_spacing);
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, image_spacing);
if (priv->align_set)
align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0);
GdkEventCrossing *event)
{
GtkButton *button;
- GtkWidget *event_widget;
button = GTK_BUTTON (widget);
- event_widget = gtk_get_event_widget ((GdkEvent*) event);
- if ((event_widget == widget) &&
+ if ((event->window == button->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR))
{
button->in_button = TRUE;
GdkEventCrossing *event)
{
GtkButton *button;
- GtkWidget *event_widget;
button = GTK_BUTTON (widget);
- event_widget = gtk_get_event_widget ((GdkEvent*) event);
- if ((event_widget == widget) &&
+ if ((event->window == button->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR) &&
- (gtk_widget_get_sensitive (event_widget)))
+ (gtk_widget_get_sensitive (widget)))
{
button->in_button = FALSE;
gtk_button_leave (button);
{
GtkButton *button;
GtkSettings *settings;
- guint show_image_connection;
+ gulong show_image_connection;
if (!gtk_widget_has_screen (widget))
return;
settings = gtk_widget_get_settings (widget);
show_image_connection =
- GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings),
- "gtk-button-connection"));
+ g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0,
+ NULL, gtk_button_setting_changed, NULL);
if (show_image_connection)
return;
- show_image_connection =
- g_signal_connect (settings, "notify::gtk-button-images",
- G_CALLBACK (gtk_button_setting_changed), NULL);
- g_object_set_data (G_OBJECT (settings),
- I_("gtk-button-connection"),
- GUINT_TO_POINTER (show_image_connection));
+ g_signal_connect (settings, "notify::gtk-button-images",
+ G_CALLBACK (gtk_button_setting_changed), NULL);
show_image_change_notify (button);
}