X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02b7b6b072762ff1e02950109a751815ac7429fd..7e02be855d14263c996448bdb56c9e1002ad9b53:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index eb8936211d..e1eea31a00 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "colordlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,28 +27,20 @@ #ifndef WX_PRECOMP #include #include "wx/defs.h" - #include "wx/bitmap.h" - #include "wx/pen.h" - #include "wx/brush.h" #include "wx/colour.h" #include "wx/gdicmn.h" #include "wx/utils.h" - #include "wx/frame.h" #include "wx/dialog.h" - #include "wx/msgdlg.h" #endif -#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__) +#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) #include "wx/msw/private.h" #include "wx/colordlg.h" #include "wx/cmndata.h" +#include "wx/math.h" +#include "wx/msw/wrapcdlg.h" -#if !defined(__WIN32__) || defined(__WXWINCE__) - #include -#endif - -#include #include #include @@ -231,4 +219,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const *height = 299; } -#endif +#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)