From a46935cb544043417c6b44ac246ec9c0cbeebf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 10 Oct 2001 22:44:08 +0000 Subject: [PATCH] fixed menu navigation with mouse git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mgl/dc.cpp | 2 +- src/mgl/window.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp index c37533c8dd..551f542019 100644 --- a/src/mgl/dc.cpp +++ b/src/mgl/dc.cpp @@ -1234,7 +1234,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, *descent = YDEV2LOGREL(m_mglFont->descent); if ( externalLeading ) *externalLeading = YDEV2LOGREL(m_mglFont->leading); - + if ( theFont != NULL ) wxConstCast(this, wxDC)->SetFont(oldFont); } diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 09f69f1dd7..55dfa75291 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -626,6 +626,8 @@ bool wxWindowMGL::Create(wxWindow *parent, void wxWindowMGL::SetFocus() { + if ( gs_focusedWindow == this ) return; + if ( gs_focusedWindow ) gs_focusedWindow->KillFocus(); @@ -658,7 +660,7 @@ void wxWindowMGL::SetFocus() wxFocusEvent event(wxEVT_SET_FOCUS, GetId()); event.SetEventObject(this); - AddPendingEvent(event); + GetEventHandler()->ProcessEvent(event); } void wxWindowMGL::KillFocus() @@ -679,7 +681,7 @@ void wxWindowMGL::KillFocus() wxFocusEvent event(wxEVT_KILL_FOCUS, GetId()); event.SetEventObject(this); - AddPendingEvent(event); + GetEventHandler()->ProcessEvent(event); } // ----------------------------------------------------------------------------