fixed menu navigation with mouse

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index c37533c8dd23da39e85aee877b156d95522e09df..551f5420192001126b2134037d3d260e76ec76c7 100644 (file)
--- 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);
         *descent = YDEV2LOGREL(m_mglFont->descent);
     if ( externalLeading )
         *externalLeading = YDEV2LOGREL(m_mglFont->leading);

-    
+

     if ( theFont != NULL )
         wxConstCast(this, wxDC)->SetFont(oldFont);
 }
     if ( theFont != NULL )
         wxConstCast(this, wxDC)->SetFont(oldFont);
 }

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 09f69f1dd7bc31b08d558be9f5e6be191887122a..55dfa752910664e2247fc9e22287dd00f21f82cc 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -626,6 +626,8 @@ bool wxWindowMGL::Create(wxWindow *parent,
 
 void wxWindowMGL::SetFocus()
 {
 
 void wxWindowMGL::SetFocus()
 {

+    if ( gs_focusedWindow == this ) return;
+

     if ( gs_focusedWindow )
         gs_focusedWindow->KillFocus();
     
     if ( gs_focusedWindow )
         gs_focusedWindow->KillFocus();
     


@@ -658,7 +660,7 @@ void wxWindowMGL::SetFocus()
     
     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
     event.SetEventObject(this);
     
     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
     event.SetEventObject(this);

-    AddPendingEvent(event);
+    GetEventHandler()->ProcessEvent(event);

 }
 
 void wxWindowMGL::KillFocus()
 }
 
 void wxWindowMGL::KillFocus()


@@ -679,7 +681,7 @@ void wxWindowMGL::KillFocus()
 
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
 
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);

-    AddPendingEvent(event);
+    GetEventHandler()->ProcessEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------