* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
-#include "gtkalias.h"
+#include "config.h"
#include "gtkcheckmenuitem.h"
#include "gtkaccellabel.h"
-#include "gtkintl.h"
+#include "gtkactivatable.h"
+#include "gtktoggleaction.h"
#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
enum {
TOGGLED,
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 };
-
-
-GType
-gtk_check_menu_item_get_type (void)
-{
- static GType check_menu_item_type = 0;
-
- if (!check_menu_item_type)
- {
- static const GTypeInfo check_menu_item_info =
- {
- sizeof (GtkCheckMenuItemClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_check_menu_item_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkCheckMenuItem),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_check_menu_item_init,
- };
-
- check_menu_item_type =
- g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkCheckMenuItem",
- &check_menu_item_info, 0);
- }
-
- 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)
widget_class = (GtkWidgetClass*) klass;
menu_item_class = (GtkMenuItemClass*) klass;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->set_property = gtk_check_menu_item_set_property;
gobject_class->get_property = gtk_check_menu_item_get_property;
P_("Active"),
P_("Whether the menu item is checked"),
FALSE,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_INCONSISTENT,
P_("Inconsistent"),
P_("Whether to display an \"inconsistent\" state"),
FALSE,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_DRAW_AS_RADIO,
- g_param_spec_boolean ("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_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("indicator_size",
- P_("Indicator Size")
-,
+ g_param_spec_int ("indicator-size",
+ P_("Indicator Size"),
P_("Size of check or radio indicator"),
0,
G_MAXINT,
- 12,
- G_PARAM_READABLE));
+ 13,
+ GTK_PARAM_READABLE));
widget_class->expose_event = gtk_check_menu_item_expose;
klass->draw_indicator = gtk_real_check_menu_item_draw_indicator;
check_menu_item_signals[TOGGLED] =
- g_signal_new ("toggled",
+ g_signal_new (I_("toggled"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkCheckMenuItemClass, toggled),
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)
{
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 = g_object_new (GTK_TYPE_ACCEL_LABEL, NULL);
- 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
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,
+ "toggle-spacing", &toggle_spacing,
+ "indicator-size", &indicator_size,
NULL);
*requisition = indicator_size + toggle_spacing;
}
-void
-gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
- gboolean always)
-{
- g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
-
-#if 0
- menu_item->always_show_toggle = always != FALSE;
-#endif
-}
-
void
gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item)
{
gtk_widget_queue_draw (GTK_WIDGET (check_menu_item));
- g_object_notify (G_OBJECT (check_menu_item), "draw_as_radio");
+ g_object_notify (G_OBJECT (check_menu_item), "draw-as-radio");
}
}
gtk_check_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- 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);
gtk_check_menu_item_toggled (check_menu_item);
gtk_widget_queue_draw (GTK_WIDGET (check_menu_item));
+ GTK_MENU_ITEM_CLASS (gtk_check_menu_item_parent_class)->activate (menu_item);
+
g_object_notify (G_OBJECT (check_menu_item), "active");
}
GdkRectangle *area)
{
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
GtkShadowType shadow_type;
gint x, y;
- if (GTK_WIDGET_DRAWABLE (check_menu_item))
+ widget = GTK_WIDGET (check_menu_item);
+
+ if (gtk_widget_is_drawable (widget))
{
guint offset;
guint toggle_size;
guint toggle_spacing;
guint horizontal_padding;
guint indicator_size;
-
- widget = GTK_WIDGET (check_menu_item);
- gtk_widget_style_get (GTK_WIDGET (check_menu_item),
- "toggle_spacing", &toggle_spacing,
- "horizontal_padding", &horizontal_padding,
- "indicator_size", &indicator_size,
+ gtk_widget_style_get (widget,
+ "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;
-
offset = GTK_CONTAINER (check_menu_item)->border_width +
widget->style->xthickness + 2;
if (check_menu_item->active ||
check_menu_item->always_show_toggle ||
- (GTK_WIDGET_STATE (check_menu_item) == GTK_STATE_PRELIGHT))
+ (gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT))
{
- state_type = GTK_WIDGET_STATE (widget);
+ state_type = gtk_widget_get_state (widget);
if (check_menu_item->inconsistent)
shadow_type = GTK_SHADOW_ETCHED_IN;
else
shadow_type = GTK_SHADOW_OUT;
- if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
if (check_menu_item->draw_as_radio)
break;
}
}
+
+#define __GTK_CHECK_MENU_ITEM_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff