added wxMenu::Append( wxMenuItem )

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index f993328a52f9fbbad18aa2e0422224d0759379c0..a3e3a9d72794b7586186cbee77617651b5134ea1 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -711,7 +711,9 @@ void wxWindow::DoSetClientSize(int width, int height)
 {
     wxWindow *parent = GetParent();
     HWND hWnd = (HWND) GetHWND();
-    HWND hParentWnd = (HWND) (HWND) parent->GetHWND();
+    HWND hParentWnd = (HWND) 0;
+    if (parent)
+        hParentWnd = (HWND) parent->GetHWND();
 
     RECT rect;
     ::GetClientRect(hWnd, &rect);
@@ -1227,7 +1229,6 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         }
 
     case WM_KEYDOWN:
-    {
         // If this has been processed by an event handler,
         // return 0 now (we've handled it).
         if (MSWOnKeyDown((WORD) wParam, lParam))
@@ -1253,24 +1254,41 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             case VK_RIGHT:
             case VK_DOWN:
             case VK_UP:
-            {
                 return Default();
+
+#ifdef VK_APPS
+            // special case of VK_APPS: treat it the same as right mouse click
+            // because both usually pop up a context menu
+            case VK_APPS:
+                {
+                    // construct the key mask
+                    WPARAM fwKeys = MK_RBUTTON;
+                    if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
+                        fwKeys |= MK_CONTROL;
+                    if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 )
+                        fwKeys |= MK_SHIFT;
+
+                    // simulate right mouse button click
+                    DWORD dwPos = ::GetMessagePos();
+                    int x = GET_X_LPARAM(dwPos),
+                        y = GET_Y_LPARAM(dwPos);
+
+                    ScreenToClient(&x, &y);
+                    MSWOnRButtonDown(x, y, fwKeys);
+                }
                 break;
-            }
+#endif // VK_APPS
+
             default:
                 if (!MSWOnChar((WORD)wParam, lParam))
                 {
                     return Default();
                 }
-/*
-                if ( ::GetKeyState(VK_CONTROL) & 0x100 )
-                    return Default();
-*/
                 break;
         }
 
         break;
-    }
+
     case WM_KEYUP:
     {
         if (!MSWOnKeyUp((WORD) wParam, lParam))
@@ -1482,37 +1500,54 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
     case WM_SETCURSOR:
         {
-            // don't set cursor when the mouse is not in the client part
-            short nHitTest = LOWORD(lParam);
-            if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
+            // don't set cursor for other windows, only for this one: this
+            // prevents children of this window from gettign the same cursor
+            // as the parent has (don't forget that this message is propagated
+            // by default up the window parent-child hierarchy)
+            if ( (HWND)wParam == hWnd )
             {
-                HCURSOR hcursor = 0;
-                if ( wxIsBusy() )
+                // don't set cursor when the mouse is not in the client part
+                short nHitTest = LOWORD(lParam);
+                if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
                 {
-                    extern HCURSOR gs_wxBusyCursor; // from msw\utils.cpp
+                    HCURSOR hcursor = 0;
+                    if ( wxIsBusy() )
+                    {
+                        // from msw\utils.cpp
+                        extern HCURSOR gs_wxBusyCursor;
 
-                    hcursor = gs_wxBusyCursor;
-                }
-                else if ( m_windowCursor.Ok() )
-                {
-                    hcursor = (HCURSOR)m_windowCursor.GetHCURSOR();
-                }
-                else
-                {
-                    extern wxCursor *g_globalCursor; // from msw\data.cpp
+                        hcursor = gs_wxBusyCursor;
+                    }
+                    else
+                    {
+                        wxCursor *cursor = NULL;
 
-                    if ( g_globalCursor && g_globalCursor->Ok() )
-                        hcursor = (HCURSOR)g_globalCursor->GetHCURSOR();
-                }
+                        if ( m_windowCursor.Ok() )
+                        {
+                            cursor = &m_windowCursor;
+                        }
+                        else
+                        {
+                            // from msw\data.cpp
+                            extern wxCursor *g_globalCursor;
 
-                if ( hcursor )
-                {
-                    ::SetCursor(hcursor);
+                            if ( g_globalCursor && g_globalCursor->Ok() )
+                                cursor = g_globalCursor;
+                        }
 
-                    // returning TRUE stops the DefWindowProc() from further
-                    // processing this message - exactly what we need because
-                    // we've just set the cursor
-                    return TRUE;
+                        if ( cursor )
+                            hcursor = (HCURSOR)cursor->GetHCURSOR();
+                    }
+
+                    if ( hcursor )
+                    {
+                        ::SetCursor(hcursor);
+
+                        // returning TRUE stops the DefWindowProc() from
+                        // further processing this message - exactly what we
+                        // need because we've just set the cursor.
+                        return TRUE;
+                    }
                 }
             }
         }