Deprecate wxDC::{Begin,End}Drawing()

[wxWidgets.git] / src / msw / colordlg.cpp

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 24ad03ce5103e1edb8189b7088e7ca5362078d4d..e1eea31a004a3c83f67c231bef1467d2ca06ae59 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,15 +27,10 @@
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/defs.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #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/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"

-    #include "wx/frame.h"

     #include "wx/dialog.h"
     #include "wx/dialog.h"

-    #include "wx/msgdlg.h"

 #endif
 
 #if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 #endif
 
 #if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))


@@ -47,12 +38,9 @@
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
 #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 <commdlg.h>
-#endif
-
-#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>