don't include wx/msw/dc.h from wx/msw/private.h, this results in circular inclusion...

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 7944e1b9767fb493942775a28a2e8af60abb7abd..f31355f2cbc7f5356053d5c0884fde0e8435aeb5 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -213,11 +213,6 @@ struct WinStruct : public T
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 
-#include "wx/msw/dc.h"
-#include "wx/msw/dcclient.h"
-#include "wx/msw/dcmemory.h"
-
-
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)
 {

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 36c3571ab69f636c9d29173a05db9618246b75be..2d46ea6145ab029aa6e90e7a15837c97f60e0470 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -52,6 +52,7 @@
 #include "wx/thread.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 #include "wx/msw/ole/oleutils.h"
 #include "wx/msw/private/timer.h"
 

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 222cb4c40bac7a91456e7ebf557a32ef8ef8e43d..725d5fd0cbd016443df29e3b43e7c0a1bbfda3d2 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -40,6 +40,7 @@
 #endif
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 #if wxUSE_WXDIB
     #include "wx/msw/dib.h"

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 7039eb149e0b25686fb275d4bcb8f83136880430..c4344f09d99b0ff5658a48c23cff9d8a3c3f41be 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"          // for wxDCTemp
 
 #include "wx/msw/uxtheme.h"
 

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 1b47fbe0a499e2a0ddfbbacde7aaf138b7b8b397..02a5a495c55ee59123880ba62abfc1d3febcba0c 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -34,6 +34,7 @@
     #include "wx/settings.h"
 #endif
 
+#include "wx/msw/dc.h"          // for wxDCTemp
 #include "wx/msw/uxtheme.h"
 #include "wx/renderer.h"
 

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 3eeafd8e5d80b6a1abe98f932e65fec50213e351..73910fede10e3c7ce54db348484083cde67168e2 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,7 +28,6 @@
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"
-    #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
@@ -40,6 +39,7 @@
     #include "wx/module.h"
 #endif
 
+#include "wx/msw/dc.h"
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index cbbd2a406affb305fb4189d11d8a0e671ac49482..5ffa82c1c5a07b7be67e0d304162cc8045c3fc9c 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -35,6 +35,7 @@
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 #include "wx/msw/uxtheme.h"
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 21ab3d581f57d818c867407bfaf675744d9337c2..6e9d951f76458ebbcf2509a99d24514be3f2a445 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -47,6 +47,7 @@
 #include "wx/dcclient.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 #if wxUSE_UXTHEME
 #include "wx/msw/uxtheme.h"