Patch from Hans-Petter Jansson <hpj@ximian.com> to align the bookmarks

[~andy/gtk] / gtk / gtkmenubar.h

diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index bf76a412fe15573e368f001a0ece095dc593c3aa..f7a1831e64440ac8fff1b5a40416dad88a1aa637 100644 (file)
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -2,20 +2,28 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
+
+/*
+ * 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/. 
+ */
+
 #ifndef __GTK_MENU_BAR_H__
 #define __GTK_MENU_BAR_H__
 
@@ -28,11 +36,13 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#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_TYPE_MENU_BAR               (gtk_menu_bar_get_type ())
+#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;
@@ -41,28 +51,32 @@ typedef struct _GtkMenuBarClass  GtkMenuBarClass;
 struct _GtkMenuBar
 {
   GtkMenuShell menu_shell;
-
-  GtkShadowType shadow_type;
 };
 
 struct _GtkMenuBarClass
 {
   GtkMenuShellClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType    gtk_menu_bar_get_type        (void);
+GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_menu_bar_new             (void);
-void       gtk_menu_bar_append          (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child);
-void       gtk_menu_bar_prepend         (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child);
-void       gtk_menu_bar_insert          (GtkMenuBar    *menu_bar,
-                                        GtkWidget     *child,
-                                        gint           position);
-void       gtk_menu_bar_set_shadow_type (GtkMenuBar    *menu_bar,
-                                        GtkShadowType  type);
 
+#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);
 
 #ifdef __cplusplus
 }