Merge branch 'gtk3' into gtk3-bugfix

2016-10-28 23:48:22 +02:00
parent 4d19b97109 b16ef8d1f5
commit e4e474ca8a
259 changed files with 5062 additions and 3653 deletions
--- a/rtgui/toolpanel.cc
+++ b/rtgui/toolpanel.cc
@@ -27,7 +27,7 @@ ToolVBox::ToolVBox() {}

 ToolParamBlock::ToolParamBlock() {}

-FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11, bool useEnabled) : ToolPanel(toolName, need11), parentContainer(NULL), exp(NULL), lastEnabled(true)
+FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11, bool useEnabled) : ToolPanel(toolName, need11), parentContainer(nullptr), exp(nullptr), lastEnabled(true)
 {
    if (!content) {
        return;