From ee6c8b60ac6d1ba0459e5d1379eee703b7a04de7 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 25 Oct 2020 22:33:14 -0400
Subject: [PATCH] Strip wx.h from color_swatch.h

---
 common/dialogs/dialog_color_picker.cpp | 2 ++
 common/widgets/color_swatch.cpp        | 1 +
 include/widgets/color_swatch.h         | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp
index a52d41060d..fea0bc6134 100644
--- a/common/dialogs/dialog_color_picker.cpp
+++ b/common/dialogs/dialog_color_picker.cpp
@@ -24,6 +24,8 @@
 #include <kiface_i.h>
 #include <settings/app_settings.h>
 #include <widgets/color_swatch.h>
+#include <wx/bitmap.h>
+#include <wx/dcmemory.h>
 
 #define ALPHA_MAX 100   // the max value returned by the alpha (opacity) slider
 
diff --git a/common/widgets/color_swatch.cpp b/common/widgets/color_swatch.cpp
index fd29b681b8..9db50c78ab 100644
--- a/common/widgets/color_swatch.cpp
+++ b/common/widgets/color_swatch.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <widgets/color_swatch.h>
+#include <wx/dcmemory.h>
 
 #include "dialog_color_picker.h"
 #include <memory>
diff --git a/include/widgets/color_swatch.h b/include/widgets/color_swatch.h
index 9372ad53ae..d96ae6b39e 100644
--- a/include/widgets/color_swatch.h
+++ b/include/widgets/color_swatch.h
@@ -24,7 +24,13 @@
 #ifndef COLOR_SWATCH__H_
 #define COLOR_SWATCH__H_
 
-#include <wx/wx.h>
+#include <wx/bitmap.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/statbmp.h>
+#include <wx/window.h>
+
+#include <functional>
 
 #include <gal/color4d.h>