2 files changed, 58 insertions, 16 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/sync-menu.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h
index 2be5e71d02..6b3e7850be 100644
--- a/libs/gtkmm2ext/gtkmm2ext/sync-menu.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h
@@ -1,10 +1,9 @@
-/* GTK+ Integration for the Mac OS X Menubar.
+/* GTK+ Integration with platform-specific application-wide features 
+ * such as the OS X menubar and application delegate concepts.
  *
  * Copyright (C) 2007 Pioneer Research Center USA, Inc.
  * Copyright (C) 2007 Imendio AB
- *
- * For further information, see:
- * http://developer.imendio.com/projects/gtk-macosx/menubar
+ * Copyright (C) 2009 Paul Davis
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,23 +21,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __IGE_MAC_MENU_H__
-#define __IGE_MAC_MENU_H__
+#ifndef __GTK_APPLICATION_PRIVATE_H__
+#define __GTK_APPLICATION_PRIVATE_H__
 
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-typedef struct _IgeMacMenuGroup IgeMacMenuGroup;
-
-void              ige_mac_menu_set_menu_bar       (GtkMenuShell    *menu_shell);
-void              ige_mac_menu_set_quit_menu_item (GtkMenuItem     *menu_item);
-
-IgeMacMenuGroup * ige_mac_menu_add_app_menu_group (void);
-void              ige_mac_menu_add_app_menu_item  (IgeMacMenuGroup *group,
-						   GtkMenuItem     *menu_item,
-						   const gchar     *label);
+struct _GtkApplicationMenuGroup
+{
+  GList *items;
+};
 
 G_END_DECLS
 
-#endif /* __IGE_MAC_MENU_H__ */
+#endif /* __GTK_APPLICATION_PRIVATE_H__ */
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h
new file mode 100644
index 0000000000..08c3a84588
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h
@@ -0,0 +1,48 @@
+/* GTK+ Integration with platform-specific application-wide features 
+ * such as the OS X menubar and application delegate concepts.
+ *
+ * Copyright (C) 2007 Pioneer Research Center USA, Inc.
+ * Copyright (C) 2007 Imendio AB
+ * Copyright (C) 2009 Paul Davis
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1
+ * of the License.
+ *
+ * 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
+ * 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.
+ */
+
+#ifndef __GTK_APPLICATION_H__
+#define __GTK_APPLICATION_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GtkApplicationMenuGroup GtkApplicationMenuGroup;
+
+int  gtk_application_init ();
+void gtk_application_cleanup ();
+
+void                      gtk_application_set_menu_bar       (GtkMenuShell    *menu_shell);
+GtkApplicationMenuGroup * gtk_application_add_app_menu_group (void);
+void                      gtk_application_add_app_menu_item   (GtkApplicationMenuGroup *group,
+							       GtkMenuItem     *menu_item,
+							       const gchar     *label);
+
+/* these are private but here until GtkApplication becomes a GtkObject with an interface */
+
+extern GList *_gtk_application_menu_groups;
+
+G_END_DECLS
+
+#endif /* __GTK_APPLICATION_H__ */