Next try on pop up menus. (#ifdef x11).

More SetFocus() work. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-10 20:35:55 +00:00
parent ac92c7e948
commit 9b8270da40
4 changed files with 19 additions and 4 deletions
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -3979,7 +3979,8 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control,
    {
        wxWindow *win = control->GetInputWindow();

-        if ( wxWindow::FindFocus() != control->GetInputWindow() )
+        if (( wxWindow::FindFocus() != control->GetInputWindow() ) &&
+            ( win->AcceptsFocus() ) )
        {
            win->SetFocus();