X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenushell.h;h=c3bd8797e4c36a1e63fbed35890d8eba86dce85e;hb=aaedf5a35219b034a244730564b8fdf2b7d32540;hp=705f0eab5748432f38b2b3252ecd3b53785d7483;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index 705f0eab5..c3bd8797e 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
@@ -8,13 +8,11 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 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,113 +22,102 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_MENU_SHELL_H__
#define __GTK_MENU_SHELL_H__
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
G_BEGIN_DECLS
-#define GTK_TYPE_MENU_SHELL (gtk_menu_shell_get_type ())
-#define GTK_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
-#define GTK_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-#define GTK_IS_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL))
-#define GTK_IS_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
+#define GTK_TYPE_MENU_SHELL (gtk_menu_shell_get_type ())
+#define GTK_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
+#define GTK_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
+#define GTK_IS_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL))
+#define GTK_IS_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
#define GTK_MENU_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-typedef struct _GtkMenuShell GtkMenuShell;
-typedef struct _GtkMenuShellClass GtkMenuShellClass;
+typedef struct _GtkMenuShell GtkMenuShell;
+typedef struct _GtkMenuShellClass GtkMenuShellClass;
+typedef struct _GtkMenuShellPrivate GtkMenuShellPrivate;
struct _GtkMenuShell
{
GtkContainer container;
- GList *GSEAL (children);
- GtkWidget *GSEAL (active_menu_item);
- GtkWidget *GSEAL (parent_menu_shell);
-
- guint GSEAL (button);
- guint32 GSEAL (activate_time);
-
- guint GSEAL (active) : 1;
- guint GSEAL (have_grab) : 1;
- guint GSEAL (have_xgrab) : 1;
- guint GSEAL (ignore_leave) : 1; /* unused */
- guint GSEAL (menu_flag) : 1; /* unused */
- guint GSEAL (ignore_enter) : 1;
+ /*< private >*/
+ GtkMenuShellPrivate *priv;
};
struct _GtkMenuShellClass
{
GtkContainerClass parent_class;
-
+
guint submenu_placement : 1;
-
- void (*deactivate) (GtkMenuShell *menu_shell);
- void (*selection_done) (GtkMenuShell *menu_shell);
-
- void (*move_current) (GtkMenuShell *menu_shell,
- GtkMenuDirectionType direction);
- void (*activate_current) (GtkMenuShell *menu_shell,
- gboolean force_hide);
- void (*cancel) (GtkMenuShell *menu_shell);
- void (*select_item) (GtkMenuShell *menu_shell,
- GtkWidget *menu_item);
- void (*insert) (GtkMenuShell *menu_shell,
- GtkWidget *child,
- gint position);
- gint (*get_popup_delay) (GtkMenuShell *menu_shell);
- gboolean (*move_selected) (GtkMenuShell *menu_shell,
- gint distance);
+
+ void (*deactivate) (GtkMenuShell *menu_shell);
+ void (*selection_done) (GtkMenuShell *menu_shell);
+
+ void (*move_current) (GtkMenuShell *menu_shell,
+ GtkMenuDirectionType direction);
+ void (*activate_current) (GtkMenuShell *menu_shell,
+ gboolean force_hide);
+ void (*cancel) (GtkMenuShell *menu_shell);
+ void (*select_item) (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item);
+ void (*insert) (GtkMenuShell *menu_shell,
+ GtkWidget *child,
+ gint position);
+ gint (*get_popup_delay) (GtkMenuShell *menu_shell);
+ gboolean (*move_selected) (GtkMenuShell *menu_shell,
+ gint distance);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
-GType gtk_menu_shell_get_type (void) G_GNUC_CONST;
-void gtk_menu_shell_append (GtkMenuShell *menu_shell,
- GtkWidget *child);
-void gtk_menu_shell_prepend (GtkMenuShell *menu_shell,
- GtkWidget *child);
-void gtk_menu_shell_insert (GtkMenuShell *menu_shell,
- GtkWidget *child,
- gint position);
-void gtk_menu_shell_deactivate (GtkMenuShell *menu_shell);
-void gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
- GtkWidget *menu_item);
-void gtk_menu_shell_deselect (GtkMenuShell *menu_shell);
-void gtk_menu_shell_activate_item (GtkMenuShell *menu_shell,
- GtkWidget *menu_item,
- gboolean force_deactivate);
-void gtk_menu_shell_select_first (GtkMenuShell *menu_shell,
- gboolean search_sensitive);
-void _gtk_menu_shell_select_last (GtkMenuShell *menu_shell,
- gboolean search_sensitive);
-void _gtk_menu_shell_activate (GtkMenuShell *menu_shell);
-gint _gtk_menu_shell_get_popup_delay (GtkMenuShell *menu_shell);
-void gtk_menu_shell_cancel (GtkMenuShell *menu_shell);
-
-void _gtk_menu_shell_add_mnemonic (GtkMenuShell *menu_shell,
- guint keyval,
- GtkWidget *target);
-void _gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell,
- guint keyval,
- GtkWidget *target);
-
+GType gtk_menu_shell_get_type (void) G_GNUC_CONST;
+
+void gtk_menu_shell_append (GtkMenuShell *menu_shell,
+ GtkWidget *child);
+void gtk_menu_shell_prepend (GtkMenuShell *menu_shell,
+ GtkWidget *child);
+void gtk_menu_shell_insert (GtkMenuShell *menu_shell,
+ GtkWidget *child,
+ gint position);
+void gtk_menu_shell_deactivate (GtkMenuShell *menu_shell);
+void gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item);
+void gtk_menu_shell_deselect (GtkMenuShell *menu_shell);
+void gtk_menu_shell_activate_item (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item,
+ gboolean force_deactivate);
+void gtk_menu_shell_select_first (GtkMenuShell *menu_shell,
+ gboolean search_sensitive);
+void gtk_menu_shell_cancel (GtkMenuShell *menu_shell);
gboolean gtk_menu_shell_get_take_focus (GtkMenuShell *menu_shell);
void gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
gboolean take_focus);
+GtkWidget *gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell);
+GtkWidget *gtk_menu_shell_get_parent_shell (GtkMenuShell *menu_shell);
+
+GDK_AVAILABLE_IN_3_6
+void gtk_menu_shell_bind_model (GtkMenuShell *menu_shell,
+ GMenuModel *model,
+ const gchar *action_namespace,
+ gboolean with_separators);
+
G_END_DECLS
#endif /* __GTK_MENU_SHELL_H__ */