wxMac needs the scroll styles

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c6dee1ec13af5e64f9996f86202ed5937edaede1..659e65db1098f44c4576d2856773b1241a4ec9d8 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -114,7 +114,7 @@
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
-#if defined(__GNUG__)
+#if defined(__GNUG__) || defined(__DMC__)
 #include "wx/msw/missing.h"
 #endif
 
@@ -2400,7 +2400,8 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                                         wParam);
             break;
 
-#ifndef __WXWINCE__
+            // Seems to be broken currently
+#if 0 // ndef __WXWINCE__
         case WM_MOUSELEAVE:
            {
             wxASSERT_MSG( !m_mouseInWindow, wxT("the mouse should be in a window to generate this event!") );
@@ -4396,7 +4397,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
         {
             // Generate an ENTER event
             m_mouseInWindow = TRUE;
-
+#if _WIN32_WINNT >= 0x0400
 #ifndef __WXWINCE__
             TRACKMOUSEEVENT trackinfo;
 
@@ -4408,7 +4409,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
             // else we need _WIN32_WINNT >= 0x0400 
             _TrackMouseEvent(&trackinfo);
 #endif
-            
+#endif
             wxMouseEvent event(wxEVT_ENTER_WINDOW);
             InitMouseEvent(event, x, y, flags);
 
@@ -5056,6 +5057,18 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
     return keySym;
 }
 
+bool wxGetKeyState(wxKeyCode key)
+{
+    bool bVirtual;
+    int vkey = wxCharCodeWXToMSW(key, &bVirtual);
+    
+    //there aren't WXK_ macros for non-virtual key codes
+    if (bVirtual == false)
+        return false;
+
+    return GetKeyState(vkey) < 0;
+}
+
 wxWindow *wxGetActiveWindow()
 {
     HWND hWnd = GetActiveWindow();