use wxBusyCursor class instead of wxBeginBusyCursor and several (mismatched and thus...

[wxWidgets.git] / src / msw / toplevel.cpp

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 9c1391dbbe72bffde82d7757c6aea7812fa807e3..47bc5ff54a1bcf528ed52689350a1c64327f96ee 100644 (file)
--- 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/module.h"
 
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h"

 
 #if defined(__WXWINCE__)
   #include <ole2.h>
 
 #if defined(__WXWINCE__)
   #include <ole2.h>


@@ -514,6 +515,23 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         EnableCloseButton(false);
     }
 
         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;
 }
 
     return ret;
 }
 


@@ -740,7 +758,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 

-#if __WXWINCE__ && _WIN32_WCE < 400
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 
         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 


@@ -750,7 +768,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
     }
     else // stop showing full screen
     {
     }
     else // stop showing full screen
     {

-#if __WXWINCE__ && _WIN32_WCE < 400
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);
         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);