Changeset 5b455bc1f94c25d4788dc1ba9d50c8de19b29e5b

Timestamp:

06/26/08 00:02:00 (5 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Yarek Tyshchenko <yarek@britishgraphics.co.uk> / 2008-06-26T00:02:00Z+0200

Parents:

6dd2f9c75a3a6fc2ee38db9717e1f2a236d49fda

Children:

6d22f6a41b1d32ed68760f2f5ceb6411cc45c49f

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-06-26T00:02:00Z+0200

Message:

Integrate with global OS X menu bar when compiled natively for OS X

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• src/header.cpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-06-25  Yarek Tyshchenko  <yarek@britishgraphics.co.uk>
+
+        * configure.ac: Require ige-mac-integration when Gobby is complied
+        natively on OS X.
+
+        * src/header.cpp: Integrate the menu bar into the main OS X menu bar.
+
 2008-06-03  Philipp Kern  <phil@0x539.de>
 

configure.ac

@@ -36 +36 @@
 
 required_libs="libxml++-2.6 gtkmm-2.4 >= 2.6.0 gthread-2.0 net6-1.3 obby-0.4 >= 0.4.5"
+
+# Check if we are running on OS X, for special link handling.
+if test "x$build_vendor" = "xapple" ; then
+  AC_DEFINE([OSX], 1, [Define whether we are running on Mac OS X.])
+  target=`pkg-config --variable=target gtk+-2.0`
+  if test "$target" = "quartz" ; then
+    required_libs="$required_libs ige-mac-integration"
+  fi
+fi
+AC_CACHE_SAVE
 
 # GtkSourceView2 support
@@ -106 +116 @@
 AM_CONDITIONAL(WITH_AVAHI, test x$ac_cv_lib_obby_obby_has_avahi = xyes)
 
-# Check if we are running on OS X, for special link handling.
-if test "x$build_vendor" = "xapple" ; then
-  AC_DEFINE([OSX], 1, [Define whether we are running on Mac OS X.])
-fi
-AC_CACHE_SAVE
-
 # Glib i18n/gettext support.
 ALL_LINGUAS="ca de es fr ja ko it pl pt pt_BR ru sv zh_CN"

src/header.cpp

@@ -24 +24 @@
 #include "header.hpp"
 #include "icon.hpp"
-
+#ifdef OSX
+#include "ige-mac-menu.h"
+#endif
 namespace {
         Glib::ustring ui_desc = 
@@ -720 +722 @@
                 );
         }
-
+#ifdef OSX
+        ige_mac_menu_set_menu_bar(GTK_MENU_SHELL (m_menubar->gobj()));
+        
+        ige_mac_menu_set_quit_menu_item(GTK_MENU_ITEM (
+                m_ui_manager->get_widget("/MenuMainBar/MenuApp/AppQuit")->gobj()));
+        
+        ige_mac_menu_add_app_menu_item(ige_mac_menu_add_app_menu_group (),
+                                           GTK_MENU_ITEM (
+                m_ui_manager->get_widget("/MenuMainBar/MenuHelp/HelpAbout")->gobj()),
+                                           NULL);
+
+         ige_mac_menu_add_app_menu_item(ige_mac_menu_add_app_menu_group (),
+                                           GTK_MENU_ITEM (
+                m_ui_manager->get_widget("/MenuMainBar/MenuEdit/EditPreferences")->gobj()),
+                                           NULL);
+#else
         pack_start(*m_menubar, Gtk::PACK_SHRINK);
+#endif
         pack_start(*m_toolbar, Gtk::PACK_SHRINK);
 }