From b6be374d72dc43bcb277604ce2769123beed1e7e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 18 Feb 2014 23:36:34 +0000 Subject: [PATCH] Move DSS_HIDEPREFIX fallback definition to the central header. Do it only once now that it's used in 3 different places (it recently started to be used in src/msw/anybutton.cpp as well) instead of defining it thrice. This also fixes MinGW build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 4 ++++ src/msw/anybutton.cpp | 4 ---- src/msw/menuitem.cpp | 4 ---- src/msw/ownerdrw.cpp | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index e60b865ab9..4babbbea4d 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -48,6 +48,10 @@ #define DT_HIDEPREFIX 0x00100000 #endif +#ifndef DSS_HIDEPREFIX + #define DSS_HIDEPREFIX 0x0200 +#endif + // Needed by toplevel.cpp #ifndef UIS_SET #define UIS_SET 1 diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp index d6e367a74e..3c9e6bb1ea 100644 --- a/src/msw/anybutton.cpp +++ b/src/msw/anybutton.cpp @@ -103,10 +103,6 @@ using namespace wxMSWImpl; #define ODS_NOFOCUSRECT 0x0200 #endif -#ifndef DT_HIDEPREFIX - #define DT_HIDEPREFIX 0x00100000 -#endif - #if wxUSE_UXTHEME extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp #endif // wxUSE_UXTHEME diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index de808b31e0..f37017e1b1 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -149,10 +149,6 @@ private: #define SPI_GETKEYBOARDCUES 0x100A #endif -#ifndef DSS_HIDEPREFIX -#define DSS_HIDEPREFIX 0x0200 -#endif - #if wxUSE_UXTHEME enum MENUPARTS diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index de70ac8588..166e84542d 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -23,10 +23,6 @@ #include "wx/msw/private/dc.h" #include "wx/msw/wrapcctl.h" // for HIMAGELIST -#ifndef DSS_HIDEPREFIX -#define DSS_HIDEPREFIX 0x0200 -#endif - // ---------------------------------------------------------------------------- // constants for base class // ----------------------------------------------------------------------------