From ed4eede6c2c16cdb422a39c1b3655956b8f51a1c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 6 Apr 2005 09:18:42 +0000 Subject: [PATCH] define WM_CONTEXTMENU if the standard headers don't git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 6 +++++- src/msw/treectrl.cpp | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index e17513c408..ec92260c1d 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -644,8 +644,12 @@ typedef struct { #define VK_OEM_PERIOD 0xBE #endif +#ifndef WM_CONTEXTMENU + #define WM_CONTEXTMENU 0x007B +#endif + #ifndef WM_UPDATEUISTATE - #define WM_UPDATEUISTATE 0x128 + #define WM_UPDATEUISTATE 0x0128 #endif #ifndef UIS_INITIALIZE diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 5e49a101c1..b065b31572 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -2243,7 +2243,6 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara WXLRESULT rc = 0; bool isMultiple = HasFlag(wxTR_MULTIPLE); -#ifdef WM_CONTEXTMENU if ( nMsg == WM_CONTEXTMENU ) { wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() ); @@ -2256,7 +2255,6 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara processed = true; //else: continue with generating wxEVT_CONTEXT_MENU in base class code } -#endif // WM_CONTEXTMENU else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) ) { // we only process mouse messages here and these parameters have the -- 2.45.2