nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place...

[ardour.git] / libs / gtkmm2ext / gtk_ui.cc

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 3ac8e905d1c68d8efdcc4a4dce98ab0de3d1da11..7b60d6ba52b33d5e111d315514609478d3c157dd 100644 (file)
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -65,7 +65,9 @@ UI::UI (string namestr, int *argc, char ***argv)
        : AbstractUI<UIRequest> (namestr, true)
 {
        theMain = new Main (argc, argv);
+#ifndef GTK_NEW_TOOLTIP_API
        tips = new Tooltips;
+#endif
 
        _active = false;
 
@@ -96,6 +98,7 @@ UI::UI (string namestr, int *argc, char ***argv)
 
        errors->dismiss_button().set_name ("ErrorLogCloseButton");
        errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
+       errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
 
        register_thread (pthread_self(), X_("GUI"));
 
@@ -129,7 +132,8 @@ UI::load_rcfile (string path, bool themechange)
        }
        
        RC rc (path.c_str());
-       RC::reset_styles(Gtk::Settings::get_default());
+       // RC::reset_styles (Gtk::Settings::get_default());
+       gtk_rc_reset_styles (gtk_settings_get_default());
        theme_changed.emit();
 
        if (themechange) {
@@ -337,7 +341,7 @@ UI::signal_pipe_callback (void *arg, int fd, GdkInputCondition cond)
        
        /* flush (nonblocking) pipe */
        
-       while (read (fd, buf, 256) > 0);
+       while (read (fd, buf, 256) > 0) {}
        
        ((UI *) arg)->handle_ui_requests ();
 }
@@ -372,7 +376,16 @@ UI::do_request (UIRequest* req)
 
        } else if (req->type == SetTip) {
 
-               /* XXX need to figure out how this works */
+#ifdef GTK_NEW_TOOLTIP_API
+               /* even if the installed GTK is up to date,
+                  at present (November 2008) our included
+                  version of gtkmm is not. so use the GTK
+                  API that we've verified has the right function.
+               */
+               gtk_widget_set_tooltip_text (req->widget->gobj(), req->msg);
+#else
+               tips->set_tip (*req->widget, req->msg, "");
+#endif
 
        } else {
 
@@ -413,7 +426,7 @@ UI::process_error_message (Transmitter::Channel chn, const char *str)
        RefPtr<Style> style;
        RefPtr<TextBuffer::Tag> ptag;
        RefPtr<TextBuffer::Tag> mtag;
-       char *prefix;
+       const char *prefix;
        size_t prefix_len;
        bool fatal_received = false;
 #ifndef OLD_STYLE_ERRORS
@@ -559,10 +572,31 @@ UI::popup_error (const char *text)
        pup->touch ();
 }
 
+#ifdef GTKOSX
+extern "C" {
+       int gdk_quartz_in_carbon_menu_event_handler ();
+}
+#endif
 
 void
 UI::flush_pending ()
 {
+#ifdef GTKOSX
+       /* as of february 11th 2008, gtk/osx has a problem in that mac menu events
+          are handled using Carbon with an "internal" event handling system that 
+          doesn't pass things back to the glib/gtk main loop. this makes
+          gtk_main_iteration() block if we call it while in a menu event handler 
+          because glib gets confused and thinks there are two threads running
+          g_main_poll_func(). 
+
+          this hack (relies on code in gtk2_ardour/sync-menu.c) works
+          around that.
+       */
+
+       if (gdk_quartz_in_carbon_menu_event_handler()) {
+               return;
+       }
+#endif
        if (!caller_is_ui_thread()) {
                error << "non-UI threads cannot call UI::flush_pending()"
                      << endmsg;