diff options
| author | David Robillard <d@drobilla.net> | 2009-10-22 18:11:22 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-22 18:11:22 +0000 |
| commit | 7363b3cea01bd7184386858b3da5ad460848e41f (patch) | |
| tree | 0ca96d0a1a999218313a717df05516ca6ebc7014 /libs/gtkmm2ext | |
| parent | c19c39362db7e0e1d8f7fe4eaa4513bd3edbd6cd (diff) | |
Add log window to windows menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@5861 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 16 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 9 |
2 files changed, 12 insertions, 13 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index cba5f53377..412d2a683c 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -458,7 +458,7 @@ UI::process_error_message (Transmitter::Channel chn, const char *str) #endif break; case Transmitter::Info: -#if OLD_STYLE_ERRORS +#if OLD_STYLE_ERRORS prefix = "[INFO]: "; ptag = info_ptag; mtag = info_mtag; @@ -489,15 +489,15 @@ UI::process_error_message (Transmitter::Channel chn, const char *str) cerr << "programmer error in UI::check_error_messages (channel = " << chn << ")\n"; ::exit (1); } - + errors->text().get_buffer()->begin_user_action(); if (fatal_received) { handle_fatal (str); } else { - + display_message (prefix, prefix_len, ptag, mtag, str); - + if (!errors->is_visible()) { toggle_errors(); } @@ -527,7 +527,7 @@ UI::display_message (const char *prefix, gint /*prefix_len*/, RefPtr<TextBuffer: buffer->insert_with_tag(buffer->end(), "\n", mtag); errors->scroll_to_bottom (); -} +} void UI::handle_fatal (const char *message) @@ -538,7 +538,7 @@ UI::handle_fatal (const char *message) HBox hpacker; win.set_default_size (400, 100); - + string title; title = name(); title += ": Fatal Error"; @@ -552,12 +552,12 @@ UI::handle_fatal (const char *message) win.get_vbox()->pack_start (hpacker, false, false); quit.signal_clicked().connect(mem_fun(*this,&UI::quit)); - + win.show_all (); win.set_modal (true); theMain->run (); - + _exit (1); } diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 468aa16f8e..27eb395024 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -137,13 +137,12 @@ class UI : public Receiver, public AbstractUI<UIRequest> static bool just_hide_it (GdkEventAny *, Gtk::Window *); static pthread_t the_gui_thread() { return gui_thread; } - + protected: virtual void handle_fatal (const char *); - virtual void display_message (const char *prefix, gint prefix_len, - Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, - Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, - const char *msg); + virtual void display_message (const char *prefix, gint prefix_len, + Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, + const char *msg); private: static UI *theGtkUI; |