haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip wx.h from color_swatch.h

This commit is contained in:
Marek Roszko 2020-10-25 22:33:14 -04:00
parent 1984581c46
commit ee6c8b60ac
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_color_picker.cpp
View File

@ -24,6 +24,8 @@
#include <kiface_i.h> #include <kiface_i.h>
#include <settings/app_settings.h> #include <settings/app_settings.h>
#include <widgets/color_swatch.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 #define ALPHA_MAX 100 // the max value returned by the alpha (opacity) slider

1
common/widgets/color_swatch.cpp
View File

@ -22,6 +22,7 @@
*/ */
#include <widgets/color_swatch.h> #include <widgets/color_swatch.h>
#include <wx/dcmemory.h>
#include "dialog_color_picker.h" #include "dialog_color_picker.h"
#include <memory> #include <memory>

8
include/widgets/color_swatch.h
View File

@ -24,7 +24,13 @@
#ifndef COLOR_SWATCH__H_ #ifndef COLOR_SWATCH__H_
#define 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> #include <gal/color4d.h>