Merge branch 'dev' into newlocallab

rtgui/rtwindow.h

@@ -15,23 +15,29 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _RTWINDOW_
-#define _RTWINDOW_
+#pragma once
+
+#include <set>
 
 #include <gtkmm.h>
-#include "filepanel.h"
-#include "editorpanel.h"
-#include "batchqueuepanel.h"
-#include <set>
-#include "progressconnector.h"
-#include "editwindow.h"
-#include "splash.h"
+
 #if defined(__APPLE__)
 #include <gtkosxapplication.h>
 #endif
+
+#include "progressconnector.h"
+#include "splash.h"
+
 #include "../rtengine/noncopyable.h"
 
-class RTWindow : public Gtk::Window, public rtengine::ProgressListener, public rtengine::NonCopyable
+class BatchQueueEntry;
+class BatchQueuePanel;
+class EditorPanel;
+class FilePanel;
+class RTWindow :
+    public Gtk::Window,
+    public rtengine::ProgressListener,
+    public rtengine::NonCopyable
 {
 
 private:
@@ -49,10 +55,7 @@ private:
 
     Gtk::Image *iFullscreen, *iFullscreen_exit;
 
-    bool isSingleTabMode()
-    {
-        return !options.tabbedUI && ! (options.multiDisplayMode > 0);
-    };
+    bool isSingleTabMode() const;
 
     bool on_expose_event_epanel (GdkEventExpose* event);
     bool on_expose_event_fpanel (GdkEventExpose* event);
@@ -126,5 +129,3 @@ public:
 
     void writeToolExpandedStatus (std::vector<int> &tpOpen);
 };
-
-#endif