From 2b933efa8e8978c7c4eb4f774b61901ceeddeca6 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Sun, 13 May 2018 18:02:03 -0500
Subject: [PATCH] Moved AboutDialog into Dialogs subdir.

---
 src/CMakeLists.txt                    | 2 +-
 src/GUI/{ => Dialogs}/AboutDialog.cpp | 4 ++--
 src/GUI/{ => Dialogs}/AboutDialog.hpp | 0
 src/GUI/MainFrame.cpp                 | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename src/GUI/{ => Dialogs}/AboutDialog.cpp (97%)
 rename src/GUI/{ => Dialogs}/AboutDialog.hpp (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d423ed8b5..5ccbc4335 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,7 +206,7 @@ IF(wxWidgets_FOUND)
     include_directories(${wxWidgets_INCLUDE})
 
     add_library(slic3r_gui STATIC 
-    ${GUI_LIBDIR}/AboutDialog.cpp
+    ${GUI_LIBDIR}/Dialogs/AboutDialog.cpp
     ${GUI_LIBDIR}/GUI.cpp
     ${GUI_LIBDIR}/MainFrame.cpp
     ${GUI_LIBDIR}/Plater.cpp
diff --git a/src/GUI/AboutDialog.cpp b/src/GUI/Dialogs/AboutDialog.cpp
similarity index 97%
rename from src/GUI/AboutDialog.cpp
rename to src/GUI/Dialogs/AboutDialog.cpp
index 52d8897a9..fb6d2798e 100644
--- a/src/GUI/AboutDialog.cpp
+++ b/src/GUI/Dialogs/AboutDialog.cpp
@@ -1,4 +1,4 @@
-#include "AboutDialog.hpp"
+#include "Dialogs/AboutDialog.hpp"
 
 namespace Slic3r { namespace GUI {
 
@@ -87,7 +87,7 @@ void AboutDialogLogo::repaint(wxPaintEvent& event)
 
     dc.SetBackgroundMode(wxPENSTYLE_TRANSPARENT);
 
-    const auto size {this->GetSize()};
+    const wxSize size {this->GetSize()};
     const auto logo_w {this->logo.GetWidth()};
     const auto logo_h {this->logo.GetHeight()};
 
diff --git a/src/GUI/AboutDialog.hpp b/src/GUI/Dialogs/AboutDialog.hpp
similarity index 100%
rename from src/GUI/AboutDialog.hpp
rename to src/GUI/Dialogs/AboutDialog.hpp
diff --git a/src/GUI/MainFrame.cpp b/src/GUI/MainFrame.cpp
index 2ee7bba9e..54ed0b6ae 100644
--- a/src/GUI/MainFrame.cpp
+++ b/src/GUI/MainFrame.cpp
@@ -3,9 +3,10 @@
 #include <wx/accel.h>
 #include <wx/utils.h> 
 
-#include "AboutDialog.hpp"
 #include "libslic3r.h"
 
+#include "Dialogs/AboutDialog.hpp"
+
 namespace Slic3r { namespace GUI {
 
 wxBEGIN_EVENT_TABLE(MainFrame, wxFrame)