X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenubar.h;h=5dc792f33dd4a55b720298248c89bb2bc63e477b;hb=f076b6bb0284b59de67d5be8d53a14b5bb32e119;hp=04ea6a3d613c3332fbd4270c0a1481aed4156bd7;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 04ea6a3d6..5dc792f33 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.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
@@ -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,15 +22,14 @@
* 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_BAR_H__
#define __GTK_MENU_BAR_H__
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
@@ -46,12 +43,16 @@ G_BEGIN_DECLS
#define GTK_IS_MENU_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
#define GTK_MENU_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-typedef struct _GtkMenuBar GtkMenuBar;
-typedef struct _GtkMenuBarClass GtkMenuBarClass;
+typedef struct _GtkMenuBar GtkMenuBar;
+typedef struct _GtkMenuBarPrivate GtkMenuBarPrivate;
+typedef struct _GtkMenuBarClass GtkMenuBarClass;
struct _GtkMenuBar
{
GtkMenuShell menu_shell;
+
+ /*< private >*/
+ GtkMenuBarPrivate *priv;
};
struct _GtkMenuBarClass
@@ -68,6 +69,8 @@ struct _GtkMenuBarClass
GType gtk_menu_bar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_menu_bar_new (void);
+GDK_AVAILABLE_IN_3_4
+GtkWidget* gtk_menu_bar_new_from_model (GMenuModel *model);
GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar *menubar);
void gtk_menu_bar_set_pack_direction (GtkMenuBar *menubar,
@@ -76,12 +79,6 @@ GtkPackDirection gtk_menu_bar_get_child_pack_direction (GtkMenuBar *menuba
void gtk_menu_bar_set_child_pack_direction (GtkMenuBar *menubar,
GtkPackDirection child_pack_dir);
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_bar_append(menu,child) gtk_menu_shell_append ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_prepend(menu,child) gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_insert(menu,child,pos) gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
/* Private functions */
void _gtk_menu_bar_cycle_focus (GtkMenuBar *menubar,
GtkDirectionType dir);