diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp index c68f8814f3..a1c99e9d47 100644 --- a/src/msw/anybutton.cpp +++ b/src/msw/anybutton.cpp @@ -90,10 +90,6 @@ using namespace wxMSWImpl; #endif #endif // wxUSE_UXTHEME -#ifndef WM_THEMECHANGED - #define WM_THEMECHANGED 0x031A -#endif - #ifndef ODS_NOACCEL #define ODS_NOACCEL 0x0100 #endif diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index b0ab5be33c..bdfab07471 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -328,9 +328,7 @@ void wxGUIEventLoop::DoYieldFor(long eventsToProcess) case WM_SYSKEYUP: case WM_SYSCHAR: case WM_SYSDEADCHAR: -#ifdef WM_UNICHAR case WM_UNICHAR: -#endif case WM_HOTKEY: case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: @@ -349,9 +347,7 @@ void wxGUIEventLoop::DoYieldFor(long eventsToProcess) case WM_MOUSEHOVER: case WM_MOUSELEAVE: -#ifdef WM_NCMOUSELEAVE case WM_NCMOUSELEAVE: -#endif case WM_CUT: case WM_COPY: diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index b699719fcc..54bbef9225 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -3157,12 +3157,10 @@ wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { switch ( nMsg ) { -#ifdef WM_PRINT case WM_PRINT: // we should bypass our own WM_PRINT handling as we don't handle // PRF_CHILDREN flag, so leave it to the native control itself return MSWDefWindowProc(nMsg, wParam, lParam); -#endif // WM_PRINT case WM_CONTEXTMENU: // because this message is propagated upwards the child-parent diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 8f338820b1..ea0f28ed2c 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -101,12 +101,10 @@ wxBuddyTextWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_DEADCHAR: case WM_KEYUP: case WM_KEYDOWN: -#ifdef WM_HELP // we need to forward WM_HELP too to ensure that the context help // associated with wxSpinCtrl is shown when the text control part of it // is clicked with the "?" cursor case WM_HELP: -#endif { WXLRESULT result; if ( spin->MSWHandleMessage(&result, message, wParam, lParam) ) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 13c21c0624..dcb92c885a 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -71,9 +71,6 @@ #include "wx/access.h" #include #include - #ifndef WM_GETOBJECT - #define WM_GETOBJECT 0x003D - #endif #ifndef OBJID_CLIENT #define OBJID_CLIENT 0xFFFFFFFC #endif @@ -3292,7 +3289,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result, } #endif -#if defined(WM_HELP) case WM_HELP: { // by default, WM_HELP is propagated by DefWindowProc() upwards @@ -3328,7 +3324,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result, } } break; -#endif // WM_HELP case WM_CONTEXTMENU: {