From 6425e8747be875e627d36c983bbad42a56d66eba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 3 Jul 2008 15:42:18 +0000 Subject: [PATCH] support disabling items before adding them to the menu (#3423) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/menu.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 5b0838e5c0..f007465473 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -115,6 +115,7 @@ wxMSW: - Fix keyboard support in wxSpinCtrl broken in 2.8.8. - Compile fix for WinCE in window.cpp (no VkKeyScan in Windows CE). - Fix quoting of arguments passed to wxExecute(char **) (Brian Ravnsgaard Riis). +- Support disabling items before adding them to the menu (Christian Walther). wxGTK: diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 9005fb4514..3230373c9b 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -354,7 +354,8 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) UpdateAccel(pItem); #endif // wxUSE_ACCEL - UINT flags = 0; + // we should support disabling the item even prior to adding it to the menu + UINT flags = pItem->IsEnabled() ? MF_ENABLED : MF_GRAYED; // if "Break" has just been called, insert a menu break before this item // (and don't forget to reset the flag)