X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenubar.h;h=5dc792f33dd4a55b720298248c89bb2bc63e477b;hb=f076b6bb0284b59de67d5be8d53a14b5bb32e119;hp=8af5b9699585e8a6cf9446481258ba268b2e4163;hpb=e5d1ea8cfefac95f9011fffcff66345e4d2de70d;p=~andy%2Fgtk

diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 8af5b9699..5dc792f33 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -12,45 +12,47 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_MENU_BAR_H__
 #define __GTK_MENU_BAR_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenushell.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define	GTK_TYPE_MENU_BAR               (gtk_menu_bar_get_type ())
-#define GTK_MENU_BAR(obj)               (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
-#define GTK_MENU_BAR_CLASS(klass)       (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-#define GTK_IS_MENU_BAR(obj)            (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_BAR))
-#define GTK_IS_MENU_BAR_CLASS(klass)    (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
-#define GTK_MENU_BAR_GET_CLASS(obj)     (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-
+#define GTK_MENU_BAR(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
+#define GTK_MENU_BAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
+#define GTK_IS_MENU_BAR(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_BAR))
+#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
@@ -65,18 +67,24 @@ struct _GtkMenuBarClass
 };
 
 
-GtkType    gtk_menu_bar_get_type        (void) G_GNUC_CONST;
+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,
+						  GtkPackDirection  pack_dir);
+GtkPackDirection gtk_menu_bar_get_child_pack_direction (GtkMenuBar       *menubar);
+void             gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
+							GtkPackDirection  child_pack_dir);
+
+/* Private functions */
+void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
+				GtkDirectionType  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 */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_MENU_BAR_H__ */