X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eeb0bee1d31939f8ff14a3c7dba6ff22fcdb6fff..2861eaee452dfef7aeaca2685be663db4e07510e:/src/msw/window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ebecabf2ab..d035da942b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -179,6 +179,10 @@
 // global variables
 // ---------------------------------------------------------------------------
 
+#if wxUSE_MENUS_NATIVE
+extern wxMenu *wxCurrentPopupMenu;
+#endif
+
 #ifdef __WXWINCE__
 extern       wxChar *wxCanvasClassName;
 #else
@@ -520,8 +524,6 @@ void wxWindowMSW::Init()
     m_mouseInWindow = false;
     m_lastKeydownProcessed = false;
 
-    m_frozenness = 0;
-
     m_hWnd = 0;
     m_hDWP = 0;
 
@@ -723,9 +725,7 @@ wxWindowMSW::MSWShowWithEffect(bool show,
     static bool s_initDone = false;
     if ( !s_initDone )
     {
-        wxLogNull noLog;
-
-        wxDynamicLibrary dllUser32(_T("user32.dll"), wxDL_VERBATIM);
+        wxDynamicLibrary dllUser32(_T("user32.dll"), wxDL_VERBATIM | wxDL_QUIET);
         wxDL_INIT_FUNC(s_pfn, AnimateWindow, dllUser32);
 
         s_initDone = true;
@@ -1602,29 +1602,21 @@ static inline void SendSetRedraw(HWND hwnd, bool on)
 #endif
 }
 
-void wxWindowMSW::Freeze()
+void wxWindowMSW::DoFreeze()
 {
-    if ( !m_frozenness++ )
-    {
-        if ( IsShown() )
-            SendSetRedraw(GetHwnd(), false);
-    }
+    if ( IsShown() )
+        SendSetRedraw(GetHwnd(), false);
 }
 
-void wxWindowMSW::Thaw()
+void wxWindowMSW::DoThaw()
 {
-    wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
-
-    if ( --m_frozenness == 0 )
+    if ( IsShown() )
     {
-        if ( IsShown() )
-        {
-            SendSetRedraw(GetHwnd(), true);
+        SendSetRedraw(GetHwnd(), true);
 
-            // we need to refresh everything or otherwise the invalidated area
-            // is not going to be repainted
-            Refresh();
-        }
+        // we need to refresh everything or otherwise the invalidated area
+        // is not going to be repainted
+        Refresh();
     }
 }
 
@@ -6105,10 +6097,18 @@ WXWORD wxCharCodeWXToMSW(int wxk, bool *isVirtual)
             break;
 
         default:
-            if ( isVirtual )
-                *isVirtual = false;
-            vk = (WXWORD)wxk;
-            break;
+            // check to see if its one of the OEM key codes.
+            BYTE vks = LOBYTE(VkKeyScan(wxk));
+            if ( vks != 0xff )
+            {
+                vk = vks;
+            }
+            else
+            {
+                if ( isVirtual )
+                    *isVirtual = false;
+                vk = (WXWORD)wxk;
+            }
     }
 
     return vk;