Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -129,6 +129,7 @@ protected:
    Gtk::ComboBoxText* theme;
    Gtk::CheckButton* chUseSystemTheme;
    Gtk::FontButton* fontbutton;
+    Gtk::FontButton* colorPickerFontButton;
    Gtk::ColorButton* butCropCol;
    Gtk::ColorButton* butNavGuideCol;

@@ -225,7 +226,7 @@ protected:
    Gtk::Widget* getSoundPanel ();

 public:
-    Preferences (RTWindow *rtwindow);
+    explicit Preferences (RTWindow *rtwindow);
    ~Preferences ();

    void savePressed ();