* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include "gtkcheckbutton.h"
-#include "gtkintl.h"
#include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
#define INDICATOR_SIZE 13
#define INDICATOR_SPACING 2
-static void gtk_check_button_class_init (GtkCheckButtonClass *klass);
-static void gtk_check_button_init (GtkCheckButton *check_button);
static void gtk_check_button_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_check_button_size_allocate (GtkWidget *widget,
static void gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
GdkRectangle *area);
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-GtkType
-gtk_check_button_get_type (void)
-{
- static GtkType check_button_type = 0;
-
- if (!check_button_type)
- {
- static const GtkTypeInfo check_button_info =
- {
- "GtkCheckButton",
- sizeof (GtkCheckButton),
- sizeof (GtkCheckButtonClass),
- (GtkClassInitFunc) gtk_check_button_class_init,
- (GtkObjectInitFunc) gtk_check_button_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- check_button_type = gtk_type_unique (GTK_TYPE_TOGGLE_BUTTON, &check_button_info);
- }
-
- return check_button_type;
-}
+G_DEFINE_TYPE (GtkCheckButton, gtk_check_button, GTK_TYPE_TOGGLE_BUTTON)
static void
gtk_check_button_class_init (GtkCheckButtonClass *class)
GtkWidgetClass *widget_class;
widget_class = (GtkWidgetClass*) class;
- parent_class = gtk_type_class (gtk_toggle_button_get_type ());
widget_class->size_request = gtk_check_button_size_request;
widget_class->size_allocate = gtk_check_button_size_allocate;
class->draw_indicator = gtk_real_check_button_draw_indicator;
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("indicator_size",
- _("Indicator Size"),
- _("Size of check or radio indicator"),
+ g_param_spec_int ("indicator-size",
+ P_("Indicator Size"),
+ P_("Size of check or radio indicator"),
0,
G_MAXINT,
INDICATOR_SIZE,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("indicator_spacing",
- _("Indicator Spacing"),
- _("Spacing around check or radio indicator"),
+ g_param_spec_int ("indicator-spacing",
+ P_("Indicator Spacing"),
+ P_("Spacing around check or radio indicator"),
0,
G_MAXINT,
INDICATOR_SPACING,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
}
static void
GTK_WIDGET_SET_FLAGS (check_button, GTK_NO_WINDOW);
GTK_WIDGET_UNSET_FLAGS (check_button, GTK_RECEIVES_DEFAULT);
GTK_TOGGLE_BUTTON (check_button)->draw_indicator = TRUE;
+ GTK_BUTTON (check_button)->depress_on_activate = FALSE;
}
GtkWidget*
gtk_check_button_new (void)
{
- return gtk_widget_new (GTK_TYPE_CHECK_BUTTON, NULL);
+ return g_object_new (GTK_TYPE_CHECK_BUTTON, NULL);
}
GtkWidget*
gtk_check_button_new_with_mnemonic (const gchar *label)
{
- return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, "use_underline", TRUE, NULL);
+ return g_object_new (GTK_TYPE_CHECK_BUTTON,
+ "label", label,
+ "use-underline", TRUE,
+ NULL);
}
{
GtkCheckButton *check_button = GTK_CHECK_BUTTON (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
gint border_width;
gint interior_focus;
gtk_check_button_draw_indicator (check_button, area);
border_width = GTK_CONTAINER (widget)->border_width;
- if (GTK_WIDGET_HAS_FOCUS (widget))
+ if (gtk_widget_has_focus (widget))
{
- if (interior_focus)
- {
- GtkWidget *child = GTK_BIN (widget)->child;
-
- if (child && GTK_WIDGET_VISIBLE (child))
- gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
- NULL, widget, "checkbutton",
- child->allocation.x - focus_width - focus_pad,
- child->allocation.y - focus_width - focus_pad,
- child->allocation.width + 2 * (focus_width + focus_pad),
- child->allocation.height + 2 * (focus_width + focus_pad));
- }
+ GtkWidget *child = GTK_BIN (widget)->child;
+
+ if (interior_focus && child && gtk_widget_get_visible (child))
+ gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+ area, widget, "checkbutton",
+ child->allocation.x - focus_width - focus_pad,
+ child->allocation.y - focus_width - focus_pad,
+ child->allocation.width + 2 * (focus_width + focus_pad),
+ child->allocation.height + 2 * (focus_width + focus_pad));
else
gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
- NULL, widget, "checkbutton",
+ area, widget, "checkbutton",
border_width + widget->allocation.x,
border_width + widget->allocation.y,
widget->allocation.width - 2 * border_width,
GtkWidget *widget = GTK_WIDGET (check_button);
if (indicator_size)
- gtk_widget_style_get (widget, "indicator_size", indicator_size, NULL);
+ gtk_widget_style_get (widget, "indicator-size", indicator_size, NULL);
if (indicator_spacing)
- gtk_widget_style_get (widget, "indicator_spacing", indicator_spacing, NULL);
+ gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL);
}
static void
requisition->width = border_width * 2;
requisition->height = border_width * 2;
+ _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
+ &indicator_size, &indicator_spacing);
+
child = GTK_BIN (widget)->child;
- if (child && GTK_WIDGET_VISIBLE (child))
+ if (child && gtk_widget_get_visible (child))
{
GtkRequisition child_requisition;
gtk_widget_size_request (child, &child_requisition);
- requisition->width += child_requisition.width;
+ requisition->width += child_requisition.width + indicator_spacing;
requisition->height += child_requisition.height;
}
- _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
- &indicator_size, &indicator_spacing);
-
- requisition->width += (indicator_size + indicator_spacing * 3 + 2 * (focus_width + focus_pad));
+ requisition->width += (indicator_size + indicator_spacing * 2 + 2 * (focus_width + focus_pad));
temp = indicator_size + indicator_spacing * 2;
requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad);
}
else
- (* GTK_WIDGET_CLASS (parent_class)->size_request) (widget, requisition);
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request (widget, requisition);
}
static void
allocation->x, allocation->y,
allocation->width, allocation->height);
- if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
+ if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
{
GtkRequisition child_requisition;
gint border_width = GTK_CONTAINER (widget)->border_width;
allocation->width -
((border_width + focus_width + focus_pad) * 2
+ indicator_size + indicator_spacing * 3));
+ child_allocation.width = MAX (child_allocation.width, 1);
child_allocation.height = MIN (child_requisition.height,
allocation->height - (border_width + focus_width + focus_pad) * 2);
+ child_allocation.height = MAX (child_allocation.height, 1);
+
child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 +
widget->allocation.x + focus_width + focus_pad);
child_allocation.y = widget->allocation.y +
}
}
else
- (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate (widget, allocation);
}
static gint
gtk_check_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkCheckButton *check_button;
GtkToggleButton *toggle_button;
GtkBin *bin;
- check_button = GTK_CHECK_BUTTON (widget);
toggle_button = GTK_TOGGLE_BUTTON (widget);
bin = GTK_BIN (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
if (toggle_button->draw_indicator)
{
bin->child,
event);
}
- else if (GTK_WIDGET_CLASS (parent_class)->expose_event)
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+ else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event)
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event (widget, event);
}
return FALSE;
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
-
+
if (class->draw_indicator)
- (* class->draw_indicator) (check_button, area);
+ class->draw_indicator (check_button, area);
}
static void
GdkRectangle *area)
{
GtkWidget *widget;
+ GtkWidget *child;
+ GtkButton *button;
GtkToggleButton *toggle_button;
GtkStateType state_type;
GtkShadowType shadow_type;
- GdkRectangle restrict_area;
- GdkRectangle new_area;
- gint width, height;
gint x, y;
gint indicator_size;
gint indicator_spacing;
gint focus_width;
gint focus_pad;
gboolean interior_focus;
- GdkWindow *window;
-
+
widget = GTK_WIDGET (check_button);
- toggle_button = GTK_TOGGLE_BUTTON (check_button);
-
- if (GTK_WIDGET_DRAWABLE (check_button))
- {
- window = widget->window;
- gtk_widget_style_get (widget, "interior_focus", &interior_focus,
+ if (gtk_widget_is_drawable (widget))
+ {
+ button = GTK_BUTTON (check_button);
+ toggle_button = GTK_TOGGLE_BUTTON (check_button);
+
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
"focus-line-width", &focus_width,
- "focus-padding", &focus_pad, NULL);
+ "focus-padding", &focus_pad,
+ NULL);
_gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
-
- state_type = GTK_WIDGET_STATE (widget);
- if (state_type != GTK_STATE_NORMAL &&
- state_type != GTK_STATE_PRELIGHT)
- state_type = GTK_STATE_NORMAL;
-
- restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
- restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
- restrict_area.width = widget->allocation.width - ( 2 * GTK_CONTAINER (widget)->border_width);
- restrict_area.height = widget->allocation.height - ( 2 * GTK_CONTAINER (widget)->border_width);
-
- if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
- {
- if (state_type != GTK_STATE_NORMAL)
- gtk_paint_flat_box (widget->style, window, state_type,
- GTK_SHADOW_ETCHED_OUT,
- area, widget, "checkbutton",
- new_area.x, new_area.y,
- new_area.width, new_area.height);
- }
-
+
x = widget->allocation.x + indicator_spacing + GTK_CONTAINER (widget)->border_width;
y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
- width = indicator_size;
- height = indicator_size;
- if (!interior_focus)
+ child = GTK_BIN (check_button)->child;
+ if (!interior_focus || !(child && gtk_widget_get_visible (child)))
x += focus_width + focus_pad;
- state_type = GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE ? GTK_STATE_NORMAL : GTK_WIDGET_STATE (widget);
- if (GTK_TOGGLE_BUTTON (widget)->inconsistent)
+ if (toggle_button->inconsistent)
shadow_type = GTK_SHADOW_ETCHED_IN;
- else if (GTK_TOGGLE_BUTTON (widget)->active)
+ else if (toggle_button->active)
shadow_type = GTK_SHADOW_IN;
else
shadow_type = GTK_SHADOW_OUT;
+ if (button->activate_timeout || (button->button_down && button->in_button))
+ state_type = GTK_STATE_ACTIVE;
+ else if (button->in_button)
+ state_type = GTK_STATE_PRELIGHT;
+ else if (!gtk_widget_is_sensitive (widget))
+ state_type = GTK_STATE_INSENSITIVE;
+ else
+ state_type = GTK_STATE_NORMAL;
+
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- x = widget->allocation.x + widget->allocation.width - (width + x - widget->allocation.x);
+ x = widget->allocation.x + widget->allocation.width - (indicator_size + x - widget->allocation.x);
- gtk_paint_check (widget->style, window,
+ if (GTK_WIDGET_STATE (toggle_button) == GTK_STATE_PRELIGHT)
+ {
+ GdkRectangle restrict_area;
+ GdkRectangle new_area;
+
+ restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
+ restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
+ restrict_area.width = widget->allocation.width - (2 * GTK_CONTAINER (widget)->border_width);
+ restrict_area.height = widget->allocation.height - (2 * GTK_CONTAINER (widget)->border_width);
+
+ if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
+ {
+ gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_PRELIGHT,
+ GTK_SHADOW_ETCHED_OUT,
+ area, widget, "checkbutton",
+ new_area.x, new_area.y,
+ new_area.width, new_area.height);
+ }
+ }
+
+ gtk_paint_check (widget->style, widget->window,
state_type, shadow_type,
area, widget, "checkbutton",
- x, y, width, height);
+ x, y, indicator_size, indicator_size);
}
}
+
+#define __GTK_CHECK_BUTTON_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff