* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#define GTK_MENU_INTERNALS
-
#include "config.h"
+
+#include "gtkmenubar.h"
+
#include "gdk/gdkkeysyms.h"
#include "gtkbindings.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenubar.h"
#include "gtkmenuitem.h"
+#include "gtkmenuprivate.h"
#include "gtksettings.h"
-#include "gtkintl.h"
+#include "gtksizerequest.h"
#include "gtkwindow.h"
-#include "gtkprivate.h"
-#include "gtkalias.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
#define BORDER_SPACING 0
#define DEFAULT_IPADDING 1
PROP_CHILD_PACK_DIRECTION
};
-typedef struct _GtkMenuBarPrivate GtkMenuBarPrivate;
struct _GtkMenuBarPrivate
{
GtkPackDirection pack_direction;
GtkPackDirection child_pack_direction;
};
-#define GTK_MENU_BAR_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_MENU_BAR, GtkMenuBarPrivate))
-
static void gtk_menu_bar_set_property (GObject *object,
guint prop_id,
GParamSpec *pspec);
static void gtk_menu_bar_size_request (GtkWidget *widget,
GtkRequisition *requisition);
+static void gtk_menu_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_menu_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_menu_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_menu_bar_paint (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_menu_bar_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gint gtk_menu_bar_draw (GtkWidget *widget,
+ cairo_t *cr);
static void gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
GtkWidget *old_toplevel);
static gint gtk_menu_bar_get_popup_delay (GtkMenuShell *menu_shell);
gobject_class->get_property = gtk_menu_bar_get_property;
gobject_class->set_property = gtk_menu_bar_set_property;
- widget_class->size_request = gtk_menu_bar_size_request;
+ widget_class->get_preferred_width = gtk_menu_bar_get_preferred_width;
+ widget_class->get_preferred_height = gtk_menu_bar_get_preferred_height;
widget_class->size_allocate = gtk_menu_bar_size_allocate;
- widget_class->expose_event = gtk_menu_bar_expose;
+ widget_class->draw = gtk_menu_bar_draw;
widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
menu_shell_class->submenu_placement = GTK_TOP_BOTTOM;
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
- GDK_Left, 0,
- "move_current", 1,
+ GDK_KEY_Left, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Left, 0,
- "move_current", 1,
+ GDK_KEY_KP_Left, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
- GDK_Right, 0,
- "move_current", 1,
+ GDK_KEY_Right, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Right, 0,
- "move_current", 1,
+ GDK_KEY_KP_Right, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
- GDK_Up, 0,
- "move_current", 1,
+ GDK_KEY_Up, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Up, 0,
- "move_current", 1,
+ GDK_KEY_KP_Up, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
- GDK_Down, 0,
- "move_current", 1,
+ GDK_KEY_Down, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Down, 0,
- "move_current", 1,
+ GDK_KEY_KP_Down, 0,
+ "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
/**
* GtkMenuBar:child-pack-direction:
*
- * The pack direction of the menubar. It determines how
+ * The child pack direction of the menubar. It determines how
* the widgets contained in child menuitems are arranged.
*
* Since: 2.8
DEFAULT_IPADDING,
GTK_PARAM_READABLE));
- gtk_settings_install_property (g_param_spec_int ("gtk-menu-bar-popup-delay",
- P_("Delay before drop down menus appear"),
- P_("Delay before the submenus of a menu bar appear"),
- 0,
- G_MAXINT,
- 0,
- GTK_PARAM_READWRITE));
-
- g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));
+ g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));
}
static void
-gtk_menu_bar_init (GtkMenuBar *object)
+gtk_menu_bar_init (GtkMenuBar *menu_bar)
{
+ menu_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_bar,
+ GTK_TYPE_MENU_BAR,
+ GtkMenuBarPrivate);
}
GtkWidget*
gint nchildren;
GtkRequisition child_requisition;
gint ipadding;
+ guint border_width;
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (requisition != NULL);
requisition->width = 0;
requisition->height = 0;
- if (GTK_WIDGET_VISIBLE (widget))
+ if (gtk_widget_get_visible (widget))
{
menu_bar = GTK_MENU_BAR (widget);
menu_shell = GTK_MENU_SHELL (widget);
- priv = GTK_MENU_BAR_GET_PRIVATE (menu_bar);
+ priv = menu_bar->priv;
nchildren = 0;
children = menu_shell->children;
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
gint toggle_size;
GTK_MENU_ITEM (child)->show_submenu_indicator = FALSE;
- gtk_widget_size_request (child, &child_requisition);
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
}
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
-
- requisition->width += (GTK_CONTAINER (menu_bar)->border_width +
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
+ requisition->width += (border_width +
ipadding +
BORDER_SPACING) * 2;
- requisition->height += (GTK_CONTAINER (menu_bar)->border_width +
+ requisition->height += (border_width +
ipadding +
BORDER_SPACING) * 2;
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
- requisition->width += widget->style->xthickness * 2;
- requisition->height += widget->style->ythickness * 2;
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (widget);
+ requisition->width += style->xthickness * 2;
+ requisition->height += style->ythickness * 2;
}
}
}
+static void
+gtk_menu_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ gtk_menu_bar_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_menu_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ gtk_menu_bar_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.height;
+}
+
static void
gtk_menu_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
GtkTextDirection direction;
gint ltr_x, ltr_y;
gint ipadding;
+ guint border_width;
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (allocation != NULL);
menu_bar = GTK_MENU_BAR (widget);
menu_shell = GTK_MENU_SHELL (widget);
- priv = GTK_MENU_BAR_GET_PRIVATE (menu_bar);
+ priv = menu_bar->priv;
direction = gtk_widget_get_direction (widget);
- widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (widget->window,
+ gtk_widget_set_allocation (widget, allocation);
+
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->y,
allocation->width, allocation->height);
if (menu_shell->children)
{
- child_allocation.x = (GTK_CONTAINER (menu_bar)->border_width +
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
+ child_allocation.x = (border_width +
ipadding +
BORDER_SPACING);
- child_allocation.y = (GTK_CONTAINER (menu_bar)->border_width +
+ child_allocation.y = (border_width +
BORDER_SPACING);
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
- child_allocation.x += widget->style->xthickness;
- child_allocation.y += widget->style->ythickness;
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (widget);
+ child_allocation.x += style->xthickness;
+ child_allocation.y += style->ythickness;
}
if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
- gtk_widget_get_child_requisition (child, &child_requisition);
-
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
child_requisition.width += toggle_size;
ltr_x = allocation->width -
child_requisition.width - offset;
}
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
if ((direction == GTK_TEXT_DIR_LTR) == (priv->pack_direction == GTK_PACK_DIRECTION_LTR))
child_allocation.x = ltr_x;
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
- gtk_widget_get_child_requisition (child, &child_requisition);
-
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
child_requisition.width += toggle_size;
ltr_y = allocation->height -
child_requisition.height - offset;
}
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
if ((direction == GTK_TEXT_DIR_LTR) ==
(priv->pack_direction == GTK_PACK_DIRECTION_TTB))
}
}
-static void
-gtk_menu_bar_paint (GtkWidget *widget,
- GdkRectangle *area)
-{
- g_return_if_fail (GTK_IS_MENU_BAR (widget));
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- gint border;
-
- border = GTK_CONTAINER (widget)->border_width;
-
- gtk_paint_box (widget->style,
- widget->window,
- GTK_WIDGET_STATE (widget),
- get_shadow_type (GTK_MENU_BAR (widget)),
- area, widget, "menubar",
- border, border,
- widget->allocation.width - border * 2,
- widget->allocation.height - border * 2);
- }
-}
-
static gint
-gtk_menu_bar_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_menu_bar_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- g_return_val_if_fail (GTK_IS_MENU_BAR (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ int border;
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- gtk_menu_bar_paint (widget, &event->area);
+ border = gtk_container_get_border_width (GTK_CONTAINER (widget));
- (* GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->expose_event) (widget, event);
- }
+ gtk_paint_box (gtk_widget_get_style (widget),
+ cr,
+ gtk_widget_get_state (widget),
+ get_shadow_type (GTK_MENU_BAR (widget)),
+ widget, "menubar",
+ border, border,
+ gtk_widget_get_allocated_width (widget) - border * 2,
+ gtk_widget_get_allocated_height (widget) - border * 2);
+
+ GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->draw (widget, cr);
return FALSE;
}
while (widget)
{
- if (!GTK_WIDGET_MAPPED (widget))
+ if (!gtk_widget_get_mapped (widget))
viewable = FALSE;
-
- widget = widget->parent;
+
+ widget = gtk_widget_get_parent (widget);
}
if (viewable)
{
GtkMenuShell *menu_shell = GTK_MENU_SHELL (menubars->data);
+ _gtk_menu_shell_set_keyboard_mode (menu_shell, TRUE);
_gtk_menu_shell_activate (menu_shell);
gtk_menu_shell_select_first (menu_shell, FALSE);
if (!menubars)
{
g_signal_connect (window,
- "key_press_event",
+ "key-press-event",
G_CALLBACK (window_key_press_handler),
NULL);
}
if (old_toplevel)
remove_from_window (GTK_WINDOW (old_toplevel), menubar);
- if (GTK_WIDGET_TOPLEVEL (toplevel))
+ if (gtk_widget_is_toplevel (toplevel))
add_to_window (GTK_WINDOW (toplevel), menubar);
}
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menubar));
GtkMenuItem *to_activate = NULL;
- if (GTK_WIDGET_TOPLEVEL (toplevel))
+ if (gtk_widget_is_toplevel (toplevel))
{
GList *tmp_menubars = get_viewable_menu_bars (GTK_WINDOW (toplevel));
GList *menubars;
* gtk_menu_bar_get_pack_direction:
* @menubar: a #GtkMenuBar
*
- * Retrieves the current pack direction of the menubar. See
- * gtk_menu_bar_set_pack_direction().
+ * Retrieves the current pack direction of the menubar.
+ * See gtk_menu_bar_set_pack_direction().
*
* Return value: the pack direction
*
* Since: 2.8
- **/
+ */
GtkPackDirection
gtk_menu_bar_get_pack_direction (GtkMenuBar *menubar)
{
- GtkMenuBarPrivate *priv;
-
g_return_val_if_fail (GTK_IS_MENU_BAR (menubar),
GTK_PACK_DIRECTION_LTR);
-
- priv = GTK_MENU_BAR_GET_PRIVATE (menubar);
- return priv->pack_direction;
+ return menubar->priv->pack_direction;
}
/**
* gtk_menu_bar_set_pack_direction:
- * @menubar: a #GtkMenuBar.
- * @pack_dir: a new #GtkPackDirection.
+ * @menubar: a #GtkMenuBar
+ * @pack_dir: a new #GtkPackDirection
*
* Sets how items should be packed inside a menubar.
*
* Since: 2.8
- **/
+ */
void
gtk_menu_bar_set_pack_direction (GtkMenuBar *menubar,
GtkPackDirection pack_dir)
g_return_if_fail (GTK_IS_MENU_BAR (menubar));
- priv = GTK_MENU_BAR_GET_PRIVATE (menubar);
+ priv = menubar->priv;
if (priv->pack_direction != pack_dir)
{
* gtk_menu_bar_get_child_pack_direction:
* @menubar: a #GtkMenuBar
*
- * Retrieves the current child pack direction of the menubar. See
- * gtk_menu_bar_set_child_pack_direction().
+ * Retrieves the current child pack direction of the menubar.
+ * See gtk_menu_bar_set_child_pack_direction().
*
* Return value: the child pack direction
*
* Since: 2.8
- **/
+ */
GtkPackDirection
gtk_menu_bar_get_child_pack_direction (GtkMenuBar *menubar)
{
- GtkMenuBarPrivate *priv;
-
g_return_val_if_fail (GTK_IS_MENU_BAR (menubar),
GTK_PACK_DIRECTION_LTR);
-
- priv = GTK_MENU_BAR_GET_PRIVATE (menubar);
- return priv->child_pack_direction;
+ return menubar->priv->child_pack_direction;
}
/**
* gtk_menu_bar_set_child_pack_direction:
- * @menubar: a #GtkMenuBar.
- * @child_pack_dir: a new #GtkPackDirection.
+ * @menubar: a #GtkMenuBar
+ * @child_pack_dir: a new #GtkPackDirection
*
* Sets how widgets should be packed inside the children of a menubar.
*
* Since: 2.8
- **/
+ */
void
gtk_menu_bar_set_child_pack_direction (GtkMenuBar *menubar,
GtkPackDirection child_pack_dir)
g_return_if_fail (GTK_IS_MENU_BAR (menubar));
- priv = GTK_MENU_BAR_GET_PRIVATE (menubar);
+ priv = menubar->priv;
if (priv->child_pack_direction != child_pack_dir)
{
g_object_notify (G_OBJECT (menubar), "child-pack-direction");
}
}
-
-#define __GTK_MENU_BAR_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff