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
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
@@ -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"
|
||||
|
||||
|
@@ -40,6 +40,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/dc.h"
|
||||
|
||||
#if wxUSE_WXDIB
|
||||
#include "wx/msw/dib.h"
|
||||
|
@@ -27,6 +27,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/dc.h" // for wxDCTemp
|
||||
|
||||
#include "wx/msw/uxtheme.h"
|
||||
|
||||
|
@@ -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"
|
||||
|
||||
|
@@ -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"
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user