Changeset 2b3ff5f1d4533d28a6309e5e780c4a1a80d18e10

Timestamp:

08/26/08 13:48:44 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

e1624d68b9dc680736c70f027849a9ccbd38b00f

Children:

599632fc9a2f107fdb03fd25026ff907ccd2b48b

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-08-26T13:48:44Z+0200

Message:

Only use ige-mac-intergration if we are running natively on Mac OS X

2008-08-26 Armin Burgmeier <armin@…>

• src/header.cpp: Only use the ige-mac-intergration if we are running natively on Mac OS X.

• configure.ac: Define OSX_NATIVE if we do so.

Files:

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

ChangeLog

@@ +1 @@
+2008-08-26  Armin Burgmeier  <armin@arbur.net>
+
+        * src/header.cpp: Only use the ige-mac-intergration if we are running
+        natively on Mac OS X.
+
+        * configure.ac: Define OSX_NATIVE if we do so.
+
 2008-08-13  Armin Burgmeier  <armin@arbur.net>
 

configure.ac

@@ -42 +42 @@
   target=`pkg-config --variable=target gtk+-2.0`
   if test "$target" = "quartz" ; then
+    AC_DEFINE([OSX_NATIVE], 1, [Define whether we are running natively on Mac OS X (using the quartz GDK backend)])
     required_libs="$required_libs ige-mac-integration"
   fi

src/header.cpp

@@ -25 +25 @@
 #include "icon.hpp"
 
-#ifdef OSX
+#include "features.hpp"
+
+#ifdef OSX_NATIVE
 #include <ige-mac-menu.h>
 #endif
@@ -725 +727 @@
                 );
         }
-#ifdef OSX
+#ifdef OSX_NATIVE
         ige_mac_menu_set_menu_bar(GTK_MENU_SHELL (m_menubar->gobj()));