diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-21 02:24:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-21 02:24:38 +0000 |
| commit | d9cebc2edf8accded23c6f2a1caab73eb47a50fd (patch) | |
| tree | 976c94ef8ec19b8e5149675eb5092ab6e9cb20de /libs/gtkmm2ext | |
| parent | cf77196698a395e4174037f36f755b401de679f3 (diff) | |
commits 6001-6525 inclusive from 2.X applied to 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@6942 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gettext.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/gettext.h b/libs/gtkmm2ext/gettext.h index 339c74ffe7..2645402e95 100644 --- a/libs/gtkmm2ext/gettext.h +++ b/libs/gtkmm2ext/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +#ifdef ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include <libintl.h> diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 7695892a82..cfcc0df91a 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -602,7 +602,7 @@ UI::handle_fatal (const char *message) } void -UI::popup_error (const char *text) +UI::popup_error (const string& text) { PopUp *pup; diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 2484b1e620..a0ea1e86ad 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -109,7 +109,7 @@ class UI : public Receiver, public AbstractUI<UIRequest> void run (Receiver &old_receiver); void set_state (Gtk::Widget *w, Gtk::StateType state); - void popup_error (const char *text); + void popup_error (const std::string& text); void flush_pending (); void toggle_errors (); void touch_display (Touchable *); diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index da51d4e412..8c13e2e18b 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -81,7 +81,7 @@ std::string Keyboard::user_keybindings_path; bool Keyboard::can_save_keybindings = false; bool Keyboard::bindings_changed_after_save_became_legal = false; map<string,string> Keyboard::binding_files; -string Keyboard::_current_binding_name = _("Unknown"); +string Keyboard::_current_binding_name; map<AccelKey,pair<string,string>,Keyboard::AccelKeyLess> Keyboard::release_keys; /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ @@ -110,6 +110,7 @@ Keyboard::Keyboard () { if (_the_keyboard == 0) { _the_keyboard = this; + _current_binding_name = _("Unknown"); } RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask (); |