Compilo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 585abfc1f5aad95ca2c755705fba4ac602d49941..ba70b2087cc3d2d9677188d715083a2c391518d4 100644 (file)
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -13,6 +13,7 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"

+#include "wx/bmpbuttn.h"

 #include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 4e2a86b32cc129480bd9fcc1d15b200495d653d1..4c1a5884904d3205a93d5ed78f772abcb1123775 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -27,8 +27,8 @@
 #if wxUSE_COLOURPICKERCTRL
 
 #include "wx/clrpicker.h"
 #if wxUSE_COLOURPICKERCTRL
 
 #include "wx/clrpicker.h"

-

 #include "wx/colordlg.h"
 #include "wx/colordlg.h"

+#include "wx/dcmemory.h"

 
 
 // ============================================================================
 
 
 // ============================================================================