changes related to OS X main menu & accelerators, plus osx_build script

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2514 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index cc94dc155f08bb82ee1943344fc683d00e6b2273..edc289a5934509821971f3517d73ec59336fdbc8 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -34,7 +34,7 @@
 
 using namespace PBD;
 
-#define KBD_DEBUG 1
+#define KBD_DEBUG 0
 bool debug_keyboard = false;
 
 guint Keyboard::edit_but = 3;

diff --git a/gtk2_ardour/sync-menu.c b/gtk2_ardour/sync-menu.c
index c471c7f90bb05105d584274850701fdbb808124e..72dffc673f9014ea7b0420aef6e635678a928548 100644 (file)
--- a/gtk2_ardour/sync-menu.c
+++ b/gtk2_ardour/sync-menu.c
@@ -547,7 +547,7 @@ menu_event_handler_func (EventHandlerCallRef  event_handler_call_ref,
          /* This is called when an item is selected (what is the
           * GTK+ term? prelight?)
           */
-         //g_print ("kEventClassMenu/kEventMenuTargetItem\n");
+         //g_print ("kEventClassMenu/kEventMenuTargetItem\n");
          break;
 
        case kEventMenuOpening:

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 51d60bc9985e8166ff3aea46d8287c301727ec8e..1904df251e5589c2269301f8bad2b53d45d1822d 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -334,6 +334,12 @@ set_color (Gdk::Color& c, int rgb)
        c.set_rgb((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256);
 }
 
+#ifdef GTKOSX
+extern "C" {
+       gboolean gdk_quartz_possibly_forward (GdkEvent*);
+}
+#endif
+
 bool
 key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 {
@@ -345,7 +351,6 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 #ifdef  DEBUG_ACCELERATOR_HANDLING
        bool debug = (getenv ("ARDOUR_DEBUG_ACCELERATOR_HANDLING") != 0);
 #endif
-
        if (focus) {
                if (GTK_IS_ENTRY(focus) || Keyboard::some_magic_widget_has_focus()) {
                        special_handling_of_unmodified_accelerators = true;
@@ -440,6 +445,11 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
                if (debug) {
                        cerr << "\tactivate, then propagate\n";
                }
+#endif
+#ifdef GTKOSX
+               if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
+                       return true;
+               }
 #endif
                if (!gtk_window_activate_key (win, ev)) {
                        return gtk_window_propagate_key_event (win, ev);
@@ -465,6 +475,11 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
                if (debug) {
                        cerr << "\tpropagation didn't handle, so activate\n";
                }
+#endif
+#ifdef GTKOSX
+               if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
+                       return true;
+               }
 #endif
                return gtk_window_activate_key (win, ev);
        } else {

diff --git a/svn_revision.h b/svn_revision.h
index ffbb0e94bd39de59165ff7960724be98b2f80076..0fe81018062bcd322b11e85970751357daa04d51 100644 (file)
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
 #ifndef __ardour_svn_revision_h__
 #define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "2496";
+static const char* ardour_svn_revision = "2513";
 #endif

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index f6fde43e1ed44a58242195217ef693fd5931263c..d0f65f8058fbe287725c0c7814e37350f06e8a0b 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -7,6 +7,7 @@ GTKQUARTZ_ROOT=/opt/gtk
 SAE=
 WITH_JACK=1
 WITH_LADSPA=1
+STRIP=1
 
 while [ $# -gt 0 ] ; do
     echo "arg = $1"
@@ -14,6 +15,7 @@ while [ $# -gt 0 ] ; do
        --sae) SAE=1 ; shift ;;
        --nojack) WITH_JACK= ; shift ;;
        --noladpsa) WITH_LADSPA= ; shift ;;
+       --nostrip) STRIP= ; shift ;;
     esac
 done
 
@@ -66,7 +68,9 @@ cp -R Resources $APPROOT
 
 echo "Copying ardour executable ...."
 cp ../../gtk2_ardour/ardour-$version $APPROOT/MacOS/Ardour2
-strip $APPROOT/MacOS/Ardour2
+if test x$STRIP != x ; then
+    strip $APPROOT/MacOS/Ardour2
+fi
 if test x$WITH_JACK != x ; then
     cp /usr/local/lib/jack/jack_coreaudio.so $Frameworks
     cp /usr/local/bin/jackd $APPROOT/MacOS