* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "gtksettings.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include "gtkalias.h"
#define MIN_SPIN_BUTTON_WIDTH 30
#define MAX_TIMER_CALLS 5
#define MAX_DIGITS 20
#define MIN_ARROW_WIDTH 6
+
+struct _GtkSpinButtonPriv
+{
+ GtkSpinButtonUpdatePolicy update_policy;
+ GtkAdjustment *adjustment;
+
+ GdkWindow *panel;
+
+ guint32 timer;
+
+ gdouble climb_rate;
+ gdouble timer_step;
+
+ guint button : 2;
+ guint click_child : 2; /* valid: GTK_ARROW_UP=0, GTK_ARROW_DOWN=1 or 2=NONE/BOTH */
+ guint digits : 10;
+ guint in_child : 2;
+ guint need_timer : 1;
+ guint numeric : 1;
+ guint snap_to_ticks : 1;
+ guint timer_calls : 3;
+ guint wrap : 1;
+};
+
enum {
PROP_0,
PROP_ADJUSTMENT,
gboolean was_grabbed);
static void gtk_spin_button_state_changed (GtkWidget *widget,
GtkStateType previous_state);
+static void gtk_spin_button_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
static void gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
+ GdkRectangle *area,
GtkArrowType arrow_type);
static gboolean gtk_spin_button_timer (GtkSpinButton *spin_button);
static void gtk_spin_button_stop_spinning (GtkSpinButton *spin);
static gint gtk_spin_button_scroll (GtkWidget *widget,
GdkEventScroll *event);
static void gtk_spin_button_activate (GtkEntry *entry);
+static void gtk_spin_button_get_text_area_size (GtkEntry *entry,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height);
static void gtk_spin_button_snap (GtkSpinButton *spin_button,
gdouble val);
static void gtk_spin_button_insert_text (GtkEditable *editable,
static gint spin_button_get_arrow_size (GtkSpinButton *spin_button);
static gint spin_button_get_shadow_type (GtkSpinButton *spin_button);
-static void spin_button_redraw (GtkSpinButton *spin_button);
-
static guint spinbutton_signals[LAST_SIGNAL] = {0};
gtk_spin_button_class_init (GtkSpinButtonClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkEntryClass *entry_class;
+ GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
GtkBindingSet *binding_set;
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- entry_class = (GtkEntryClass*) class;
-
gobject_class->finalize = gtk_spin_button_finalize;
gobject_class->set_property = gtk_spin_button_set_property;
widget_class->focus_out_event = gtk_spin_button_focus_out;
widget_class->grab_notify = gtk_spin_button_grab_notify;
widget_class->state_changed = gtk_spin_button_state_changed;
+ widget_class->style_set = gtk_spin_button_style_set;
entry_class->activate = gtk_spin_button_activate;
+ entry_class->get_text_area_size = gtk_spin_button_get_text_area_size;
class->input = NULL;
class->output = NULL;
G_TYPE_INT, 1,
G_TYPE_POINTER);
+ /**
+ * GtkSpinButton::output:
+ * @spin_button: the object which received the signal
+ *
+ * The ::output signal can be used to change to formatting
+ * of the value that is displayed in the spin buttons entry.
+ * |[
+ * /* show leading zeros */
+ * static gboolean
+ * on_output (GtkSpinButton *spin,
+ * gpointer data)
+ * {
+ * GtkAdjustment *adj;
+ * gchar *text;
+ * int value;
+ *
+ * adj = gtk_spin_button_get_adjustment (spin);
+ * value = (int)gtk_adjustment_get_value (adj);
+ * text = g_strdup_printf ("%02d", value);
+ * gtk_entry_set_text (GTK_ENTRY (spin), text);
+ * g_free (text);
+ *
+ * return TRUE;
+ * }
+ * ]|
+ *
+ * Returns: %TRUE if the value has been displayed.
+ */
spinbutton_signals[OUTPUT] =
g_signal_new (I_("output"),
G_TYPE_FROM_CLASS (gobject_class),
G_TYPE_BOOLEAN, 0);
spinbutton_signals[VALUE_CHANGED] =
- g_signal_new (I_("value_changed"),
+ g_signal_new (I_("value-changed"),
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSpinButtonClass, value_changed),
/* Action signals */
spinbutton_signals[CHANGE_VALUE] =
- g_signal_new (I_("change_value"),
+ g_signal_new (I_("change-value"),
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSpinButtonClass, change_value),
add_spin_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
add_spin_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
add_spin_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
+
+ g_type_class_add_private (class, sizeof (GtkSpinButtonPriv));
}
static void
const GValue *value,
GParamSpec *pspec)
{
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
+ GtkSpinButtonPriv *priv = spin_button->priv;
- spin_button = GTK_SPIN_BUTTON (object);
-
switch (prop_id)
{
GtkAdjustment *adjustment;
break;
case PROP_CLIMB_RATE:
gtk_spin_button_configure (spin_button,
- spin_button->adjustment,
+ priv->adjustment,
g_value_get_double (value),
- spin_button->digits);
+ priv->digits);
break;
case PROP_DIGITS:
gtk_spin_button_configure (spin_button,
- spin_button->adjustment,
- spin_button->climb_rate,
+ priv->adjustment,
+ priv->climb_rate,
g_value_get_uint (value));
break;
case PROP_SNAP_TO_TICKS:
gtk_spin_button_set_value (spin_button, g_value_get_double (value));
break;
default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
GValue *value,
GParamSpec *pspec)
{
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
+ GtkSpinButtonPriv *priv = spin_button->priv;
- spin_button = GTK_SPIN_BUTTON (object);
-
switch (prop_id)
{
case PROP_ADJUSTMENT:
- g_value_set_object (value, spin_button->adjustment);
+ g_value_set_object (value, priv->adjustment);
break;
case PROP_CLIMB_RATE:
- g_value_set_double (value, spin_button->climb_rate);
+ g_value_set_double (value, priv->climb_rate);
break;
case PROP_DIGITS:
- g_value_set_uint (value, spin_button->digits);
+ g_value_set_uint (value, priv->digits);
break;
case PROP_SNAP_TO_TICKS:
- g_value_set_boolean (value, spin_button->snap_to_ticks);
+ g_value_set_boolean (value, priv->snap_to_ticks);
break;
case PROP_NUMERIC:
- g_value_set_boolean (value, spin_button->numeric);
+ g_value_set_boolean (value, priv->numeric);
break;
case PROP_WRAP:
- g_value_set_boolean (value, spin_button->wrap);
+ g_value_set_boolean (value, priv->wrap);
break;
case PROP_UPDATE_POLICY:
- g_value_set_enum (value, spin_button->update_policy);
+ g_value_set_enum (value, priv->update_policy);
break;
case PROP_VALUE:
- g_value_set_double (value, spin_button->adjustment->value);
+ g_value_set_double (value, priv->adjustment->value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
static void
gtk_spin_button_init (GtkSpinButton *spin_button)
{
- spin_button->adjustment = NULL;
- spin_button->panel = NULL;
- spin_button->timer = 0;
- spin_button->climb_rate = 0.0;
- spin_button->timer_step = 0.0;
- spin_button->update_policy = GTK_UPDATE_ALWAYS;
- spin_button->in_child = NO_ARROW;
- spin_button->click_child = NO_ARROW;
- spin_button->button = 0;
- spin_button->need_timer = FALSE;
- spin_button->timer_calls = 0;
- spin_button->digits = 0;
- spin_button->numeric = FALSE;
- spin_button->wrap = FALSE;
- spin_button->snap_to_ticks = FALSE;
+ GtkSpinButtonPriv *priv;
+
+ spin_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (spin_button,
+ GTK_TYPE_SPIN_BUTTON,
+ GtkSpinButtonPriv);
+ priv = spin_button->priv;
+
+ priv->adjustment = NULL;
+ priv->panel = NULL;
+ priv->timer = 0;
+ priv->climb_rate = 0.0;
+ priv->timer_step = 0.0;
+ priv->update_policy = GTK_UPDATE_ALWAYS;
+ priv->in_child = NO_ARROW;
+ priv->click_child = NO_ARROW;
+ priv->button = 0;
+ priv->need_timer = FALSE;
+ priv->timer_calls = 0;
+ priv->digits = 0;
+ priv->numeric = FALSE;
+ priv->wrap = FALSE;
+ priv->snap_to_ticks = FALSE;
gtk_spin_button_set_adjustment (spin_button,
(GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0));
static void
gtk_spin_button_map (GtkWidget *widget)
{
- if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin_button->priv;
+
+ if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
{
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->map (widget);
- gdk_window_show (GTK_SPIN_BUTTON (widget)->panel);
+ gdk_window_show (priv->panel);
}
}
static void
gtk_spin_button_unmap (GtkWidget *widget)
{
- if (GTK_WIDGET_MAPPED (widget))
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin_button->priv;
+
+ if (gtk_widget_get_mapped (widget))
{
gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (widget));
- gdk_window_hide (GTK_SPIN_BUTTON (widget)->panel);
+ gdk_window_hide (priv->panel);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->unmap (widget);
}
}
static void
gtk_spin_button_realize (GtkWidget *widget)
{
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin_button->priv;
GdkWindowAttr attributes;
gint attributes_mask;
- guint real_width;
gboolean return_val;
gint arrow_size;
- spin_button = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin_button);
- real_width = widget->allocation.width;
- widget->allocation.width -= arrow_size + 2 * widget->style->xthickness;
gtk_widget_set_events (widget, gtk_widget_get_events (widget) |
GDK_KEY_RELEASE_MASK);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->realize (widget);
- widget->allocation.width = real_width;
-
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- attributes.x = (widget->allocation.x +
- widget->allocation.width - arrow_size -
+ attributes.x = (widget->allocation.width - arrow_size -
2 * widget->style->xthickness);
- attributes.y = widget->allocation.y + (widget->allocation.height -
+ attributes.y = (widget->allocation.height -
widget->requisition.height) / 2;
attributes.width = arrow_size + 2 * widget->style->xthickness;
attributes.height = widget->requisition.height;
-
- spin_button->panel = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
- gdk_window_set_user_data (spin_button->panel, widget);
- gtk_style_set_background (widget->style, spin_button->panel, GTK_STATE_NORMAL);
+ priv->panel = gdk_window_new (widget->window,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (priv->panel, widget);
+
+ gtk_style_set_background (widget->style, priv->panel, GTK_STATE_NORMAL);
return_val = FALSE;
g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
gtk_spin_button_unrealize (GtkWidget *widget)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->unrealize (widget);
- if (spin->panel)
+ if (priv->panel)
{
- gdk_window_set_user_data (spin->panel, NULL);
- gdk_window_destroy (spin->panel);
- spin->panel = NULL;
+ gdk_window_set_user_data (priv->panel, NULL);
+ gdk_window_destroy (priv->panel);
+ priv->panel = NULL;
}
}
gtk_spin_button_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkEntry *entry;
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin_button->priv;
+ GtkEntry *entry = GTK_ENTRY (widget);
gint arrow_size;
- entry = GTK_ENTRY (widget);
- spin_button = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin_button);
-
+
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_request (widget, requisition);
if (entry->width_chars < 0)
/* Get max of MIN_SPIN_BUTTON_WIDTH, size of upper, size of lower */
width = MIN_SPIN_BUTTON_WIDTH;
- max_string_len = MAX (10, compute_double_length (1e9 * spin_button->adjustment->step_increment,
- spin_button->digits));
+ max_string_len = MAX (10, compute_double_length (1e9 * priv->adjustment->step_increment,
+ priv->digits));
- string_len = compute_double_length (spin_button->adjustment->upper,
- spin_button->digits);
+ string_len = compute_double_length (priv->adjustment->upper,
+ priv->digits);
w = PANGO_PIXELS (MIN (string_len, max_string_len) * digit_width);
width = MAX (width, w);
- string_len = compute_double_length (spin_button->adjustment->lower,
- spin_button->digits);
+ string_len = compute_double_length (priv->adjustment->lower,
+ priv->digits);
w = PANGO_PIXELS (MIN (string_len, max_string_len) * digit_width);
width = MAX (width, w);
gtk_spin_button_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkSpinButton *spin;
- GtkAllocation entry_allocation;
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
GtkAllocation panel_allocation;
gint arrow_size;
gint panel_width;
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
- g_return_if_fail (allocation != NULL);
-
- spin = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin);
panel_width = arrow_size + 2 * widget->style->xthickness;
widget->allocation = *allocation;
- entry_allocation = *allocation;
- entry_allocation.width -= panel_width;
-
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- {
- entry_allocation.x += panel_width;
- panel_allocation.x = allocation->x;
- }
+ panel_allocation.x = 0;
else
- {
- panel_allocation.x = allocation->x + allocation->width - panel_width;
- }
+ panel_allocation.x = allocation->width - panel_width;
panel_allocation.width = panel_width;
panel_allocation.height = MIN (widget->requisition.height, allocation->height);
- panel_allocation.y = allocation->y + (allocation->height -
- panel_allocation.height) / 2;
+ panel_allocation.y = 0;
- GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_allocate (widget, &entry_allocation);
+ GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_allocate (widget, allocation);
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
- gdk_window_move_resize (GTK_SPIN_BUTTON (widget)->panel,
+ gdk_window_move_resize (priv->panel,
panel_allocation.x,
panel_allocation.y,
panel_allocation.width,
panel_allocation.height);
}
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
static gint
gtk_spin_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
- GtkShadowType shadow_type;
- GdkRectangle rect;
-
- if (event->window != spin->panel)
- GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->expose_event (widget, event);
-
- /* we redraw the panel even if it wasn't exposed. This is
- * because spin->panel is not a child window of widget->window,
- * so it will not be invalidated by eg. gtk_widget_queue_draw().
- */
- rect.x = 0;
- rect.y = 0;
+ if (event->window == priv->panel)
+ {
+ GtkShadowType shadow_type;
- gdk_drawable_get_size (spin->panel, &rect.width, &rect.height);
+ shadow_type = spin_button_get_shadow_type (spin);
- shadow_type = spin_button_get_shadow_type (spin);
-
- gdk_window_begin_paint_rect (spin->panel, &rect);
+ if (shadow_type != GTK_SHADOW_NONE)
+ {
+ gint width, height;
+ gboolean state_hint;
+ GtkStateType state;
+
+ gtk_widget_style_get (widget, "state-hint", &state_hint, NULL);
+ if (state_hint)
+ state = gtk_widget_has_focus (widget) ?
+ GTK_STATE_ACTIVE : gtk_widget_get_state (widget);
+ else
+ state = GTK_STATE_NORMAL;
+
+ gdk_drawable_get_size (priv->panel, &width, &height);
+
+ gtk_paint_box (widget->style, priv->panel,
+ state, shadow_type,
+ &event->area, widget, "spinbutton",
+ 0, 0, width, height);
+ }
- if (shadow_type != GTK_SHADOW_NONE)
- {
- gtk_paint_box (widget->style, spin->panel,
- GTK_STATE_NORMAL, shadow_type,
- NULL, widget, "spinbutton",
- rect.x, rect.y, rect.width, rect.height);
+ gtk_spin_button_draw_arrow (spin, &event->area, GTK_ARROW_UP);
+ gtk_spin_button_draw_arrow (spin, &event->area, GTK_ARROW_DOWN);
}
-
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
-
- gdk_window_end_paint (spin->panel);
+ else
+ GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->expose_event (widget, event);
}
return FALSE;
spin_button_at_limit (GtkSpinButton *spin_button,
GtkArrowType arrow)
{
+ GtkSpinButtonPriv *priv = spin_button->priv;
GtkArrowType effective_arrow;
- if (spin_button->wrap)
+ if (priv->wrap)
return FALSE;
- if (spin_button->adjustment->step_increment > 0)
+ if (priv->adjustment->step_increment > 0)
effective_arrow = arrow;
else
effective_arrow = arrow == GTK_ARROW_UP ? GTK_ARROW_DOWN : GTK_ARROW_UP;
if (effective_arrow == GTK_ARROW_UP &&
- (spin_button->adjustment->upper - spin_button->adjustment->value <= EPSILON))
+ (priv->adjustment->upper - priv->adjustment->value <= EPSILON))
return TRUE;
if (effective_arrow == GTK_ARROW_DOWN &&
- (spin_button->adjustment->value - spin_button->adjustment->lower <= EPSILON))
+ (priv->adjustment->value - priv->adjustment->lower <= EPSILON))
return TRUE;
return FALSE;
static void
gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
+ GdkRectangle *area,
GtkArrowType arrow_type)
{
+ GtkSpinButtonPriv *priv;
GtkStateType state_type;
GtkShadowType shadow_type;
GtkWidget *widget;
gint width;
gint h, w;
- g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
g_return_if_fail (arrow_type == GTK_ARROW_UP || arrow_type == GTK_ARROW_DOWN);
-
+
+ priv = spin_button->priv;
widget = GTK_WIDGET (spin_button);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
}
else
{
- if (spin_button->click_child == arrow_type)
+ if (priv->click_child == arrow_type)
{
state_type = GTK_STATE_ACTIVE;
shadow_type = GTK_SHADOW_IN;
}
else
{
- if (spin_button->in_child == arrow_type &&
- spin_button->click_child == NO_ARROW)
+ if (priv->in_child == arrow_type &&
+ priv->click_child == NO_ARROW)
{
state_type = GTK_STATE_PRELIGHT;
}
else
{
- state_type = GTK_WIDGET_STATE (widget);
+ state_type = gtk_widget_get_state (widget);
}
shadow_type = GTK_SHADOW_OUT;
}
}
- gtk_paint_box (widget->style, spin_button->panel,
+ gtk_paint_box (widget->style, priv->panel,
state_type, shadow_type,
- NULL, widget,
+ area, widget,
(arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
x, y, width, height);
height = h;
width = w;
- gtk_paint_arrow (widget->style, spin_button->panel,
+ gtk_paint_arrow (widget->style, priv->panel,
state_type, shadow_type,
- NULL, widget, "spinbutton",
+ area, widget, "spinbutton",
arrow_type, TRUE,
x, y, width, height);
}
GdkEventCrossing *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
- if (event->window == spin->panel)
+ if (event->window == priv->panel)
{
+ GdkDevice *device;
gint x;
gint y;
- gdk_window_get_pointer (spin->panel, &x, &y, NULL);
+ device = gdk_event_get_device ((GdkEvent *) event);
+ gdk_window_get_device_position (priv->panel, device, &x, &y, NULL);
if (y <= widget->requisition.height / 2)
- spin->in_child = GTK_ARROW_UP;
+ priv->in_child = GTK_ARROW_UP;
else
- spin->in_child = GTK_ARROW_DOWN;
+ priv->in_child = GTK_ARROW_DOWN;
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
-
+
+ if (GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->enter_notify_event)
+ return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->enter_notify_event (widget, event);
+
return FALSE;
}
GdkEventCrossing *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
+
+ priv->in_child = NO_ARROW;
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
+
+ if (GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->leave_notify_event)
+ return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->leave_notify_event (widget, event);
- spin->in_child = NO_ARROW;
- spin_button_redraw (spin);
-
return FALSE;
}
if (!was_grabbed)
{
gtk_spin_button_stop_spinning (spin);
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
}
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
- if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ if (!gtk_widget_is_sensitive (widget))
{
gtk_spin_button_stop_spinning (spin);
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
}
+static void
+gtk_spin_button_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
+{
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
+
+ if (previous_style && gtk_widget_get_realized (widget))
+ gtk_style_set_background (widget->style, priv->panel, GTK_STATE_NORMAL);
+
+ GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->style_set (widget, previous_style);
+}
+
+
static gint
gtk_spin_button_scroll (GtkWidget *widget,
GdkEventScroll *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
if (event->direction == GDK_SCROLL_UP)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
- gtk_spin_button_real_spin (spin, spin->adjustment->step_increment);
+ gtk_spin_button_real_spin (spin, priv->adjustment->step_increment);
}
else if (event->direction == GDK_SCROLL_DOWN)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
- gtk_spin_button_real_spin (spin, -spin->adjustment->step_increment);
+ gtk_spin_button_real_spin (spin, -priv->adjustment->step_increment);
}
else
return FALSE;
static void
gtk_spin_button_stop_spinning (GtkSpinButton *spin)
{
- if (spin->timer)
+ GtkSpinButtonPriv *priv = spin->priv;
+
+ if (priv->timer)
{
- g_source_remove (spin->timer);
- spin->timer = 0;
- spin->timer_calls = 0;
- spin->need_timer = FALSE;
+ g_source_remove (priv->timer);
+ priv->timer = 0;
+ priv->timer_calls = 0;
+ priv->need_timer = FALSE;
}
- spin->button = 0;
- spin->timer = 0;
- spin->timer_step = spin->adjustment->step_increment;
- spin->timer_calls = 0;
+ priv->button = 0;
+ priv->timer = 0;
+ priv->timer_step = priv->adjustment->step_increment;
+ priv->timer_calls = 0;
- spin->click_child = NO_ARROW;
- spin->button = 0;
+ priv->click_child = NO_ARROW;
+ priv->button = 0;
}
static void
GtkArrowType click_child,
gdouble step)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (click_child == GTK_ARROW_UP || click_child == GTK_ARROW_DOWN);
-
- spin->click_child = click_child;
-
- if (!spin->timer)
+
+ priv = spin->priv;
+
+ priv->click_child = click_child;
+
+ if (!priv->timer)
{
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (spin));
guint timeout;
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
- spin->timer_step = step;
- spin->need_timer = TRUE;
- spin->timer = gdk_threads_add_timeout (timeout,
+ priv->timer_step = step;
+ priv->need_timer = TRUE;
+ priv->timer = gdk_threads_add_timeout (timeout,
(GSourceFunc) gtk_spin_button_timer,
(gpointer) spin);
}
gtk_spin_button_real_spin (spin, click_child == GTK_ARROW_UP ? step : -step);
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
static gint
GdkEventButton *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
- if (!spin->button)
+ if (!priv->button)
{
- if (event->window == spin->panel)
+ if (event->window == priv->panel)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
- spin->button = event->button;
+ priv->button = event->button;
if (GTK_ENTRY (widget)->editable)
gtk_spin_button_update (spin);
if (event->y <= widget->requisition.height / 2)
{
if (event->button == 1)
- start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
+ start_spinning (spin, GTK_ARROW_UP, priv->adjustment->step_increment);
else if (event->button == 2)
- start_spinning (spin, GTK_ARROW_UP, spin->adjustment->page_increment);
+ start_spinning (spin, GTK_ARROW_UP, priv->adjustment->page_increment);
else
- spin->click_child = GTK_ARROW_UP;
+ priv->click_child = GTK_ARROW_UP;
}
else
{
if (event->button == 1)
- start_spinning (spin, GTK_ARROW_DOWN, spin->adjustment->step_increment);
+ start_spinning (spin, GTK_ARROW_DOWN, priv->adjustment->step_increment);
else if (event->button == 2)
- start_spinning (spin, GTK_ARROW_DOWN, spin->adjustment->page_increment);
+ start_spinning (spin, GTK_ARROW_DOWN, priv->adjustment->page_increment);
else
- spin->click_child = GTK_ARROW_DOWN;
+ priv->click_child = GTK_ARROW_DOWN;
}
return TRUE;
}
GdkEventButton *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
gint arrow_size;
arrow_size = spin_button_get_arrow_size (spin);
- if (event->button == spin->button)
+ if (event->button == priv->button)
{
- int click_child = spin->click_child;
+ int click_child = priv->click_child;
gtk_spin_button_stop_spinning (spin);
{
gdouble diff;
- diff = spin->adjustment->upper - spin->adjustment->value;
+ diff = priv->adjustment->upper - priv->adjustment->value;
if (diff > EPSILON)
gtk_spin_button_real_spin (spin, diff);
}
{
gdouble diff;
- diff = spin->adjustment->value - spin->adjustment->lower;
+ diff = priv->adjustment->value - priv->adjustment->lower;
if (diff > EPSILON)
gtk_spin_button_real_spin (spin, -diff);
}
}
}
- spin_button_redraw (spin);
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
return TRUE;
}
GdkEventMotion *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
- if (spin->button)
+ if (priv->button)
return FALSE;
- if (event->window == spin->panel)
+ if (event->window == priv->panel)
{
- gint y;
-
- gdk_window_get_pointer (spin->panel, NULL, &y, NULL);
+ gint y = event->y;
+
+ gdk_event_request_motions (event);
if (y <= widget->requisition.height / 2 &&
- spin->in_child == GTK_ARROW_DOWN)
+ priv->in_child == GTK_ARROW_DOWN)
{
- spin->in_child = GTK_ARROW_UP;
- spin_button_redraw (spin);
+ priv->in_child = GTK_ARROW_UP;
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
else if (y > widget->requisition.height / 2 &&
- spin->in_child == GTK_ARROW_UP)
+ priv->in_child == GTK_ARROW_UP)
{
- spin->in_child = GTK_ARROW_DOWN;
- spin_button_redraw (spin);
+ priv->in_child = GTK_ARROW_DOWN;
+ gtk_widget_queue_draw (GTK_WIDGET (spin));
}
return FALSE;
static gint
gtk_spin_button_timer (GtkSpinButton *spin_button)
{
+ GtkSpinButtonPriv *priv = spin_button->priv;
gboolean retval = FALSE;
-
- if (spin_button->timer)
+
+ if (priv->timer)
{
- if (spin_button->click_child == GTK_ARROW_UP)
- gtk_spin_button_real_spin (spin_button, spin_button->timer_step);
+ if (priv->click_child == GTK_ARROW_UP)
+ gtk_spin_button_real_spin (spin_button, priv->timer_step);
else
- gtk_spin_button_real_spin (spin_button, -spin_button->timer_step);
+ gtk_spin_button_real_spin (spin_button, -priv->timer_step);
- if (spin_button->need_timer)
+ if (priv->need_timer)
{
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (spin_button));
guint timeout;
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
- spin_button->need_timer = FALSE;
- spin_button->timer = gdk_threads_add_timeout (timeout,
+ priv->need_timer = FALSE;
+ priv->timer = gdk_threads_add_timeout (timeout,
(GSourceFunc) gtk_spin_button_timer,
(gpointer) spin_button);
}
else
{
- if (spin_button->climb_rate > 0.0 && spin_button->timer_step
- < spin_button->adjustment->page_increment)
+ if (priv->climb_rate > 0.0 && priv->timer_step
+ < priv->adjustment->page_increment)
{
- if (spin_button->timer_calls < MAX_TIMER_CALLS)
- spin_button->timer_calls++;
+ if (priv->timer_calls < MAX_TIMER_CALLS)
+ priv->timer_calls++;
else
{
- spin_button->timer_calls = 0;
- spin_button->timer_step += spin_button->climb_rate;
+ priv->timer_calls = 0;
+ priv->timer_step += priv->climb_rate;
}
}
retval = TRUE;
g_signal_emit (spin_button, spinbutton_signals[VALUE_CHANGED], 0);
- spin_button_redraw (spin_button);
+ gtk_widget_queue_draw (GTK_WIDGET (spin_button));
g_object_notify (G_OBJECT (spin_button), "value");
}
gtk_spin_button_real_change_value (GtkSpinButton *spin,
GtkScrollType scroll)
{
- gdouble old_value = spin->adjustment->value;
+ GtkSpinButtonPriv *priv = spin->priv;
+ gdouble old_value;
+
+ /* When the key binding is activated, there may be an outstanding
+ * value, so we first have to commit what is currently written in
+ * the spin buttons text entry. See #106574
+ */
+ gtk_spin_button_update (spin);
+
+ old_value = priv->adjustment->value;
/* We don't test whether the entry is editable, since
* this key binding conceptually corresponds to changing
case GTK_SCROLL_STEP_BACKWARD:
case GTK_SCROLL_STEP_DOWN:
case GTK_SCROLL_STEP_LEFT:
- gtk_spin_button_real_spin (spin, -spin->timer_step);
-
- if (spin->climb_rate > 0.0 && spin->timer_step
- < spin->adjustment->page_increment)
+ gtk_spin_button_real_spin (spin, -priv->timer_step);
+
+ if (priv->climb_rate > 0.0 && priv->timer_step
+ < priv->adjustment->page_increment)
{
- if (spin->timer_calls < MAX_TIMER_CALLS)
- spin->timer_calls++;
+ if (priv->timer_calls < MAX_TIMER_CALLS)
+ priv->timer_calls++;
else
{
- spin->timer_calls = 0;
- spin->timer_step += spin->climb_rate;
+ priv->timer_calls = 0;
+ priv->timer_step += priv->climb_rate;
}
}
break;
case GTK_SCROLL_STEP_FORWARD:
case GTK_SCROLL_STEP_UP:
case GTK_SCROLL_STEP_RIGHT:
- gtk_spin_button_real_spin (spin, spin->timer_step);
-
- if (spin->climb_rate > 0.0 && spin->timer_step
- < spin->adjustment->page_increment)
+ gtk_spin_button_real_spin (spin, priv->timer_step);
+
+ if (priv->climb_rate > 0.0 && priv->timer_step
+ < priv->adjustment->page_increment)
{
- if (spin->timer_calls < MAX_TIMER_CALLS)
- spin->timer_calls++;
+ if (priv->timer_calls < MAX_TIMER_CALLS)
+ priv->timer_calls++;
else
{
- spin->timer_calls = 0;
- spin->timer_step += spin->climb_rate;
+ priv->timer_calls = 0;
+ priv->timer_step += priv->climb_rate;
}
}
break;
case GTK_SCROLL_PAGE_BACKWARD:
case GTK_SCROLL_PAGE_DOWN:
case GTK_SCROLL_PAGE_LEFT:
- gtk_spin_button_real_spin (spin, -spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, -priv->adjustment->page_increment);
break;
case GTK_SCROLL_PAGE_FORWARD:
case GTK_SCROLL_PAGE_UP:
case GTK_SCROLL_PAGE_RIGHT:
- gtk_spin_button_real_spin (spin, spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, priv->adjustment->page_increment);
break;
case GTK_SCROLL_START:
{
- gdouble diff = spin->adjustment->value - spin->adjustment->lower;
+ gdouble diff = priv->adjustment->value - priv->adjustment->lower;
if (diff > EPSILON)
gtk_spin_button_real_spin (spin, -diff);
break;
case GTK_SCROLL_END:
{
- gdouble diff = spin->adjustment->upper - spin->adjustment->value;
+ gdouble diff = priv->adjustment->upper - priv->adjustment->value;
if (diff > EPSILON)
gtk_spin_button_real_spin (spin, diff);
break;
gtk_spin_button_update (spin);
- if (spin->adjustment->value == old_value)
+ if (priv->adjustment->value == old_value)
gtk_widget_error_bell (GTK_WIDGET (spin));
}
GdkEventKey *event)
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPriv *priv = spin->priv;
/* We only get a release at the end of a key repeat run, so reset the timer_step */
- spin->timer_step = spin->adjustment->step_increment;
- spin->timer_calls = 0;
-
+ priv->timer_step = priv->adjustment->step_increment;
+ priv->timer_calls = 0;
+
return TRUE;
}
gtk_spin_button_snap (GtkSpinButton *spin_button,
gdouble val)
{
+ GtkSpinButtonPriv *priv = spin_button->priv;
gdouble inc;
gdouble tmp;
- inc = spin_button->adjustment->step_increment;
+ inc = priv->adjustment->step_increment;
if (inc == 0)
return;
-
- tmp = (val - spin_button->adjustment->lower) / inc;
+
+ tmp = (val - priv->adjustment->lower) / inc;
if (tmp - floor (tmp) < ceil (tmp) - tmp)
- val = spin_button->adjustment->lower + floor (tmp) * inc;
+ val = priv->adjustment->lower + floor (tmp) * inc;
else
- val = spin_button->adjustment->lower + ceil (tmp) * inc;
+ val = priv->adjustment->lower + ceil (tmp) * inc;
- if (fabs (val - spin_button->adjustment->value) > EPSILON)
- gtk_adjustment_set_value (spin_button->adjustment, val);
- else
- {
- gint return_val = FALSE;
- g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
- if (return_val == FALSE)
- gtk_spin_button_default_output (spin_button);
- }
+ gtk_spin_button_set_value (spin_button, val);
}
static void
GTK_ENTRY_CLASS (gtk_spin_button_parent_class)->activate (entry);
}
+static void
+gtk_spin_button_get_text_area_size (GtkEntry *entry,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height)
+{
+ gint arrow_size;
+ gint panel_width;
+
+ GTK_ENTRY_CLASS (gtk_spin_button_parent_class)->get_text_area_size (entry, x, y, width, height);
+
+ arrow_size = spin_button_get_arrow_size (GTK_SPIN_BUTTON (entry));
+ panel_width = arrow_size + 2 * GTK_WIDGET (entry)->style->xthickness;
+
+ if (width)
+ *width -= panel_width;
+
+ if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL && x)
+ *x += panel_width;
+}
+
static void
gtk_spin_button_insert_text (GtkEditable *editable,
const gchar *new_text,
{
GtkEntry *entry = GTK_ENTRY (editable);
GtkSpinButton *spin = GTK_SPIN_BUTTON (editable);
+ GtkSpinButtonPriv *priv = spin->priv;
GtkEditableClass *parent_editable_iface = g_type_interface_peek (gtk_spin_button_parent_class, GTK_TYPE_EDITABLE);
-
- if (spin->numeric)
+
+ if (priv->numeric)
{
struct lconv *lc;
gboolean sign;
gint dotpos = -1;
gint i;
- GdkWChar pos_sign;
- GdkWChar neg_sign;
+ guint32 pos_sign;
+ guint32 neg_sign;
gint entry_length;
+ const gchar *entry_text;
- entry_length = entry->text_length;
+ entry_length = gtk_entry_get_text_length (entry);
+ entry_text = gtk_entry_get_text (entry);
lc = localeconv ();
else
pos_sign = '+';
+#ifdef G_OS_WIN32
+ /* Workaround for bug caused by some Windows application messing
+ * up the positive sign of the current locale, more specifically
+ * HKEY_CURRENT_USER\Control Panel\International\sPositiveSign.
+ * See bug #330743 and for instance
+ * http://www.msnewsgroups.net/group/microsoft.public.dotnet.languages.csharp/topic36024.aspx
+ *
+ * I don't know if the positive sign always gets bogusly set to
+ * a digit when the above Registry value is corrupted as
+ * described. (In my test case, it got set to "8", and in the
+ * bug report above it presumably was set ot "0".) Probably it
+ * might get set to almost anything? So how to distinguish a
+ * bogus value from some correct one for some locale? That is
+ * probably hard, but at least we should filter out the
+ * digits...
+ */
+ if (pos_sign >= '0' && pos_sign <= '9')
+ pos_sign = '+';
+#endif
+
for (sign=0, i=0; i<entry_length; i++)
- if ((entry->text[i] == neg_sign) ||
- (entry->text[i] == pos_sign))
+ if ((entry_text[i] == neg_sign) ||
+ (entry_text[i] == pos_sign))
{
sign = 1;
break;
return;
for (dotpos=-1, i=0; i<entry_length; i++)
- if (entry->text[i] == *(lc->decimal_point))
+ if (entry_text[i] == *(lc->decimal_point))
{
dotpos = i;
break;
}
if (dotpos > -1 && *position > dotpos &&
- (gint)spin->digits - entry_length
+ (gint)priv->digits - entry_length
+ dotpos - new_text_length + 1 < 0)
return;
}
else if (new_text[i] == *(lc->decimal_point))
{
- if (!spin->digits || dotpos > -1 ||
+ if (!priv->digits || dotpos > -1 ||
(new_text_length - 1 - i + entry_length
- - *position > (gint)spin->digits))
+ - *position > (gint)priv->digits))
return;
dotpos = *position + i;
}
gtk_spin_button_real_spin (GtkSpinButton *spin_button,
gdouble increment)
{
+ GtkSpinButtonPriv *priv = spin_button->priv;
GtkAdjustment *adj;
gdouble new_value = 0.0;
gboolean wrapped = FALSE;
-
- adj = spin_button->adjustment;
+
+ adj = priv->adjustment;
new_value = adj->value + increment;
if (increment > 0)
{
- if (spin_button->wrap)
+ if (priv->wrap)
{
if (fabs (adj->value - adj->upper) < EPSILON)
{
}
else if (increment < 0)
{
- if (spin_button->wrap)
+ if (priv->wrap)
{
if (fabs (adj->value - adj->lower) < EPSILON)
{
if (wrapped)
g_signal_emit (spin_button, spinbutton_signals[WRAPPED], 0);
- spin_button_redraw (spin_button);
+ gtk_widget_queue_draw (GTK_WIDGET (spin_button));
}
static gint
static gint
gtk_spin_button_default_output (GtkSpinButton *spin_button)
{
- gchar *buf = g_strdup_printf ("%0.*f", spin_button->digits, spin_button->adjustment->value);
+ GtkSpinButtonPriv *priv = spin_button->priv;
+
+ gchar *buf = g_strdup_printf ("%0.*f", priv->digits, priv->adjustment->value);
if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
***********************************************************/
+/**
+ * gtk_spin_button_configure:
+ * @spin_button: a #GtkSpinButton
+ * @adjustment: (allow-none): a #GtkAdjustment.
+ * @climb_rate: the new climb rate.
+ * @digits: the number of decimal places to display in the spin button.
+ *
+ * Changes the properties of an existing spin button. The adjustment, climb rate,
+ * and number of decimal places are all changed accordingly, after this function call.
+ */
void
gtk_spin_button_configure (GtkSpinButton *spin_button,
GtkAdjustment *adjustment,
gdouble climb_rate,
guint digits)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
if (adjustment)
gtk_spin_button_set_adjustment (spin_button, adjustment);
else
- adjustment = spin_button->adjustment;
+ adjustment = priv->adjustment;
g_object_freeze_notify (G_OBJECT (spin_button));
- if (spin_button->digits != digits)
+ if (priv->digits != digits)
{
- spin_button->digits = digits;
+ priv->digits = digits;
g_object_notify (G_OBJECT (spin_button), "digits");
}
- if (spin_button->climb_rate != climb_rate)
+ if (priv->climb_rate != climb_rate)
{
- spin_button->climb_rate = climb_rate;
+ priv->climb_rate = climb_rate;
g_object_notify (G_OBJECT (spin_button), "climb-rate");
}
g_object_thaw_notify (G_OBJECT (spin_button));
static void
adjustment_changed_cb (GtkAdjustment *adjustment, gpointer data)
{
- GtkSpinButton *spin_button;
-
- spin_button = GTK_SPIN_BUTTON (data);
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (data);
+ GtkSpinButtonPriv *priv = spin_button->priv;
- spin_button->timer_step = spin_button->adjustment->step_increment;
+ priv->timer_step = priv->adjustment->step_increment;
gtk_widget_queue_resize (GTK_WIDGET (spin_button));
}
gtk_spin_button_set_adjustment (GtkSpinButton *spin_button,
GtkAdjustment *adjustment)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- if (spin_button->adjustment != adjustment)
+ priv = spin_button->priv;
+
+ if (priv->adjustment != adjustment)
{
- if (spin_button->adjustment)
+ if (priv->adjustment)
{
- g_signal_handlers_disconnect_by_func (spin_button->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
gtk_spin_button_value_changed,
spin_button);
- g_signal_handlers_disconnect_by_func (spin_button->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
adjustment_changed_cb,
spin_button);
- g_object_unref (spin_button->adjustment);
+ g_object_unref (priv->adjustment);
}
- spin_button->adjustment = adjustment;
+ priv->adjustment = adjustment;
if (adjustment)
{
g_object_ref_sink (adjustment);
- g_signal_connect (adjustment, "value_changed",
+ g_signal_connect (adjustment, "value-changed",
G_CALLBACK (gtk_spin_button_value_changed),
spin_button);
g_signal_connect (adjustment, "changed",
G_CALLBACK (adjustment_changed_cb),
spin_button);
- spin_button->timer_step = spin_button->adjustment->step_increment;
+ priv->timer_step = priv->adjustment->step_increment;
}
gtk_widget_queue_resize (GTK_WIDGET (spin_button));
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), NULL);
- return spin_button->adjustment;
+ return spin_button->priv->adjustment;
}
/**
gtk_spin_button_set_digits (GtkSpinButton *spin_button,
guint digits)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- if (spin_button->digits != digits)
+ priv = spin_button->priv;
+
+ if (priv->digits != digits)
{
- spin_button->digits = digits;
- gtk_spin_button_value_changed (spin_button->adjustment, spin_button);
+ priv->digits = digits;
+ gtk_spin_button_value_changed (priv->adjustment, spin_button);
g_object_notify (G_OBJECT (spin_button), "digits");
/* since lower/upper may have changed */
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0);
- return spin_button->digits;
+ return spin_button->priv->digits;
}
/**
gdouble step,
gdouble page)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- spin_button->adjustment->step_increment = step;
- spin_button->adjustment->page_increment = page;
+ priv = spin_button->priv;
+
+ priv->adjustment->step_increment = step;
+ priv->adjustment->page_increment = page;
}
/**
* gtk_spin_button_get_increments:
* @spin_button: a #GtkSpinButton
- * @step: location to store step increment, or %NULL
- * @page: location to store page increment, or %NULL
+ * @step: (allow-none): location to store step increment, or %NULL
+ * @page: (allow-none): location to store page increment, or %NULL
*
* Gets the current step and page the increments used by @spin_button. See
* gtk_spin_button_set_increments().
gdouble *step,
gdouble *page)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
if (step)
- *step = spin_button->adjustment->step_increment;
+ *step = priv->adjustment->step_increment;
if (page)
- *page = spin_button->adjustment->page_increment;
+ *page = priv->adjustment->page_increment;
}
/**
gdouble min,
gdouble max)
{
+ GtkSpinButtonPriv *priv;
gdouble value;
-
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- spin_button->adjustment->lower = min;
- spin_button->adjustment->upper = max;
+ priv = spin_button->priv;
+
+ priv->adjustment->lower = min;
+ priv->adjustment->upper = max;
- value = CLAMP (spin_button->adjustment->value,
- spin_button->adjustment->lower,
- (spin_button->adjustment->upper - spin_button->adjustment->page_size));
+ value = CLAMP (priv->adjustment->value,
+ priv->adjustment->lower,
+ (priv->adjustment->upper - priv->adjustment->page_size));
- if (value != spin_button->adjustment->value)
+ if (value != priv->adjustment->value)
gtk_spin_button_set_value (spin_button, value);
- gtk_adjustment_changed (spin_button->adjustment);
+ gtk_adjustment_changed (priv->adjustment);
}
/**
* gtk_spin_button_get_range:
* @spin_button: a #GtkSpinButton
- * @min: location to store minimum allowed value, or %NULL
- * @max: location to store maximum allowed value, or %NULL
+ * @min: (allow-none): location to store minimum allowed value, or %NULL
+ * @max: (allow-none): location to store maximum allowed value, or %NULL
*
* Gets the range allowed for @spin_button. See
* gtk_spin_button_set_range().
gdouble *min,
gdouble *max)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
if (min)
- *min = spin_button->adjustment->lower;
+ *min = priv->adjustment->lower;
if (max)
- *max = spin_button->adjustment->upper;
+ *max = priv->adjustment->upper;
}
/**
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0.0);
- return spin_button->adjustment->value;
+ return spin_button->priv->adjustment->value;
}
/**
gint
gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button)
{
+ GtkSpinButtonPriv *priv;
gdouble val;
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0);
- val = spin_button->adjustment->value;
+ priv = spin_button->priv;
+
+ val = priv->adjustment->value;
if (val - floor (val) < ceil (val) - val)
return floor (val);
else
gtk_spin_button_set_value (GtkSpinButton *spin_button,
gdouble value)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- if (fabs (value - spin_button->adjustment->value) > EPSILON)
- gtk_adjustment_set_value (spin_button->adjustment, value);
+ priv = spin_button->priv;
+
+ if (fabs (value - priv->adjustment->value) > EPSILON)
+ gtk_adjustment_set_value (priv->adjustment, value);
else
{
gint return_val = FALSE;
gtk_spin_button_set_update_policy (GtkSpinButton *spin_button,
GtkSpinButtonUpdatePolicy policy)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- if (spin_button->update_policy != policy)
+ priv = spin_button->priv;
+
+ if (priv->update_policy != policy)
{
- spin_button->update_policy = policy;
+ priv->update_policy = policy;
g_object_notify (G_OBJECT (spin_button), "update-policy");
}
}
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), GTK_UPDATE_ALWAYS);
- return spin_button->update_policy;
+ return spin_button->priv->update_policy;
}
/**
gtk_spin_button_set_numeric (GtkSpinButton *spin_button,
gboolean numeric)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
numeric = numeric != FALSE;
- if (spin_button->numeric != numeric)
+ if (priv->numeric != numeric)
{
- spin_button->numeric = numeric;
+ priv->numeric = numeric;
g_object_notify (G_OBJECT (spin_button), "numeric");
}
}
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), FALSE);
- return spin_button->numeric;
+ return spin_button->priv->numeric;
}
/**
gtk_spin_button_set_wrap (GtkSpinButton *spin_button,
gboolean wrap)
{
+ GtkSpinButtonPriv *priv;
+
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
wrap = wrap != FALSE;
- if (spin_button->wrap != wrap)
+ if (priv->wrap != wrap)
{
- spin_button->wrap = (wrap != 0);
+ priv->wrap = (wrap != 0);
g_object_notify (G_OBJECT (spin_button), "wrap");
}
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), FALSE);
- return spin_button->wrap;
+ return spin_button->priv->wrap;
}
static gint
gtk_spin_button_set_snap_to_ticks (GtkSpinButton *spin_button,
gboolean snap_to_ticks)
{
+ GtkSpinButtonPriv *priv;
guint new_val;
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
new_val = (snap_to_ticks != 0);
- if (new_val != spin_button->snap_to_ticks)
+ if (new_val != priv->snap_to_ticks)
{
- spin_button->snap_to_ticks = new_val;
+ priv->snap_to_ticks = new_val;
if (new_val && GTK_ENTRY (spin_button)->editable)
gtk_spin_button_update (spin_button);
{
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), FALSE);
- return spin_button->snap_to_ticks;
+ return spin_button->priv->snap_to_ticks;
}
/**
GtkSpinType direction,
gdouble increment)
{
+ GtkSpinButtonPriv *priv;
GtkAdjustment *adj;
gdouble diff;
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
-
- adj = spin_button->adjustment;
+
+ priv = spin_button->priv;
+
+ adj = priv->adjustment;
/* for compatibility with the 1.0.x version of this function */
if (increment != 0 && increment != adj->step_increment &&
void
gtk_spin_button_update (GtkSpinButton *spin_button)
{
+ GtkSpinButtonPriv *priv;
gdouble val;
gint error = 0;
gint return_val;
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ priv = spin_button->priv;
+
return_val = FALSE;
g_signal_emit (spin_button, spinbutton_signals[INPUT], 0, &val, &return_val);
if (return_val == FALSE)
else if (return_val == GTK_INPUT_ERROR)
error = 1;
- spin_button_redraw (spin_button);
+ gtk_widget_queue_draw (GTK_WIDGET (spin_button));
- if (spin_button->update_policy == GTK_UPDATE_ALWAYS)
+ if (priv->update_policy == GTK_UPDATE_ALWAYS)
{
- if (val < spin_button->adjustment->lower)
- val = spin_button->adjustment->lower;
- else if (val > spin_button->adjustment->upper)
- val = spin_button->adjustment->upper;
+ if (val < priv->adjustment->lower)
+ val = priv->adjustment->lower;
+ else if (val > priv->adjustment->upper)
+ val = priv->adjustment->upper;
}
- else if ((spin_button->update_policy == GTK_UPDATE_IF_VALID) &&
+ else if ((priv->update_policy == GTK_UPDATE_IF_VALID) &&
(error ||
- val < spin_button->adjustment->lower ||
- val > spin_button->adjustment->upper))
+ val < priv->adjustment->lower ||
+ val > priv->adjustment->upper))
{
- gtk_spin_button_value_changed (spin_button->adjustment, spin_button);
+ gtk_spin_button_value_changed (priv->adjustment, spin_button);
return;
}
- if (spin_button->snap_to_ticks)
+ if (priv->snap_to_ticks)
gtk_spin_button_snap (spin_button, val);
else
- {
- if (fabs (val - spin_button->adjustment->value) > EPSILON)
- gtk_adjustment_set_value (spin_button->adjustment, val);
- else
- {
- return_val = FALSE;
- g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0,
- &return_val);
- if (return_val == FALSE)
- gtk_spin_button_default_output (spin_button);
- }
- }
+ gtk_spin_button_set_value (spin_button, val);
}
-static void
-spin_button_redraw (GtkSpinButton *spin_button)
+GdkWindow *
+_gtk_spin_button_get_panel (GtkSpinButton *spin_button)
{
- GtkWidget *widget;
-
- widget = GTK_WIDGET (spin_button);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- gtk_widget_queue_draw (widget);
-
- /* We must invalidate the panel window ourselves, because it
- * is not a child of widget->window
- */
- gdk_window_invalidate_rect (spin_button->panel, NULL, TRUE);
- }
-}
-
-#define __GTK_SPIN_BUTTON_C__
-#include "gtkaliasdef.c"
+ return spin_button->priv->panel;
+}
projects / ~andy / gtk / blobdiff