From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Feb 2004 23:18:01 +0000 (+0000)
Subject: don't show the accels on the controls if the system is configured to hide them initia... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bb655eade90ab5c24bca3728db33a1c7afb48196?ds=inline

don't show the accels on the controls if the system is configured to hide them initially (bug 718368)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index 7145774cae..1035ac295d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -153,6 +153,7 @@ wxMSW:
 - added wxTextCtrl::HitTest()
 - experimental wxURL implementation using WinInet functions (Hajo Kirchhoff)
 - fixed several bugs in wxNotebook with wxNB_MULTILINE style
+- accelerators are now initially hidden if appropriate (Peter Nielsen)
 
 wxGTK:
 
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 2376e815e6..47bc5ff54a 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -41,6 +41,7 @@
 #include "wx/module.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/missing.h"
 
 #if defined(__WXWINCE__)
   #include <ole2.h>
@@ -514,6 +515,23 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         EnableCloseButton(false);
     }
 
+    // for some reason we need to manually send ourselves this message as
+    // otherwise the mnemonics are always shown -- even if they're configured
+    // to be hidden until "Alt" is pressed in the control panel
+    //
+    // this could indicate a bug somewhere else but for now this is the only
+    // fix we have
+    if ( ret )
+    {
+        SendMessage
+        (
+            GetHwnd(),
+            WM_UPDATEUISTATE,
+            MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL),
+            0
+        );
+    }
+
     return ret;
 }