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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index e17513c408895f5e1d165b6209d4c39f7d365adb..ec92260c1ddbb309753a832c504b44e9303b8f7c 100644 (file)
--- 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 5e49a101c16784b1fd7f4d46664c40fddb92b4ca..b065b3157200afe1172c0a1f817dc3bacea585cc 100644 (file)
--- 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