X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cceed0407feaa3bcdacbfaf2e02324fdb1b6485f..0a7b022960a68e1d9cf2561375e8c0376e07e93b:/include/wx/msw/wrapcctl.h diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h index 261fc08c18..8d4cd2c70e 100644 --- a/include/wx/msw/wrapcctl.h +++ b/include/wx/msw/wrapcctl.h @@ -12,27 +12,7 @@ #ifndef _WX_MSW_WRAPCCTL_H_ #define _WX_MSW_WRAPCCTL_H_ -// define _WIN32_IE to a high value because we always check for the version -// of installed DLLs at runtime anyway (see wxApp::GetComCtl32Version()) unless -// the user really doesn't want it and had defined it to a (presumably lower) -// value -// -// just for the reference, here is the table showing what the different value -// of _WIN32_IE correspond to: -// -// 0x0200 for comctl32.dll 4.00 shipped with Win95/NT 4.0 -// 0x0300 4.70 IE 3.x -// 0x0400 4.71 IE 4.0 -// 0x0401 4.72 IE 4.01 and Win98 -// 0x0500 5.80 IE 5.x -// 0x0500 5.81 Win2k/ME -// 0x0600 6.00 WinXP - -#ifndef _WIN32_IE - // use maximal set of features by default, we check for them during - // run-time anyhow - #define _WIN32_IE 0x0600 -#endif // !defined(_WIN32_IE) +#include "wx/msw/wrapwin.h" #include @@ -53,8 +33,8 @@ inline void wxSetCCUnicodeFormat(HWND WXUNUSED_IN_WINCE(hwnd)) // Return the default font for the common controls // // this is implemented in msw/settings.cpp +class wxFont; extern wxFont wxGetCCDefaultFont(); #endif #endif // _WX_MSW_WRAPCCTL_H_ -