From 2bd6022f1c25a202fa54f9a6e63cffe0e3e15eac Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 30 May 2006 07:43:05 +0000 Subject: [PATCH] Include commctrl.h properly. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/combobox.cpp | 6 +++--- src/msw/frame.cpp | 5 ++--- src/msw/gauge95.cpp | 5 ++--- src/msw/menu.cpp | 4 +++- src/msw/notebook.cpp | 6 +++--- src/msw/slider95.cpp | 5 ++--- src/msw/wince/choicece.cpp | 6 +++--- src/msw/wince/tbarwce.cpp | 4 +++- src/msw/wince/textctrlce.cpp | 14 +++++++------- src/msw/window.cpp | 3 ++- src/palmos/combobox.cpp | 3 --- 11 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2648bd8024..41b73b4478 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -40,10 +40,10 @@ #include "wx/clipbrd.h" #include "wx/msw/private.h" +// include "properly" +#include "wx/msw/wrapcctl.h" + #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 41518eac18..f438b28bb7 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -40,9 +40,8 @@ #include "wx/msw/private.h" -#ifdef __WXWINCE__ -#include -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" #if defined(__POCKETPC__) || defined(__SMARTPHONE__) #include diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 655e9fcf67..20ca1b55f5 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -32,9 +32,8 @@ #include "wx/gauge.h" #include "wx/msw/private.h" -#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" // ---------------------------------------------------------------------------- // constants diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index f89a45c790..cdec3e7a1c 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -41,13 +41,15 @@ #include "wx/msw/private.h" +// include "properly" +#include "wx/msw/wrapcctl.h" + #ifdef __WXWINCE__ #include #include #include #include #include -#include #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) #include #endif diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 63d07543f3..193bd61d6c 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -37,11 +37,11 @@ #include "wx/msw/private.h" #include - -#include - #include "wx/msw/winundef.h" +// include "properly" +#include "wx/msw/wrapcctl.h" + #if wxUSE_UXTHEME #include "wx/msw/uxtheme.h" #endif diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 193017c84a..6b7d26723b 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -34,9 +34,8 @@ #include "wx/slider.h" #include "wx/msw/subwin.h" -#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" // ---------------------------------------------------------------------------- // constants diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index e3f933106d..caef2a0388 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -29,11 +29,11 @@ #include "wx/choice.h" #ifndef WX_PRECOMP - #include - #include "wx/msw/missing.h" - #include "wx/msw/winundef.h" #endif +// include "properly" +#include "wx/msw/wrapcctl.h" + #include "wx/spinbutt.h" // for wxSpinnerBestSize #if wxUSE_EXTENDED_RTTI diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 5919c6a704..173dbd249e 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -45,13 +45,15 @@ #include "malloc.h" #endif +// include "properly" +#include "wx/msw/wrapcctl.h" + #include "wx/msw/private.h" #include #include #include #include #include -#include #if defined(WINCE_WITHOUT_COMMANDBAR) #include #endif diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp index 8f77af4705..b7e5715c8c 100644 --- a/src/msw/wince/textctrlce.cpp +++ b/src/msw/wince/textctrlce.cpp @@ -24,19 +24,19 @@ #pragma hdrstop #endif +#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__) && defined(__WXWINCE__) + +#include "wx/textctrl.h" + #ifndef WX_PRECOMP - #include "wx/textctrl.h" #endif +// include "properly" +#include "wx/msw/wrapcctl.h" + #include "wx/spinbutt.h" #include "wx/textfile.h" -#include -#include "wx/msw/missing.h" -#include "wx/msw/winundef.h" - -#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__) && defined(__WXWINCE__) - #define GetBuddyHwnd() (HWND)(m_hwndBuddy) #define IsVertical(wxStyle) (true) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 7691c62d9a..8934f9ac74 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -104,7 +104,8 @@ #include #endif -#include +// include "properly" +#include "wx/msw/wrapcctl.h" #ifndef __WXWINCE__ #include diff --git a/src/palmos/combobox.cpp b/src/palmos/combobox.cpp index 9ede2abaf1..e35fbcf028 100644 --- a/src/palmos/combobox.cpp +++ b/src/palmos/combobox.cpp @@ -40,9 +40,6 @@ #include "wx/palmos/private.h" #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS -- 2.45.2