* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include "gtkcheckmenuitem.h"
#include "gtkaccellabel.h"
-#include "gtksignal.h"
-#include "gtkintl.h"
+#include "gtkactivatable.h"
+#include "gtktoggleaction.h"
#include "gtkmarshalers.h"
-
-#define CHECK_TOGGLE_SIZE 12
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
enum {
TOGGLED,
enum {
PROP_0,
PROP_ACTIVE,
- PROP_INCONSISTENT
+ PROP_INCONSISTENT,
+ PROP_DRAW_AS_RADIO
};
-static void gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass);
-static void gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item);
static gint gtk_check_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_check_menu_item_activate (GtkMenuItem *menu_item);
GdkRectangle *area);
static void gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area);
-static void gtk_check_menu_item_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_check_menu_item_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-
-
-static GtkMenuItemClass *parent_class = NULL;
-static guint check_menu_item_signals[LAST_SIGNAL] = { 0 };
-
-
-GtkType
-gtk_check_menu_item_get_type (void)
-{
- static GtkType check_menu_item_type = 0;
-
- if (!check_menu_item_type)
- {
- static const GtkTypeInfo check_menu_item_info =
- {
- "GtkCheckMenuItem",
- sizeof (GtkCheckMenuItem),
- sizeof (GtkCheckMenuItemClass),
- (GtkClassInitFunc) gtk_check_menu_item_class_init,
- (GtkObjectInitFunc) gtk_check_menu_item_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- check_menu_item_type = gtk_type_unique (GTK_TYPE_MENU_ITEM, &check_menu_item_info);
- }
-
- return check_menu_item_type;
-}
+static void gtk_check_menu_item_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_check_menu_item_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static void gtk_check_menu_item_activatable_interface_init (GtkActivatableIface *iface);
+static void gtk_check_menu_item_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name);
+static void gtk_check_menu_item_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action);
+
+static GtkActivatableIface *parent_activatable_iface;
+static guint check_menu_item_signals[LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE_WITH_CODE (GtkCheckMenuItem, gtk_check_menu_item, GTK_TYPE_MENU_ITEM,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
+ gtk_check_menu_item_activatable_interface_init))
static void
gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkMenuItemClass *menu_item_class;
- object_class = (GtkObjectClass*) klass;
+ gobject_class = G_OBJECT_CLASS (klass);
widget_class = (GtkWidgetClass*) klass;
menu_item_class = (GtkMenuItemClass*) klass;
- parent_class = gtk_type_class (GTK_TYPE_MENU_ITEM);
+ gobject_class->set_property = gtk_check_menu_item_set_property;
+ gobject_class->get_property = gtk_check_menu_item_get_property;
- G_OBJECT_CLASS(object_class)->set_property = gtk_check_menu_item_set_property;
- G_OBJECT_CLASS(object_class)->get_property = gtk_check_menu_item_get_property;
-
- g_object_class_install_property (G_OBJECT_CLASS (object_class),
+ g_object_class_install_property (gobject_class,
PROP_ACTIVE,
g_param_spec_boolean ("active",
- _("Active"),
- _("Whether the menu item is checked."),
+ P_("Active"),
+ P_("Whether the menu item is checked"),
FALSE,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
- g_object_class_install_property (G_OBJECT_CLASS (object_class),
+ g_object_class_install_property (gobject_class,
PROP_INCONSISTENT,
g_param_spec_boolean ("inconsistent",
- _("Inconsistent"),
- _("Whether to display an \"inconsistent\" state."),
+ P_("Inconsistent"),
+ P_("Whether to display an \"inconsistent\" state"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_DRAW_AS_RADIO,
+ g_param_spec_boolean ("draw-as-radio",
+ P_("Draw as radio menu item"),
+ P_("Whether the menu item looks like a radio menu item"),
FALSE,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("indicator-size",
+ P_("Indicator Size"),
+ P_("Size of check or radio indicator"),
+ 0,
+ G_MAXINT,
+ 13,
+ GTK_PARAM_READABLE));
+
widget_class->expose_event = gtk_check_menu_item_expose;
menu_item_class->activate = gtk_check_menu_item_activate;
klass->draw_indicator = gtk_real_check_menu_item_draw_indicator;
check_menu_item_signals[TOGGLED] =
- gtk_signal_new ("toggled",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkCheckMenuItemClass, toggled),
- _gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new (I_("toggled"),
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkCheckMenuItemClass, toggled),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+static void
+gtk_check_menu_item_activatable_interface_init (GtkActivatableIface *iface)
+{
+ parent_activatable_iface = g_type_interface_peek_parent (iface);
+ iface->update = gtk_check_menu_item_update;
+ iface->sync_action_properties = gtk_check_menu_item_sync_action_properties;
+}
+
+static void
+gtk_check_menu_item_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name)
+{
+ GtkCheckMenuItem *check_menu_item;
+
+ check_menu_item = GTK_CHECK_MENU_ITEM (activatable);
+
+ parent_activatable_iface->update (activatable, action, property_name);
+
+ if (strcmp (property_name, "active") == 0)
+ {
+ gtk_action_block_activate (action);
+ gtk_check_menu_item_set_active (check_menu_item, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+ gtk_action_unblock_activate (action);
+ }
+
+ if (!gtk_activatable_get_use_action_appearance (activatable))
+ return;
+
+ if (strcmp (property_name, "draw-as-radio") == 0)
+ gtk_check_menu_item_set_draw_as_radio (check_menu_item,
+ gtk_toggle_action_get_draw_as_radio (GTK_TOGGLE_ACTION (action)));
+}
+
+static void
+gtk_check_menu_item_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action)
+{
+ GtkCheckMenuItem *check_menu_item;
+
+ check_menu_item = GTK_CHECK_MENU_ITEM (activatable);
+
+ parent_activatable_iface->sync_action_properties (activatable, action);
+
+ if (!GTK_IS_TOGGLE_ACTION (action))
+ return;
+
+ gtk_action_block_activate (action);
+ gtk_check_menu_item_set_active (check_menu_item, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+ gtk_action_unblock_activate (action);
+
+ if (!gtk_activatable_get_use_action_appearance (activatable))
+ return;
+
+ gtk_check_menu_item_set_draw_as_radio (check_menu_item,
+ gtk_toggle_action_get_draw_as_radio (GTK_TOGGLE_ACTION (action)));
}
GtkWidget*
gtk_check_menu_item_new (void)
{
- return GTK_WIDGET (gtk_type_new (GTK_TYPE_CHECK_MENU_ITEM));
+ return g_object_new (GTK_TYPE_CHECK_MENU_ITEM, NULL);
}
GtkWidget*
gtk_check_menu_item_new_with_label (const gchar *label)
{
- GtkWidget *check_menu_item;
- GtkWidget *accel_label;
-
- check_menu_item = gtk_check_menu_item_new ();
- accel_label = gtk_accel_label_new (label);
- gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
-
- gtk_container_add (GTK_CONTAINER (check_menu_item), accel_label);
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), check_menu_item);
- gtk_widget_show (accel_label);
-
- return check_menu_item;
+ return g_object_new (GTK_TYPE_CHECK_MENU_ITEM,
+ "label", label,
+ NULL);
}
GtkWidget*
gtk_check_menu_item_new_with_mnemonic (const gchar *label)
{
- GtkWidget *check_menu_item;
- GtkWidget *accel_label;
-
- check_menu_item = gtk_check_menu_item_new ();
- accel_label = gtk_type_new (GTK_TYPE_ACCEL_LABEL);
- gtk_label_set_text_with_mnemonic (GTK_LABEL (accel_label), label);
- gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
-
- gtk_container_add (GTK_CONTAINER (check_menu_item), accel_label);
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), check_menu_item);
- gtk_widget_show (accel_label);
-
- return check_menu_item;
+ return g_object_new (GTK_TYPE_CHECK_MENU_ITEM,
+ "label", label,
+ "use-underline", TRUE,
+ NULL);
}
void
gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
{
+ guint toggle_spacing;
+ guint indicator_size;
+
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
+
+ gtk_widget_style_get (GTK_WIDGET (menu_item),
+ "toggle-spacing", &toggle_spacing,
+ "indicator-size", &indicator_size,
+ NULL);
- *requisition = CHECK_TOGGLE_SIZE;
+ *requisition = indicator_size + toggle_spacing;
}
void
void
gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item)
{
- gtk_signal_emit (GTK_OBJECT (check_menu_item), check_menu_item_signals[TOGGLED]);
+ g_signal_emit (check_menu_item, check_menu_item_signals[TOGGLED], 0);
}
/**
return check_menu_item->inconsistent;
}
+/**
+ * gtk_check_menu_item_set_draw_as_radio:
+ * @check_menu_item: a #GtkCheckMenuItem
+ * @draw_as_radio: whether @check_menu_item is drawn like a #GtkRadioMenuItem
+ *
+ * Sets whether @check_menu_item is drawn like a #GtkRadioMenuItem
+ *
+ * Since: 2.4
+ **/
+void
+gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
+ gboolean draw_as_radio)
+{
+ g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
+
+ draw_as_radio = draw_as_radio != FALSE;
+
+ if (draw_as_radio != check_menu_item->draw_as_radio)
+ {
+ check_menu_item->draw_as_radio = draw_as_radio;
+
+ gtk_widget_queue_draw (GTK_WIDGET (check_menu_item));
+
+ g_object_notify (G_OBJECT (check_menu_item), "draw-as-radio");
+ }
+}
+
+/**
+ * gtk_check_menu_item_get_draw_as_radio:
+ * @check_menu_item: a #GtkCheckMenuItem
+ *
+ * Returns whether @check_menu_item looks like a #GtkRadioMenuItem
+ *
+ * Return value: Whether @check_menu_item looks like a #GtkRadioMenuItem
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item)
+{
+ g_return_val_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item), FALSE);
+
+ return check_menu_item->draw_as_radio;
+}
+
static void
gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
{
gtk_check_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_CHECK_MENU_ITEM (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_CLASS (parent_class)->expose_event)
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+ if (GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event)
+ GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event (widget, event);
gtk_check_menu_item_draw_indicator (GTK_CHECK_MENU_ITEM (widget), &event->area);
static void
gtk_check_menu_item_activate (GtkMenuItem *menu_item)
{
- GtkCheckMenuItem *check_menu_item;
-
- g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
-
- check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
+ GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
check_menu_item->active = !check_menu_item->active;
gtk_check_menu_item_toggled (check_menu_item);
gtk_widget_queue_draw (GTK_WIDGET (check_menu_item));
- g_object_notify (G_OBJECT(check_menu_item), "active");
+ GTK_MENU_ITEM_CLASS (gtk_check_menu_item_parent_class)->activate (menu_item);
+
+ g_object_notify (G_OBJECT (check_menu_item), "active");
}
static void
gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area)
{
- g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
- g_return_if_fail (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item) != NULL);
-
if (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator)
- (* GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator) (check_menu_item, area);
+ GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator (check_menu_item, area);
}
static void
GtkWidget *widget;
GtkStateType state_type;
GtkShadowType shadow_type;
- gint width, height;
gint x, y;
- g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
-
if (GTK_WIDGET_DRAWABLE (check_menu_item))
{
+ guint offset;
+ guint toggle_size;
+ guint toggle_spacing;
+ guint horizontal_padding;
+ guint indicator_size;
+
widget = GTK_WIDGET (check_menu_item);
- width = 8;
- height = 8;
- x = widget->allocation.x + (GTK_CONTAINER (check_menu_item)->border_width +
- widget->style->xthickness + 2);
- y = widget->allocation.y + (widget->allocation.height - height) / 2;
+ gtk_widget_style_get (GTK_WIDGET (check_menu_item),
+ "toggle-spacing", &toggle_spacing,
+ "horizontal-padding", &horizontal_padding,
+ "indicator-size", &indicator_size,
+ NULL);
+
+ toggle_size = GTK_MENU_ITEM (check_menu_item)->toggle_size;
+ offset = GTK_CONTAINER (check_menu_item)->border_width +
+ widget->style->xthickness + 2;
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ {
+ x = widget->allocation.x + offset + horizontal_padding +
+ (toggle_size - toggle_spacing - indicator_size) / 2;
+ }
+ else
+ {
+ x = widget->allocation.x + widget->allocation.width -
+ offset - horizontal_padding - toggle_size + toggle_spacing +
+ (toggle_size - toggle_spacing - indicator_size) / 2;
+ }
+
+ y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
if (check_menu_item->active ||
check_menu_item->always_show_toggle ||
{
state_type = GTK_WIDGET_STATE (widget);
- if (check_menu_item->always_show_toggle)
+ if (check_menu_item->inconsistent)
+ shadow_type = GTK_SHADOW_ETCHED_IN;
+ else if (check_menu_item->active)
+ shadow_type = GTK_SHADOW_IN;
+ else
+ shadow_type = GTK_SHADOW_OUT;
+
+ if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ state_type = GTK_STATE_INSENSITIVE;
+
+ if (check_menu_item->draw_as_radio)
{
- shadow_type = GTK_SHADOW_OUT;
- if (check_menu_item->active)
- shadow_type = GTK_SHADOW_IN;
+ gtk_paint_option (widget->style, widget->window,
+ state_type, shadow_type,
+ area, widget, "option",
+ x, y, indicator_size, indicator_size);
}
else
{
- shadow_type = GTK_SHADOW_IN;
- if (check_menu_item->active &&
- (state_type == GTK_STATE_PRELIGHT))
- shadow_type = GTK_SHADOW_OUT;
+ gtk_paint_check (widget->style, widget->window,
+ state_type, shadow_type,
+ area, widget, "check",
+ x, y, indicator_size, indicator_size);
}
-
- if (check_menu_item->inconsistent)
- {
- shadow_type = GTK_SHADOW_ETCHED_IN;
- if (state_type == GTK_STATE_ACTIVE)
- state_type = GTK_STATE_NORMAL;
- }
-
- gtk_paint_check (widget->style, widget->window,
- state_type, shadow_type,
- area, widget, "check",
- x, y, width, height);
}
}
}
case PROP_INCONSISTENT:
g_value_set_boolean (value, checkitem->inconsistent);
break;
+ case PROP_DRAW_AS_RADIO:
+ g_value_set_boolean (value, checkitem->draw_as_radio);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case PROP_INCONSISTENT:
gtk_check_menu_item_set_inconsistent (checkitem, g_value_get_boolean (value));
break;
+ case PROP_DRAW_AS_RADIO:
+ gtk_check_menu_item_set_draw_as_radio (checkitem, g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
+
+#define __GTK_CHECK_MENU_ITEM_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff