*/
#include "config.h"
+
+#include "gtkbutton.h"
+#include "gtkbuttonprivate.h"
+
#include <string.h>
#include "gtkalignment.h"
-#include "gtkbutton.h"
#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkiconfactory.h"
#include "gtkactivatable.h"
#include "gtksizerequest.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include "gtkalias.h"
+
static const GtkBorder default_default_border = { 1, 1, 1, 1 };
static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
*/
#define ACTIVATE_TIMEOUT 250
+
enum {
PRESSED,
RELEASED,
PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
};
-#define GTK_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_BUTTON, GtkButtonPrivate))
-typedef struct _GtkButtonPrivate GtkButtonPrivate;
-
-struct _GtkButtonPrivate
-{
- gfloat xalign;
- gfloat yalign;
- GtkWidget *image;
- guint align_set : 1;
- guint image_is_stock : 1;
- guint use_action_appearance : 1;
- guint32 grab_time;
- GdkDevice *grab_keyboard;
- GtkPositionType image_position;
- GtkAction *action;
-};
-static void gtk_button_destroy (GtkObject *object);
+static void gtk_button_destroy (GtkWidget *widget);
static void gtk_button_dispose (GObject *object);
static void gtk_button_set_property (GObject *object,
guint prop_id,
static void gtk_button_unrealize (GtkWidget * widget);
static void gtk_button_map (GtkWidget * widget);
static void gtk_button_unmap (GtkWidget * widget);
-static void gtk_button_style_set (GtkWidget * widget, GtkStyle * prev_style);
+static void gtk_button_style_updated (GtkWidget * widget);
static void gtk_button_size_allocate (GtkWidget * widget,
GtkAllocation * allocation);
-static gint gtk_button_expose (GtkWidget * widget, GdkEventExpose * event);
+static gint gtk_button_draw (GtkWidget * widget, cairo_t *cr);
static gint gtk_button_button_press (GtkWidget * widget,
GdkEventButton * event);
static gint gtk_button_button_release (GtkWidget * widget,
static void gtk_button_set_use_action_appearance (GtkButton *button,
gboolean use_appearance);
-static void gtk_button_size_request_init (GtkSizeRequestIface *iface);
-static void gtk_button_get_width (GtkSizeRequest *widget,
+static void gtk_button_get_preferred_width (GtkWidget *widget,
gint *minimum_size,
gint *natural_size);
-static void gtk_button_get_height (GtkSizeRequest *widget,
+static void gtk_button_get_preferred_height (GtkWidget *widget,
gint *minimum_size,
gint *natural_size);
G_DEFINE_TYPE_WITH_CODE (GtkButton, gtk_button, GTK_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
- gtk_button_activatable_interface_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
- gtk_button_size_request_init))
+ gtk_button_activatable_interface_init))
static void
gtk_button_class_init (GtkButtonClass *klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = G_OBJECT_CLASS (klass);
- object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
gobject_class->set_property = gtk_button_set_property;
gobject_class->get_property = gtk_button_get_property;
- object_class->destroy = gtk_button_destroy;
-
+ widget_class->get_preferred_width = gtk_button_get_preferred_width;
+ widget_class->get_preferred_height = gtk_button_get_preferred_height;
+ widget_class->destroy = gtk_button_destroy;
widget_class->screen_changed = gtk_button_screen_changed;
widget_class->realize = gtk_button_realize;
widget_class->unrealize = gtk_button_unrealize;
widget_class->map = gtk_button_map;
widget_class->unmap = gtk_button_unmap;
- widget_class->style_set = gtk_button_style_set;
+ widget_class->style_updated = gtk_button_style_updated;
widget_class->size_allocate = gtk_button_size_allocate;
- widget_class->expose_event = gtk_button_expose;
+ widget_class->draw = gtk_button_draw;
widget_class->button_press_event = gtk_button_button_press;
widget_class->button_release_event = gtk_button_button_release;
widget_class->grab_broken_event = gtk_button_grab_broken;
container_class->child_type = gtk_button_child_type;
container_class->add = gtk_button_add;
+ gtk_container_class_handle_border_width (container_class);
klass->pressed = gtk_real_button_pressed;
klass->released = gtk_real_button_released;
GTK_PARAM_READWRITE));
/**
- * GtkButton::image:
+ * GtkButton:image:
*
* The child widget to appear next to the button text.
*
*/
button_signals[PRESSED] =
g_signal_new (I_("pressed"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, pressed),
NULL, NULL,
*/
button_signals[RELEASED] =
g_signal_new (I_("released"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, released),
NULL, NULL,
*/
button_signals[CLICKED] =
g_signal_new (I_("clicked"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkButtonClass, clicked),
NULL, NULL,
*/
button_signals[ENTER] =
g_signal_new (I_("enter"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, enter),
NULL, NULL,
*/
button_signals[LEAVE] =
g_signal_new (I_("leave"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, leave),
NULL, NULL,
*/
button_signals[ACTIVATE] =
g_signal_new (I_("activate"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkButtonClass, activate),
NULL, NULL,
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));
}
static void
gtk_button_init (GtkButton *button)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv;
+ GtkStyleContext *context;
+
+ button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+ GTK_TYPE_BUTTON,
+ GtkButtonPrivate);
+ priv = button->priv;
gtk_widget_set_can_focus (GTK_WIDGET (button), TRUE);
gtk_widget_set_receives_default (GTK_WIDGET (button), TRUE);
gtk_widget_set_has_window (GTK_WIDGET (button), FALSE);
- button->label_text = NULL;
-
- button->constructed = FALSE;
- button->in_button = FALSE;
- button->button_down = FALSE;
- button->relief = GTK_RELIEF_NORMAL;
- button->use_stock = FALSE;
- button->use_underline = FALSE;
- button->depressed = FALSE;
- button->depress_on_activate = TRUE;
- button->focus_on_click = TRUE;
+ priv->label_text = NULL;
+
+ priv->constructed = FALSE;
+ priv->in_button = FALSE;
+ priv->button_down = FALSE;
+ priv->relief = GTK_RELIEF_NORMAL;
+ priv->use_stock = FALSE;
+ priv->use_underline = FALSE;
+ priv->depressed = FALSE;
+ priv->depress_on_activate = TRUE;
+ priv->focus_on_click = TRUE;
priv->xalign = 0.5;
priv->yalign = 0.5;
priv->image_is_stock = TRUE;
priv->image_position = GTK_POS_LEFT;
priv->use_action_appearance = TRUE;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (button));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
}
static void
-gtk_button_destroy (GtkObject *object)
+gtk_button_destroy (GtkWidget *widget)
{
- GtkButton *button = GTK_BUTTON (object);
-
- if (button->label_text)
+ GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
+
+ if (priv->label_text)
{
- g_free (button->label_text);
- button->label_text = NULL;
+ g_free (priv->label_text);
+ priv->label_text = NULL;
}
- GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->destroy (widget);
}
static GObject*
{
GObject *object;
GtkButton *button;
+ GtkButtonPrivate *priv;
object = G_OBJECT_CLASS (gtk_button_parent_class)->constructor (type,
n_construct_properties,
construct_params);
button = GTK_BUTTON (object);
- button->constructed = TRUE;
+ priv = button->priv;
+
+ priv->constructed = TRUE;
- if (button->label_text != NULL)
+ if (priv->label_text != NULL)
gtk_button_construct_child (button);
return object;
static GType
gtk_button_child_type (GtkContainer *container)
{
- if (!GTK_BIN (container)->child)
+ if (!gtk_bin_get_child (GTK_BIN (container)))
return GTK_TYPE_WIDGET;
else
return G_TYPE_NONE;
maybe_set_alignment (GtkButton *button,
GtkWidget *widget)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (GTK_IS_MISC (widget))
{
else if (GTK_IS_ALIGNMENT (widget))
{
GtkAlignment *alignment = GTK_ALIGNMENT (widget);
+ gfloat xscale, yscale;
+
+ g_object_get (alignment,
+ "xscale", &xscale,
+ "yscale", &yscale,
+ NULL);
if (priv->align_set)
- gtk_alignment_set (alignment, priv->xalign, priv->yalign,
- alignment->xscale, alignment->yscale);
+ gtk_alignment_set (alignment,
+ priv->xalign, priv->yalign,
+ xscale, yscale);
}
}
gtk_button_dispose (GObject *object)
{
GtkButton *button = GTK_BUTTON (object);
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (priv->action)
{
GParamSpec *pspec)
{
GtkButton *button = GTK_BUTTON (object);
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
switch (prop_id)
{
GParamSpec *pspec)
{
GtkButton *button = GTK_BUTTON (object);
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
switch (prop_id)
{
case PROP_LABEL:
- g_value_set_string (value, button->label_text);
+ g_value_set_string (value, priv->label_text);
break;
case PROP_IMAGE:
g_value_set_object (value, (GObject *)priv->image);
break;
case PROP_RELIEF:
- g_value_set_enum (value, gtk_button_get_relief (button));
+ g_value_set_enum (value, priv->relief);
break;
case PROP_USE_UNDERLINE:
- g_value_set_boolean (value, button->use_underline);
+ g_value_set_boolean (value, priv->use_underline);
break;
case PROP_USE_STOCK:
- g_value_set_boolean (value, button->use_stock);
+ g_value_set_boolean (value, priv->use_stock);
break;
case PROP_FOCUS_ON_CLICK:
- g_value_set_boolean (value, button->focus_on_click);
+ g_value_set_boolean (value, priv->focus_on_click);
break;
case PROP_XALIGN:
g_value_set_float (value, priv->xalign);
activatable_update_short_label (GtkButton *button,
GtkAction *action)
{
+ GtkWidget *child;
GtkWidget *image;
if (gtk_button_get_use_stock (button))
image = gtk_button_get_image (button);
/* Dont touch custom child... */
+ child = gtk_bin_get_child (GTK_BIN (button));
if (GTK_IS_IMAGE (image) ||
- GTK_BIN (button)->child == NULL ||
- GTK_IS_LABEL (GTK_BIN (button)->child))
+ child == NULL ||
+ GTK_IS_LABEL (child))
{
gtk_button_set_label (button, gtk_action_get_short_label (action));
gtk_button_set_use_underline (button, TRUE);
GtkAction *action,
const gchar *property_name)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
+ GtkButton *button = GTK_BUTTON (activatable);
+ GtkButtonPrivate *priv = button->priv;
if (strcmp (property_name, "visible") == 0)
{
gtk_button_sync_action_properties (GtkActivatable *activatable,
GtkAction *action)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
+ GtkButton *button = GTK_BUTTON (activatable);
+ GtkButtonPrivate *priv = button->priv;
if (!action)
return;
gtk_button_set_related_action (GtkButton *button,
GtkAction *action)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (priv->action == action)
return;
gtk_button_set_use_action_appearance (GtkButton *button,
gboolean use_appearance)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (priv->use_action_appearance != use_appearance)
{
static gboolean
show_image (GtkButton *button)
{
+ GtkButtonPrivate *priv = button->priv;
gboolean show;
-
- if (button->label_text)
+
+ if (priv->label_text)
{
GtkSettings *settings;
static void
gtk_button_construct_child (GtkButton *button)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
+ GtkStyleContext *context;
GtkStockItem item;
+ GtkWidget *child;
GtkWidget *label;
GtkWidget *box;
GtkWidget *align;
gchar *label_text = NULL;
gint image_spacing;
- if (!button->constructed)
+ if (!priv->constructed)
return;
- if (!button->label_text && !priv->image)
+ if (!priv->label_text && !priv->image)
return;
- gtk_widget_style_get (GTK_WIDGET (button),
- "image-spacing", &image_spacing,
- NULL);
+ context = gtk_widget_get_style_context (GTK_WIDGET (button));
+
+ gtk_style_context_get_style (context,
+ "image-spacing", &image_spacing,
+ NULL);
if (priv->image && !priv->image_is_stock)
{
+ GtkWidget *parent;
+
image = g_object_ref (priv->image);
- if (image->parent)
- gtk_container_remove (GTK_CONTAINER (image->parent), image);
+
+ parent = gtk_widget_get_parent (image);
+ if (parent)
+ gtk_container_remove (GTK_CONTAINER (parent), image);
}
priv->image = NULL;
- if (GTK_BIN (button)->child)
- gtk_container_remove (GTK_CONTAINER (button),
- GTK_BIN (button)->child);
+ child = gtk_bin_get_child (GTK_BIN (button));
+ if (child)
+ gtk_container_remove (GTK_CONTAINER (button), child);
- if (button->use_stock &&
- button->label_text &&
- gtk_stock_lookup (button->label_text, &item))
+ if (priv->use_stock &&
+ priv->label_text &&
+ gtk_stock_lookup (priv->label_text, &item))
{
if (!image)
- image = g_object_ref (gtk_image_new_from_stock (button->label_text, GTK_ICON_SIZE_BUTTON));
+ image = g_object_ref (gtk_image_new_from_stock (priv->label_text, GTK_ICON_SIZE_BUTTON));
label_text = item.label;
}
else
- label_text = button->label_text;
+ label_text = priv->label_text;
if (image)
{
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);
if (label_text)
{
- if (button->use_underline || button->use_stock)
+ if (priv->use_underline || priv->use_stock)
{
label = gtk_label_new_with_mnemonic (label_text);
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
return;
}
- if (button->use_underline || button->use_stock)
+ if (priv->use_underline || priv->use_stock)
{
- label = gtk_label_new_with_mnemonic (button->label_text);
+ label = gtk_label_new_with_mnemonic (priv->label_text);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
}
else
- label = gtk_label_new (button->label_text);
+ label = gtk_label_new (priv->label_text);
if (priv->align_set)
gtk_misc_set_alignment (GTK_MISC (label), priv->xalign, priv->yalign);
{
g_return_if_fail (GTK_IS_BUTTON (button));
-
g_signal_emit (button, button_signals[PRESSED], 0);
}
gtk_button_set_relief (GtkButton *button,
GtkReliefStyle newrelief)
{
+ GtkButtonPrivate *priv;
+
g_return_if_fail (GTK_IS_BUTTON (button));
- if (newrelief != button->relief)
+ priv = button->priv;
+
+ if (newrelief != priv->relief)
{
- button->relief = newrelief;
+ priv->relief = newrelief;
g_object_notify (G_OBJECT (button), "relief");
gtk_widget_queue_draw (GTK_WIDGET (button));
}
{
g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_RELIEF_NORMAL);
- return button->relief;
+ return button->priv->relief;
}
static void
gtk_button_realize (GtkWidget *widget)
{
- GtkButton *button;
+ GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
+ GtkAllocation allocation;
+ GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
- gint border_width;
- button = GTK_BUTTON (widget);
- gtk_widget_set_realized (widget, TRUE);
+ gtk_widget_get_allocation (widget, &allocation);
- border_width = GTK_CONTAINER (widget)->border_width;
+ gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x + border_width;
- attributes.y = widget->allocation.y + border_width;
- attributes.width = widget->allocation.width - border_width * 2;
- attributes.height = widget->allocation.height - border_width * 2;
+ attributes.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
attributes_mask = GDK_WA_X | GDK_WA_Y;
- widget->window = gtk_widget_get_parent_window (widget);
- g_object_ref (widget->window);
-
- button->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
- gdk_window_set_user_data (button->event_window, button);
+ window = gtk_widget_get_parent_window (widget);
+ gtk_widget_set_window (widget, window);
+ g_object_ref (window);
- widget->style = gtk_style_attach (widget->style, widget->window);
+ priv->event_window = gdk_window_new (window,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (priv->event_window, button);
}
static void
gtk_button_unrealize (GtkWidget *widget)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
- if (button->activate_timeout)
+ if (priv->activate_timeout)
gtk_button_finish_activate (button, FALSE);
- if (button->event_window)
+ if (priv->event_window)
{
- gdk_window_set_user_data (button->event_window, NULL);
- gdk_window_destroy (button->event_window);
- button->event_window = NULL;
+ gdk_window_set_user_data (priv->event_window, NULL);
+ gdk_window_destroy (priv->event_window);
+ priv->event_window = NULL;
}
-
+
GTK_WIDGET_CLASS (gtk_button_parent_class)->unrealize (widget);
}
gtk_button_map (GtkWidget *widget)
{
GtkButton *button = GTK_BUTTON (widget);
-
+ GtkButtonPrivate *priv = button->priv;
+
GTK_WIDGET_CLASS (gtk_button_parent_class)->map (widget);
- if (button->event_window)
- gdk_window_show (button->event_window);
+ if (priv->event_window)
+ gdk_window_show (priv->event_window);
}
static void
gtk_button_unmap (GtkWidget *widget)
{
GtkButton *button = GTK_BUTTON (widget);
-
- if (button->event_window)
- gdk_window_hide (button->event_window);
+ GtkButtonPrivate *priv = button->priv;
+
+ if (priv->event_window)
+ gdk_window_hide (priv->event_window);
GTK_WIDGET_CLASS (gtk_button_parent_class)->unmap (widget);
}
static void
-gtk_button_update_image_spacing (GtkButton *button)
+gtk_button_update_image_spacing (GtkButton *button,
+ GtkStyleContext *context)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
GtkWidget *child;
gint spacing;
* we only want to update the spacing if the box
* was constructed there.
*/
- if (!button->constructed || !priv->image)
+ if (!priv->constructed || !priv->image)
return;
- child = GTK_BIN (button)->child;
+ child = gtk_bin_get_child (GTK_BIN (button));
if (GTK_IS_ALIGNMENT (child))
{
- child = GTK_BIN (child)->child;
+ child = gtk_bin_get_child (GTK_BIN (child));
if (GTK_IS_BOX (child))
{
- gtk_widget_style_get (GTK_WIDGET (button),
- "image-spacing", &spacing,
- NULL);
+ gtk_style_context_get_style (context,
+ "image-spacing", &spacing,
+ NULL);
gtk_box_set_spacing (GTK_BOX (child), spacing);
}
- }
+ }
}
static void
-gtk_button_style_set (GtkWidget *widget,
- GtkStyle *prev_style)
+gtk_button_style_updated (GtkWidget *widget)
{
- gtk_button_update_image_spacing (GTK_BUTTON (widget));
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_button_update_image_spacing (GTK_BUTTON (widget), context);
}
static void
GtkBorder *inner_border,
gboolean *interior_focus)
{
- GtkWidget *widget = GTK_WIDGET (button);
+ GtkStyleContext *context;
GtkBorder *tmp_border;
+ context = gtk_widget_get_style_context (GTK_WIDGET (button));
+
if (default_border)
{
- gtk_widget_style_get (widget, "default-border", &tmp_border, NULL);
+ gtk_style_context_get_style (context,
+ "default-border", &tmp_border,
+ NULL);
if (tmp_border)
{
if (default_outside_border)
{
- gtk_widget_style_get (widget, "default-outside-border", &tmp_border, NULL);
+ gtk_style_context_get_style (context,
+ "default-outside-border", &tmp_border,
+ NULL);
if (tmp_border)
{
if (inner_border)
{
- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL);
+ gtk_style_context_get_style (context,
+ "inner-border", &tmp_border,
+ NULL);
if (tmp_border)
{
}
if (interior_focus)
- gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL);
+ {
+ gtk_style_context_get_style (context,
+ "interior-focus", interior_focus,
+ NULL);
+ }
}
static void
GtkAllocation *allocation)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
GtkAllocation child_allocation;
-
- gint border_width = GTK_CONTAINER (widget)->border_width;
- gint xthickness = GTK_WIDGET (widget)->style->xthickness;
- gint ythickness = GTK_WIDGET (widget)->style->ythickness;
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GtkWidget *child;
GtkBorder default_border;
GtkBorder inner_border;
+ GtkBorder *border;
gint focus_width;
gint focus_pad;
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
+
gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL);
- gtk_widget_style_get (GTK_WIDGET (widget),
- "focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
- NULL);
-
-
- widget->allocation = *allocation;
+ gtk_style_context_get_style (context,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
- if (gtk_widget_get_realized (widget))
- gdk_window_move_resize (button->event_window,
- widget->allocation.x + border_width,
- widget->allocation.y + border_width,
- widget->allocation.width - border_width * 2,
- widget->allocation.height - border_width * 2);
+ gtk_style_context_get (context, state,
+ "border-width", &border,
+ NULL);
+
+ gtk_widget_set_allocation (widget, allocation);
- if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (priv->event_window,
+ allocation->x,
+ allocation->y,
+ allocation->width,
+ allocation->height);
+
+ child = gtk_bin_get_child (GTK_BIN (button));
+ if (child && gtk_widget_get_visible (child))
{
- child_allocation.x = widget->allocation.x + border_width + inner_border.left + xthickness;
- child_allocation.y = widget->allocation.y + border_width + inner_border.top + ythickness;
-
- child_allocation.width = MAX (1, widget->allocation.width -
- xthickness * 2 -
- inner_border.left -
- inner_border.right -
- border_width * 2);
- child_allocation.height = MAX (1, widget->allocation.height -
- ythickness * 2 -
- inner_border.top -
- inner_border.bottom -
- border_width * 2);
+ child_allocation.x = allocation->x + inner_border.left + border->left;
+ child_allocation.y = allocation->y + inner_border.top + border->top;
+
+ child_allocation.width =
+ allocation->width -
+ (border->left + border->right) -
+ inner_border.left -
+ inner_border.right;
+
+ child_allocation.height =
+ allocation->height -
+ (border->top + border->bottom) -
+ inner_border.top -
+ inner_border.bottom;
if (gtk_widget_get_can_default (GTK_WIDGET (button)))
{
child_allocation.x += default_border.left;
child_allocation.y += default_border.top;
- child_allocation.width = MAX (1, child_allocation.width - default_border.left - default_border.right);
- child_allocation.height = MAX (1, child_allocation.height - default_border.top - default_border.bottom);
+ child_allocation.width = child_allocation.width - default_border.left - default_border.right;
+ child_allocation.height = child_allocation.height - default_border.top - default_border.bottom;
}
if (gtk_widget_get_can_focus (GTK_WIDGET (button)))
{
child_allocation.x += focus_width + focus_pad;
child_allocation.y += focus_width + focus_pad;
- child_allocation.width = MAX (1, child_allocation.width - (focus_width + focus_pad) * 2);
- child_allocation.height = MAX (1, child_allocation.height - (focus_width + focus_pad) * 2);
+ child_allocation.width = child_allocation.width - (focus_width + focus_pad) * 2;
+ child_allocation.height = child_allocation.height - (focus_width + focus_pad) * 2;
}
- if (button->depressed)
+ if (priv->depressed)
{
gint child_displacement_x;
gint child_displacement_y;
-
- gtk_widget_style_get (widget,
- "child-displacement-x", &child_displacement_x,
- "child-displacement-y", &child_displacement_y,
- NULL);
+
+ gtk_style_context_get_style (context,
+ "child-displacement-x", &child_displacement_x,
+ "child-displacement-y", &child_displacement_y,
+ NULL);
child_allocation.x += child_displacement_x;
child_allocation.y += child_displacement_y;
}
- gtk_widget_size_allocate (GTK_BIN (button)->child, &child_allocation);
+ child_allocation.width = MAX (1, child_allocation.width);
+ child_allocation.height = MAX (1, child_allocation.height);
+
+ gtk_widget_size_allocate (child, &child_allocation);
}
+
+ gtk_border_free (border);
}
void
_gtk_button_paint (GtkButton *button,
- const GdkRectangle *area,
- GtkStateType state_type,
- GtkShadowType shadow_type,
- const gchar *main_detail,
- const gchar *default_detail)
+ cairo_t *cr,
+ int width,
+ int height,
+ GtkStateFlags state)
{
+ GtkButtonPrivate *priv = button->priv;
GtkWidget *widget;
- gint width, height;
gint x, y;
- gint border_width;
GtkBorder default_border;
GtkBorder default_outside_border;
gboolean interior_focus;
gint focus_width;
gint focus_pad;
+ GtkAllocation allocation;
+ GdkWindow *window;
+ GtkStyleContext *context;
widget = GTK_WIDGET (button);
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
+
+ gtk_button_get_props (button, &default_border, &default_outside_border, NULL, &interior_focus);
+ gtk_style_context_get_style (context,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
- if (gtk_widget_is_drawable (widget))
+ gtk_widget_get_allocation (widget, &allocation);
+ window = gtk_widget_get_window (widget);
+
+ x = 0;
+ y = 0;
+
+ if (gtk_widget_has_default (widget) &&
+ priv->relief == GTK_RELIEF_NORMAL)
{
- border_width = GTK_CONTAINER (widget)->border_width;
-
- gtk_button_get_props (button, &default_border, &default_outside_border, NULL, &interior_focus);
- gtk_widget_style_get (widget,
- "focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
- NULL);
-
- x = widget->allocation.x + border_width;
- y = widget->allocation.y + border_width;
- width = widget->allocation.width - border_width * 2;
- height = widget->allocation.height - border_width * 2;
-
- if (gtk_widget_has_default (widget) &&
- GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
- {
- gtk_paint_box (widget->style, widget->window,
- GTK_STATE_NORMAL, GTK_SHADOW_IN,
- area, widget, "buttondefault",
- x, y, width, height);
-
- x += default_border.left;
- y += default_border.top;
- width -= default_border.left + default_border.right;
- height -= default_border.top + default_border.bottom;
- }
- else if (gtk_widget_get_can_default (widget))
- {
- x += default_outside_border.left;
- y += default_outside_border.top;
- width -= default_outside_border.left + default_outside_border.right;
- height -= default_outside_border.top + default_outside_border.bottom;
- }
-
- if (!interior_focus && gtk_widget_has_focus (widget))
- {
- x += focus_width + focus_pad;
- y += focus_width + focus_pad;
- width -= 2 * (focus_width + focus_pad);
- height -= 2 * (focus_width + focus_pad);
- }
+ x += default_border.left;
+ y += default_border.top;
+ width -= default_border.left + default_border.right;
+ height -= default_border.top + default_border.bottom;
- if (button->relief != GTK_RELIEF_NONE || button->depressed ||
- gtk_widget_get_state(widget) == GTK_STATE_PRELIGHT)
- gtk_paint_box (widget->style, widget->window,
- state_type,
- shadow_type, area, widget, "button",
- x, y, width, height);
-
- if (gtk_widget_has_focus (widget))
- {
- gint child_displacement_x;
- gint child_displacement_y;
- gboolean displace_focus;
-
- gtk_widget_style_get (widget,
- "child-displacement-y", &child_displacement_y,
- "child-displacement-x", &child_displacement_x,
- "displace-focus", &displace_focus,
- NULL);
-
- if (interior_focus)
- {
- x += widget->style->xthickness + focus_pad;
- y += widget->style->ythickness + focus_pad;
- width -= 2 * (widget->style->xthickness + focus_pad);
- height -= 2 * (widget->style->ythickness + focus_pad);
- }
- else
- {
- x -= focus_width + focus_pad;
- y -= focus_width + focus_pad;
- width += 2 * (focus_width + focus_pad);
- height += 2 * (focus_width + focus_pad);
- }
-
- if (button->depressed && displace_focus)
- {
- x += child_displacement_x;
- y += child_displacement_y;
- }
-
- gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
- area, widget, "button",
- x, y, width, height);
- }
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_DEFAULT);
+ }
+ else if (gtk_widget_get_can_default (widget))
+ {
+ x += default_outside_border.left;
+ y += default_outside_border.top;
+ width -= default_outside_border.left + default_outside_border.right;
+ height -= default_outside_border.top + default_outside_border.bottom;
+ }
+
+ if (!interior_focus && gtk_widget_has_focus (widget))
+ {
+ x += focus_width + focus_pad;
+ y += focus_width + focus_pad;
+ width -= 2 * (focus_width + focus_pad);
+ height -= 2 * (focus_width + focus_pad);
+ }
+
+ if (priv->relief != GTK_RELIEF_NONE || priv->depressed ||
+ state & GTK_STATE_FLAG_PRELIGHT)
+ {
+ gtk_render_background (context, cr,
+ x, y, width, height);
+ gtk_render_frame (context, cr,
+ x, y, width, height);
+ }
+
+ if (gtk_widget_has_focus (widget))
+ {
+ gint child_displacement_x;
+ gint child_displacement_y;
+ gboolean displace_focus;
+ GtkBorder *border;
+
+ gtk_style_context_get_style (context,
+ "child-displacement-y", &child_displacement_y,
+ "child-displacement-x", &child_displacement_x,
+ "displace-focus", &displace_focus,
+ NULL);
+
+ gtk_style_context_get (context, state,
+ "border-width", &border,
+ NULL);
+
+ if (interior_focus)
+ {
+ x += border->left + focus_pad;
+ y += border->top + focus_pad;
+ width -= (2 * focus_pad) + border->left + border->right;
+ height -= (2 * focus_pad) + border->top + border->bottom;
+ }
+ else
+ {
+ x -= focus_width + focus_pad;
+ y -= focus_width + focus_pad;
+ width += 2 * (focus_width + focus_pad);
+ height += 2 * (focus_width + focus_pad);
+ }
+
+ if (priv->depressed && displace_focus)
+ {
+ x += child_displacement_x;
+ y += child_displacement_y;
+ }
+
+ gtk_render_focus (context, cr,
+ x, y, width, height);
+
+ gtk_border_free (border);
}
+
+ gtk_style_context_restore (context);
}
static gboolean
-gtk_button_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_button_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- if (gtk_widget_is_drawable (widget))
- {
- GtkButton *button = GTK_BUTTON (widget);
-
- _gtk_button_paint (button, &event->area,
- gtk_widget_get_state (widget),
- button->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
- "button", "buttondefault");
+ GtkButton *button = GTK_BUTTON (widget);
- GTK_WIDGET_CLASS (gtk_button_parent_class)->expose_event (widget, event);
- }
+ _gtk_button_paint (button, cr,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget),
+ gtk_widget_get_state_flags (widget));
+
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->draw (widget, cr);
return FALSE;
}
GdkEventButton *event)
{
GtkButton *button;
+ GtkButtonPrivate *priv;
if (event->type == GDK_BUTTON_PRESS)
{
button = GTK_BUTTON (widget);
+ priv = button->priv;
- if (button->focus_on_click && !gtk_widget_has_focus (widget))
+ if (priv->focus_on_click && !gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
if (event->button == 1)
GdkEventGrabBroken *event)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
gboolean save_in;
/* Simulate a button release without the pointer in the button */
- if (button->button_down)
+ if (priv->button_down)
{
- save_in = button->in_button;
- button->in_button = FALSE;
+ save_in = priv->in_button;
+ priv->in_button = FALSE;
gtk_button_released (button);
- if (save_in != button->in_button)
+ if (save_in != priv->in_button)
{
- button->in_button = save_in;
+ priv->in_button = save_in;
gtk_button_update_state (button);
}
}
GdkEventKey *event)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
- if (button->activate_timeout)
+ if (priv->activate_timeout)
{
gtk_button_finish_activate (button, TRUE);
return TRUE;
gtk_button_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
- GtkButton *button;
- GtkWidget *event_widget;
-
- button = GTK_BUTTON (widget);
- event_widget = gtk_get_event_widget ((GdkEvent*) event);
+ GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
- if ((event_widget == widget) &&
+ if ((event->window == button->priv->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR))
{
- button->in_button = TRUE;
+ priv->in_button = TRUE;
gtk_button_enter (button);
}
gtk_button_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
- GtkButton *button;
- GtkWidget *event_widget;
-
- button = GTK_BUTTON (widget);
- event_widget = gtk_get_event_widget ((GdkEvent*) event);
+ GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
- if ((event_widget == widget) &&
+ if ((event->window == button->priv->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR) &&
- (gtk_widget_get_sensitive (event_widget)))
+ (gtk_widget_get_sensitive (widget)))
{
- button->in_button = FALSE;
+ priv->in_button = FALSE;
gtk_button_leave (button);
}
static void
gtk_real_button_pressed (GtkButton *button)
{
- if (button->activate_timeout)
+ GtkButtonPrivate *priv = button->priv;
+
+ if (priv->activate_timeout)
return;
-
- button->button_down = TRUE;
+
+ priv->button_down = TRUE;
gtk_button_update_state (button);
}
static void
gtk_real_button_released (GtkButton *button)
{
- if (button->button_down)
+ GtkButtonPrivate *priv = button->priv;
+
+ if (priv->button_down)
{
- button->button_down = FALSE;
+ priv->button_down = FALSE;
- if (button->activate_timeout)
+ if (priv->activate_timeout)
return;
-
- if (button->in_button)
+
+ if (priv->in_button)
gtk_button_clicked (button);
gtk_button_update_state (button);
static void
gtk_real_button_clicked (GtkButton *button)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (priv->action)
gtk_action_activate (priv->action);
gtk_real_button_activate (GtkButton *button)
{
GtkWidget *widget = GTK_WIDGET (button);
- GtkButtonPrivate *priv;
+ GtkButtonPrivate *priv = button->priv;
GdkDevice *device;
guint32 time;
- priv = GTK_BUTTON_GET_PRIVATE (button);
device = gtk_get_current_event_device ();
- g_return_if_fail (device && device->source == GDK_SOURCE_KEYBOARD);
+ if (device && gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
+ device = gdk_device_get_associated_device (device);
- if (gtk_widget_get_realized (widget) && !button->activate_timeout)
+ g_return_if_fail (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD);
+
+ if (gtk_widget_get_realized (widget) && !priv->activate_timeout)
{
time = gtk_get_current_event_time ();
- if (gdk_device_grab (device, button->event_window,
+ if (gdk_device_grab (device, priv->event_window,
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_KEY_PRESS | GDK_KEY_RELEASE,
NULL, time) == GDK_GRAB_SUCCESS)
priv->grab_time = time;
}
- button->activate_timeout = gdk_threads_add_timeout (ACTIVATE_TIMEOUT,
+ priv->activate_timeout = gdk_threads_add_timeout (ACTIVATE_TIMEOUT,
button_activate_timeout,
button);
- button->button_down = TRUE;
+ priv->button_down = TRUE;
gtk_button_update_state (button);
gtk_widget_queue_draw (GTK_WIDGET (button));
}
gboolean do_it)
{
GtkWidget *widget = GTK_WIDGET (button);
- GtkButtonPrivate *priv;
-
- priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
- g_source_remove (button->activate_timeout);
- button->activate_timeout = 0;
+ g_source_remove (priv->activate_timeout);
+ priv->activate_timeout = 0;
if (priv->grab_keyboard)
{
priv->grab_keyboard = NULL;
}
- button->button_down = FALSE;
+ priv->button_down = FALSE;
gtk_button_update_state (button);
gtk_widget_queue_draw (GTK_WIDGET (button));
static void
-gtk_button_size_request_init (GtkSizeRequestIface *iface)
-{
- iface->get_width = gtk_button_get_width;
- iface->get_height = gtk_button_get_height;
-}
-
-static void
-gtk_button_get_size (GtkSizeRequest *widget,
+gtk_button_get_size (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
gint *natural_size)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkStyleContext *context;
+ GtkStateFlags state;
GtkWidget *child;
GtkBorder default_border;
GtkBorder inner_border;
+ GtkBorder *border;
gint focus_width;
gint focus_pad;
gint minimum, natural;
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
+
gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL);
- gtk_widget_style_get (GTK_WIDGET (widget),
- "focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
- NULL);
+ gtk_style_context_get_style (context,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ gtk_style_context_get (context, state,
+ "border-width", &border,
+ NULL);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- minimum = ((GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->xthickness) * 2 +
+ minimum = (border->left + border->right +
inner_border.left + inner_border.right);
-
+
if (gtk_widget_get_can_default (GTK_WIDGET (widget)))
minimum += default_border.left + default_border.right;
}
else
{
- minimum = ((GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->ythickness) * 2 +
+ minimum = (border->top + border->bottom +
inner_border.top + inner_border.bottom);
if (gtk_widget_get_can_default (GTK_WIDGET (widget)))
gint child_min, child_nat;
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_width (GTK_SIZE_REQUEST (child),
- &child_min, &child_nat);
+ gtk_widget_get_preferred_width (child, &child_min, &child_nat);
else
- gtk_size_request_get_height (GTK_SIZE_REQUEST (child),
- &child_min, &child_nat);
+ gtk_widget_get_preferred_height (child, &child_min, &child_nat);
minimum += child_min;
natural += child_nat;
if (natural_size)
*natural_size = natural;
+
+ gtk_border_free (border);
}
static void
-gtk_button_get_width (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_button_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
gtk_button_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
static void
-gtk_button_get_height (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_button_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
gtk_button_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
gtk_button_set_label (GtkButton *button,
const gchar *label)
{
+ GtkButtonPrivate *priv;
gchar *new_label;
-
+
g_return_if_fail (GTK_IS_BUTTON (button));
+ priv = button->priv;
+
new_label = g_strdup (label);
- g_free (button->label_text);
- button->label_text = new_label;
-
+ g_free (priv->label_text);
+ priv->label_text = new_label;
+
gtk_button_construct_child (button);
g_object_notify (G_OBJECT (button), "label");
gtk_button_get_label (GtkButton *button)
{
g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
-
- return button->label_text;
+
+ return button->priv->label_text;
}
/**
gtk_button_set_use_underline (GtkButton *button,
gboolean use_underline)
{
+ GtkButtonPrivate *priv;
+
g_return_if_fail (GTK_IS_BUTTON (button));
+ priv = button->priv;
+
use_underline = use_underline != FALSE;
- if (use_underline != button->use_underline)
+ if (use_underline != priv->use_underline)
{
- button->use_underline = use_underline;
-
+ priv->use_underline = use_underline;
+
gtk_button_construct_child (button);
g_object_notify (G_OBJECT (button), "use-underline");
gtk_button_get_use_underline (GtkButton *button)
{
g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
-
- return button->use_underline;
+
+ return button->priv->use_underline;
}
/**
gtk_button_set_use_stock (GtkButton *button,
gboolean use_stock)
{
+ GtkButtonPrivate *priv;
+
g_return_if_fail (GTK_IS_BUTTON (button));
+ priv = button->priv;
+
use_stock = use_stock != FALSE;
- if (use_stock != button->use_stock)
+ if (use_stock != priv->use_stock)
{
- button->use_stock = use_stock;
-
+ priv->use_stock = use_stock;
+
gtk_button_construct_child (button);
g_object_notify (G_OBJECT (button), "use-stock");
gtk_button_get_use_stock (GtkButton *button)
{
g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
-
- return button->use_stock;
+
+ return button->priv->use_stock;
}
/**
gtk_button_set_focus_on_click (GtkButton *button,
gboolean focus_on_click)
{
+ GtkButtonPrivate *priv;
+
g_return_if_fail (GTK_IS_BUTTON (button));
-
+
+ priv = button->priv;
+
focus_on_click = focus_on_click != FALSE;
- if (button->focus_on_click != focus_on_click)
+ if (priv->focus_on_click != focus_on_click)
{
- button->focus_on_click = focus_on_click;
+ priv->focus_on_click = focus_on_click;
g_object_notify (G_OBJECT (button), "focus-on-click");
}
{
g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
- return button->focus_on_click;
+ return button->priv->focus_on_click;
}
/**
* 1.0 is bottom aligned
*
* Sets the alignment of the child. This property has no effect unless
- * the child is a #GtkMisc or a #GtkAligment.
+ * the child is a #GtkMisc or a #GtkAlignment.
*
* Since: 2.4
*/
g_return_if_fail (GTK_IS_BUTTON (button));
- priv = GTK_BUTTON_GET_PRIVATE (button);
+ priv = button->priv;
priv->xalign = xalign;
priv->yalign = yalign;
priv->align_set = 1;
- maybe_set_alignment (button, GTK_BIN (button)->child);
+ maybe_set_alignment (button, gtk_bin_get_child (GTK_BIN (button)));
g_object_freeze_notify (G_OBJECT (button));
g_object_notify (G_OBJECT (button), "xalign");
g_return_if_fail (GTK_IS_BUTTON (button));
- priv = GTK_BUTTON_GET_PRIVATE (button);
+ priv = button->priv;
if (xalign)
*xalign = priv->xalign;
gboolean depressed)
{
GtkWidget *widget = GTK_WIDGET (button);
+ GtkButtonPrivate *priv = button->priv;
depressed = depressed != FALSE;
- if (depressed != button->depressed)
+ if (depressed != priv->depressed)
{
- button->depressed = depressed;
+ priv->depressed = depressed;
gtk_widget_queue_resize (widget);
}
}
static void
gtk_button_update_state (GtkButton *button)
{
+ GtkButtonPrivate *priv = button->priv;
+ GtkStateFlags new_state = 0;
gboolean depressed;
- GtkStateType new_state;
- if (button->activate_timeout)
- depressed = button->depress_on_activate;
+ if (priv->activate_timeout)
+ depressed = priv->depress_on_activate;
else
- depressed = button->in_button && button->button_down;
+ depressed = priv->in_button && priv->button_down;
- if (button->in_button && (!button->button_down || !depressed))
- new_state = GTK_STATE_PRELIGHT;
- else
- new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL;
+ if (priv->in_button)
+ new_state |= GTK_STATE_FLAG_PRELIGHT;
+
+ if (priv->button_down || depressed)
+ new_state |= GTK_STATE_FLAG_ACTIVE;
- _gtk_button_set_depressed (button, depressed);
- gtk_widget_set_state (GTK_WIDGET (button), new_state);
+ _gtk_button_set_depressed (button, depressed);
+ gtk_widget_set_state_flags (GTK_WIDGET (button), new_state, TRUE);
}
static void
show_image_change_notify (GtkButton *button)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
if (priv->image)
{
GdkScreen *previous_screen)
{
GtkButton *button;
+ GtkButtonPrivate *priv;
GtkSettings *settings;
- guint show_image_connection;
+ gulong show_image_connection;
if (!gtk_widget_has_screen (widget))
return;
button = GTK_BUTTON (widget);
+ priv = button->priv;
/* If the button is being pressed while the screen changes the
release might never occur, so we reset the state. */
- if (button->button_down)
+ if (priv->button_down)
{
- button->button_down = FALSE;
+ priv->button_down = FALSE;
gtk_button_update_state (button);
}
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);
}
GtkStateType previous_state)
{
GtkButton *button = GTK_BUTTON (widget);
+ GtkButtonPrivate *priv = button->priv;
if (!gtk_widget_is_sensitive (widget))
{
- button->in_button = FALSE;
+ priv->in_button = FALSE;
gtk_real_button_released (button);
}
}
gboolean was_grabbed)
{
GtkButton *button = GTK_BUTTON (widget);
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkButtonPrivate *priv = button->priv;
gboolean save_in;
- if (button->activate_timeout &&
+ if (priv->activate_timeout &&
priv->grab_keyboard &&
gtk_widget_device_is_shadowed (widget, priv->grab_keyboard))
gtk_button_finish_activate (button, FALSE);
if (!was_grabbed)
{
- save_in = button->in_button;
- button->in_button = FALSE;
+ save_in = priv->in_button;
+ priv->in_button = FALSE;
gtk_real_button_released (button);
- if (save_in != button->in_button)
+ if (save_in != priv->in_button)
{
- button->in_button = save_in;
+ priv->in_button = save_in;
gtk_button_update_state (button);
}
}
GtkWidget *image)
{
GtkButtonPrivate *priv;
+ GtkWidget *parent;
g_return_if_fail (GTK_IS_BUTTON (button));
g_return_if_fail (image == NULL || GTK_IS_WIDGET (image));
- priv = GTK_BUTTON_GET_PRIVATE (button);
+ priv = button->priv;
- if (priv->image && priv->image->parent)
- gtk_container_remove (GTK_CONTAINER (priv->image->parent), priv->image);
+ if (priv->image)
+ {
+ parent = gtk_widget_get_parent (priv->image);
+ if (parent)
+ gtk_container_remove (GTK_CONTAINER (parent), priv->image);
+ }
priv->image = image;
priv->image_is_stock = (image == NULL);
* This may have been explicitly set by gtk_button_set_image()
* or constructed by gtk_button_new_from_stock().
*
- * Return value: a #GtkWidget or %NULL in case there is no image
+ * Return value: (transfer none): a #GtkWidget or %NULL in case there is no image
*
* Since: 2.6
*/
GtkWidget *
gtk_button_get_image (GtkButton *button)
{
- GtkButtonPrivate *priv;
-
g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
-
- priv = GTK_BUTTON_GET_PRIVATE (button);
- return priv->image;
+ return button->priv->image;
}
/**
gtk_button_set_image_position (GtkButton *button,
GtkPositionType position)
{
-
GtkButtonPrivate *priv;
g_return_if_fail (GTK_IS_BUTTON (button));
g_return_if_fail (position >= GTK_POS_LEFT && position <= GTK_POS_BOTTOM);
- priv = GTK_BUTTON_GET_PRIVATE (button);
+ priv = button->priv;
if (priv->image_position != position)
{
GtkPositionType
gtk_button_get_image_position (GtkButton *button)
{
- GtkButtonPrivate *priv;
-
g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_POS_LEFT);
-
- priv = GTK_BUTTON_GET_PRIVATE (button);
- return priv->image_position;
+ return button->priv->image_position;
}
{
g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
- return button->event_window;
+ return button->priv->event_window;
}
-
-#define __GTK_BUTTON_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff