* 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;
-
-
-GType
-gtk_check_button_get_type (void)
-{
- static GType check_button_type = 0;
-
- if (!check_button_type)
- {
- static const GTypeInfo check_button_info =
- {
- sizeof (GtkCheckButtonClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_check_button_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkCheckButton),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_check_button_init,
- };
-
- check_button_type =
- g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, "GtkCheckButton",
- &check_button_info, 0);
- }
-
- 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 = g_type_class_peek_parent (class);
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
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);
}
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))
{
requisition->height += child_requisition.height;
}
- _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
- &indicator_size, &indicator_spacing);
-
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
}
}
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);
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;
button = GTK_BUTTON (check_button);
toggle_button = GTK_TOGGLE_BUTTON (check_button);
- gtk_widget_style_get (widget, "interior_focus", &interior_focus,
+ 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_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;
new_area.width, new_area.height);
}
}
-
+
gtk_paint_check (widget->style, widget->window,
state_type, shadow_type,
area, widget, "checkbutton",
x, y, indicator_size, indicator_size);
}
}
+
+#define __GTK_CHECK_BUTTON_C__
+#include "gtkaliasdef.c"