From 025f7d775c8366dec72258e0d9d83848203c4871 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Feb 2008 22:32:23 +0000
Subject: [PATCH] don't include wx/msw/dc.h from wx/msw/private.h, this results
 in circular inclusion of wx/stream.h from wx/filefn.h before wxFileOffset is
 defined which results in compilation errors under WinCE and is bad/confusing
 anyhow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/private.h | 5 -----
 src/msw/app.cpp          | 1 +
 src/msw/bitmap.cpp       | 1 +
 src/msw/bmpbuttn.cpp     | 1 +
 src/msw/checkbox.cpp     | 1 +
 src/msw/dc.cpp           | 2 +-
 src/msw/renderer.cpp     | 1 +
 src/msw/tbar95.cpp       | 1 +
 8 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 7944e1b976..f31355f2cb 100644
--- 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 36c3571ab6..2d46ea6145 100644
--- 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 222cb4c40b..725d5fd0cb 100644
--- 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 7039eb149e..c4344f09d9 100644
--- 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 1b47fbe0a4..02a5a495c5 100644
--- 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 3eeafd8e5d..73910fede1 100644
--- 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 cbbd2a406a..5ffa82c1c5 100644
--- 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 21ab3d581f..6e9d951f76 100644
--- 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"
-- 
2.45.2