X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenu.h;h=d6843eba21595de962d28528a1bc236f5c0f3e81;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=fbb887b953ecb2030d6e9013fc89e3caacedd1d0;hpb=92ededc9b4160898de6c2b920102716f359c3def;p=~andy%2Fgtk
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index fbb887b95..d6843eba2 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,14 +22,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_MENU_H__
#define __GTK_MENU_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
#include
@@ -46,68 +44,61 @@ G_BEGIN_DECLS
#define GTK_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
-typedef struct _GtkMenu GtkMenu;
-typedef struct _GtkMenuClass GtkMenuClass;
-
+typedef struct _GtkMenu GtkMenu;
+typedef struct _GtkMenuClass GtkMenuClass;
+typedef struct _GtkMenuPrivate GtkMenuPrivate;
+
+/**
+ * GtkMenuPositionFunc:
+ * @menu: a #GtkMenu.
+ * @x: (out): address of the #gint representing the horizontal
+ * position where the menu shall be drawn.
+ * @y: (out): address of the #gint representing the vertical position
+ * where the menu shall be drawn. This is an output parameter.
+ * @push_in: (out): This parameter controls how menus placed outside
+ * the monitor are handled. If this is set to %TRUE and part of
+ * the menu is outside the monitor then GTK+ pushes the window
+ * into the visible area, effectively modifying the popup
+ * position. Note that moving and possibly resizing the menu
+ * around will alter the scroll position to keep the menu items
+ * "in place", i.e. at the same monitor position they would have
+ * been without resizing. In practice, this behavior is only
+ * useful for combobox popups or option menus and cannot be used
+ * to simply confine a menu to monitor boundaries. In that case,
+ * changing the scroll offset is not desirable.
+ * @user_data: the data supplied by the user in the gtk_menu_popup()
+ * @data parameter.
+ *
+ * A user function supplied when calling gtk_menu_popup() which
+ * controls the positioning of the menu when it is displayed. The
+ * function sets the @x and @y parameters to the coordinates where the
+ * menu is to be drawn. To make the menu appear on a different
+ * monitor than the mouse pointer, gtk_menu_set_monitor() must be
+ * called.
+ */
typedef void (*GtkMenuPositionFunc) (GtkMenu *menu,
gint *x,
gint *y,
gboolean *push_in,
gpointer user_data);
+
+/**
+ * GtkMenuDetachFunc:
+ * @attach_widget: the #GtkWidget that the menu is being detached from.
+ * @menu: the #GtkMenu being detached.
+ *
+ * A user function supplied when calling gtk_menu_attach_to_widget() which
+ * will be called when the menu is later detached from the widget.
+ */
typedef void (*GtkMenuDetachFunc) (GtkWidget *attach_widget,
GtkMenu *menu);
struct _GtkMenu
{
- GtkMenuShell GSEAL (menu_shell);
-
- GtkWidget *GSEAL (parent_menu_item);
- GtkWidget *GSEAL (old_active_menu_item);
-
- GtkAccelGroup *GSEAL (accel_group);
- gchar *GSEAL (accel_path);
- GtkMenuPositionFunc GSEAL (position_func);
- gpointer GSEAL (position_func_data);
-
- guint GSEAL (toggle_size);
- /* Do _not_ touch these widgets directly. We hide the reference
- * count from the toplevel to the menu, so it must be restored
- * before operating on these widgets
- */
- GtkWidget *GSEAL (toplevel);
-
- GtkWidget *GSEAL (tearoff_window);
- GtkWidget *GSEAL (tearoff_hbox);
- GtkWidget *GSEAL (tearoff_scrollbar);
- GtkAdjustment *GSEAL (tearoff_adjustment);
-
- GdkWindow *GSEAL (view_window);
- GdkWindow *GSEAL (bin_window);
-
- gint GSEAL (scroll_offset);
- gint GSEAL (saved_scroll_offset);
- gint GSEAL (scroll_step);
- guint GSEAL (timeout_id);
-
- /* When a submenu of this menu is popped up, motion in this
- * region is ignored
- */
- cairo_region_t *GSEAL (navigation_region); /* unused */
- guint GSEAL (navigation_timeout);
-
- guint GSEAL (needs_destruction_ref_count) : 1;
- guint GSEAL (torn_off) : 1;
- /* The tearoff is active when it is torn off and the not-torn-off
- * menu is not popped up.
- */
- guint GSEAL (tearoff_active) : 1;
-
- guint GSEAL (scroll_fast) : 1;
-
- guint GSEAL (upper_arrow_visible) : 1;
- guint GSEAL (lower_arrow_visible) : 1;
- guint GSEAL (upper_arrow_prelight) : 1;
- guint GSEAL (lower_arrow_prelight) : 1;
+ GtkMenuShell menu_shell;
+
+ /*< private >*/
+ GtkMenuPrivate *priv;
};
struct _GtkMenuClass
@@ -124,6 +115,8 @@ struct _GtkMenuClass
GType gtk_menu_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_menu_new (void);
+GDK_AVAILABLE_IN_3_4
+GtkWidget* gtk_menu_new_from_model (GMenuModel *model);
/* Display the menu onscreen */
void gtk_menu_popup (GtkMenu *menu,
@@ -155,7 +148,7 @@ void gtk_menu_popdown (GtkMenu *menu);
*/
GtkWidget* gtk_menu_get_active (GtkMenu *menu);
void gtk_menu_set_active (GtkMenu *menu,
- guint index_);
+ guint index);
/* set/get the accelerator group that holds global accelerators (should
* be added to the corresponding toplevel with gtk_window_add_accel_group().
@@ -189,9 +182,9 @@ gboolean gtk_menu_get_tearoff_state (GtkMenu *menu);
/* This sets the window manager title for the window that
* appears when a menu is torn off
*/
-void gtk_menu_set_title (GtkMenu *menu,
- const gchar *title);
-G_CONST_RETURN gchar *gtk_menu_get_title (GtkMenu *menu);
+void gtk_menu_set_title (GtkMenu *menu,
+ const gchar *title);
+const gchar * gtk_menu_get_title (GtkMenu *menu);
void gtk_menu_reorder_child (GtkMenu *menu,
GtkWidget *child,