From e000831d0747cd8ef3fedf25b18b1627fd485459 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 21 Jul 2005 20:58:55 +0000 Subject: [PATCH] show cursor when selecting menus via keyboard svn: r425 --- src/wxwindow/src/msw/wx_item.cxx | 2 ++ src/wxwindow/src/msw/wx_menu.cxx | 1 + src/wxwindow/src/msw/wx_win.cxx | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/wxwindow/src/msw/wx_item.cxx b/src/wxwindow/src/msw/wx_item.cxx index cae7d6f1cd..a9aff14a61 100644 --- a/src/wxwindow/src/msw/wx_item.cxx +++ b/src/wxwindow/src/msw/wx_item.cxx @@ -385,6 +385,7 @@ LONG wxDoItemPres(wxItem *item, HWND hWnd, UINT message, WPARAM wParam, LPARAM l case WM_SYSKEYDOWN: if ((wParam == VK_MENU) || (wParam == VK_F4)) { /* F4 is close */ + wxUnhideCursor(); retval = 1; break; } @@ -414,6 +415,7 @@ LONG wxDoItemPres(wxItem *item, HWND hWnd, UINT message, WPARAM wParam, LPARAM l case WM_SYSCHAR: /* ^^^ fallthrough */ if (message == WM_SYSCHAR) { if (wParam == VK_MENU) { + wxUnhideCursor(); retval = 1; break; } diff --git a/src/wxwindow/src/msw/wx_menu.cxx b/src/wxwindow/src/msw/wx_menu.cxx index 55f7a2c341..53ce1eae30 100644 --- a/src/wxwindow/src/msw/wx_menu.cxx +++ b/src/wxwindow/src/msw/wx_menu.cxx @@ -276,6 +276,7 @@ void wxMenu::SelectMenu(void) } } } + wxUnhideCursor(); } } diff --git a/src/wxwindow/src/msw/wx_win.cxx b/src/wxwindow/src/msw/wx_win.cxx index 59e2fc74ab..d1ac74ee55 100644 --- a/src/wxwindow/src/msw/wx_win.cxx +++ b/src/wxwindow/src/msw/wx_win.cxx @@ -1141,6 +1141,7 @@ static LONG WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, in break; case WM_SYSKEYDOWN: if ((wParam == VK_MENU) || (wParam == VK_F4)) { /* F4 is close */ + wxUnhideCursor(); retval = wnd->DefWindowProc(message, wParam, lParam); } case WM_KEYUP: @@ -1160,6 +1161,7 @@ static LONG WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, in } case WM_SYSCHAR: if (wParam == VK_MENU) { + wxUnhideCursor(); retval = wnd->DefWindowProc(message, wParam, lParam); } case WM_CHAR: /* ^^^ fallthrough */