include wx/msw/missing.h after wx/msw/private.h, otherwise we get warnings when compiling without PCH (replaces patch 1674510)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e6733873f5
commit
a6c2e2c765
@ -16,9 +16,6 @@
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/msw/missing.h"
|
||||
#endif
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/utils.h"
|
||||
@ -29,10 +26,6 @@
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/private.h"
|
||||
#endif
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
#include <errno.h>
|
||||
#endif
|
||||
@ -42,6 +35,8 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/missing.h"
|
||||
#define wxHAVE_WIN32_MB2WC
|
||||
#endif
|
||||
|
||||
|
@ -27,7 +27,6 @@
|
||||
#include "wx/cursor.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/msw/missing.h" // IDC_HAND
|
||||
#include "wx/utils.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/bitmap.h"
|
||||
@ -39,6 +38,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/missing.h" // IDC_HAND
|
||||
|
||||
// define functions missing in MicroWin
|
||||
#ifdef __WXMICROWIN__
|
||||
|
@ -26,7 +26,6 @@
|
||||
#include "wx/thread.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/msw/missing.h"
|
||||
#include "wx/intl.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/module.h"
|
||||
@ -36,6 +35,7 @@
|
||||
#include "wx/scopeguard.h"
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/missing.h"
|
||||
#include "wx/msw/seh.h"
|
||||
|
||||
#include "wx/except.h"
|
||||
|
@ -27,7 +27,6 @@
|
||||
#include "wx/toplevel.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/msw/missing.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/string.h"
|
||||
@ -48,10 +47,10 @@
|
||||
#if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
|
||||
#include <aygshell.h>
|
||||
#endif
|
||||
#include "wx/msw/wince/missing.h"
|
||||
#endif
|
||||
|
||||
#include "wx/msw/winundef.h"
|
||||
#include "wx/msw/missing.h"
|
||||
|
||||
#include "wx/display.h"
|
||||
|
||||
|
@ -25,7 +25,6 @@
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/msw/missing.h" // CHARSET_HANGUL
|
||||
#include "wx/utils.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/intl.h"
|
||||
@ -42,6 +41,7 @@
|
||||
#include "wx/confbase.h" // for wxExpandEnvVars()
|
||||
|
||||
#include "wx/msw/private.h" // includes <windows.h>
|
||||
#include "wx/msw/missing.h" // for CHARSET_HANGUL
|
||||
|
||||
#if defined(__CYGWIN__)
|
||||
//CYGWIN gives annoying warning about runtime stuff if we don't do this
|
||||
|
Loading…
Reference in New Issue
Block a user