*/
#include <config.h>
-#include "gtkalias.h"
#include "gtkmenutoolbutton.h"
#include "gtkintl.h"
#include "gtktogglebutton.h"
#include "gtkvbox.h"
#include "gtkmenu.h"
#include "gtkmain.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
#define GTK_MENU_TOOL_BUTTON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonPrivate))
static void
gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
{
- GtkMenuToolButtonPrivate *priv;
+ GtkMenuToolButtonPrivate *priv = button->priv;
GtkWidget *box;
GtkOrientation orientation;
- priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
-
orientation = gtk_tool_item_get_orientation (GTK_TOOL_ITEM (button));
if (orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_container_add (GTK_CONTAINER (button), priv->box);
gtk_widget_show_all (priv->box);
+ gtk_button_set_relief (GTK_BUTTON (priv->arrow_button),
+ gtk_tool_item_get_relief_style (GTK_TOOL_ITEM (button)));
+
gtk_widget_queue_resize (GTK_WIDGET (button));
}
GTK_TOOL_ITEM_CLASS (parent_class)->toolbar_reconfigured (toolitem);
}
+static void
+gtk_menu_tool_button_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
+{
+ GtkMenuToolButton *button = GTK_MENU_TOOL_BUTTON (widget);
+ GtkMenuToolButtonPrivate *priv = button->priv;
+
+ if (!GTK_WIDGET_IS_SENSITIVE (widget) && priv->menu)
+ {
+ gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
+ }
+}
+
static void
gtk_menu_tool_button_set_property (GObject *object,
guint prop_id,
gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass)
{
GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
GtkToolItemClass *toolitem_class;
GtkToolButtonClass *toolbutton_class;
parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *)klass;
+ widget_class = (GtkWidgetClass *)klass;
toolitem_class = (GtkToolItemClass *)klass;
toolbutton_class = (GtkToolButtonClass *)klass;
object_class->set_property = gtk_menu_tool_button_set_property;
object_class->get_property = gtk_menu_tool_button_get_property;
object_class->finalize = gtk_menu_tool_button_finalize;
+ widget_class->state_changed = gtk_menu_tool_button_state_changed;
toolitem_class->set_tooltip = gtk_menu_tool_button_set_tooltip;
toolitem_class->toolbar_reconfigured = gtk_menu_tool_button_toolbar_reconfigured;
P_("Menu"),
P_("The dropdown menu"),
GTK_TYPE_MENU,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GtkMenuToolButtonPrivate));
}
-static void
-button_state_changed_cb (GtkWidget *widget,
- GtkStateType previous_state,
- GtkMenuToolButton *button)
-{
- GtkMenuToolButtonPrivate *priv;
- GtkWidget *other;
- GtkStateType state = GTK_WIDGET_STATE (widget);
-
- priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
-
- other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
-
- g_signal_handlers_block_by_func (other,
- G_CALLBACK (button_state_changed_cb),
- button);
-
- if (state == GTK_STATE_PRELIGHT)
- {
- gtk_widget_set_state (other, state);
- }
- else if (state == GTK_STATE_NORMAL)
- {
- gtk_widget_set_state (other, state);
- }
- else if (state == GTK_STATE_ACTIVE ||
- (state == GTK_STATE_INSENSITIVE && other == priv->arrow_button))
- {
- gtk_widget_set_state (other, GTK_STATE_NORMAL);
- }
-
- if (state == GTK_STATE_INSENSITIVE && other == priv->arrow_button && button->priv->menu)
- {
- gtk_menu_shell_deactivate (GTK_MENU_SHELL (button->priv->menu));
- }
-
- g_signal_handlers_unblock_by_func (other,
- G_CALLBACK (button_state_changed_cb),
- button);
-}
-
static void
menu_position_func (GtkMenu *menu,
int *x,
gboolean *push_in,
GtkMenuToolButton *button)
{
- GtkMenuToolButtonPrivate *priv;
+ GtkMenuToolButtonPrivate *priv = button->priv;
GtkRequisition req;
GtkRequisition menu_req;
GtkOrientation orientation;
GtkTextDirection direction;
- priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
-
gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
gtk_widget_size_request (priv->arrow_button, &req);
gtk_widget_size_request (GTK_WIDGET (priv->menu), &menu_req);
popup_menu_under_arrow (GtkMenuToolButton *button,
GdkEventButton *event)
{
- GtkMenuToolButtonPrivate *priv;
-
- priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
+ GtkMenuToolButtonPrivate *priv = button->priv;
g_signal_emit (button, signals[SHOW_MENU], 0);
arrow_button_toggled_cb (GtkToggleButton *togglebutton,
GtkMenuToolButton *button)
{
- GtkMenuToolButtonPrivate *priv;
-
- priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
+ GtkMenuToolButtonPrivate *priv = button->priv;
if (!priv->menu)
return;
GdkEventButton *event,
GtkMenuToolButton *button)
{
- popup_menu_under_arrow (button, event);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ if (event->button == 1)
+ {
+ popup_menu_under_arrow (button, event);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
- return TRUE;
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
}
static void
arrow_button = gtk_toggle_button_new ();
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
- gtk_button_set_relief (GTK_BUTTON (arrow_button), GTK_RELIEF_NONE);
gtk_container_add (GTK_CONTAINER (arrow_button), arrow);
gtk_box_pack_end (GTK_BOX (box), arrow_button,
FALSE, FALSE, 0);
button->priv->arrow_button = arrow_button;
button->priv->box = box;
- g_signal_connect (real_button, "state_changed",
- G_CALLBACK (button_state_changed_cb), button);
- g_signal_connect (arrow_button, "state_changed",
- G_CALLBACK (button_state_changed_cb), button);
g_signal_connect (arrow_button, "toggled",
G_CALLBACK (arrow_button_toggled_cb), button);
g_signal_connect (arrow_button, "button_press_event",
g_return_val_if_fail (stock_id != NULL, NULL);
button = g_object_new (GTK_TYPE_MENU_TOOL_BUTTON,
- "stock_id", stock_id,
+ "stock-id", stock_id,
NULL);
return GTK_TOOL_ITEM (button);
}
/**
- * gtk_menu_tool_set_arrow_tooltip:
+ * gtk_menu_tool_button_set_arrow_tooltip:
* @button: a #GtkMenuToolButton
* @tooltips: the #GtkTooltips object to be used
* @tip_text: text to be used as tooltip text for tool_item
gtk_tooltips_set_tip (tooltips, button->priv->arrow_button, tip_text, tip_private);
}
+#define __GTK_MENU_TOOL_BUTTON_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff