The last commit was too hasty.

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 5a4171b56e336c92fe836e287737a8224fd4c9fd..31875c8e7db9f385e4867241f551583d66656df5 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -227,7 +227,7 @@ void wxWindowX11::SetFocus()
 
     if (wxWindowIsVisible(xwindow))
     {
 
     if (wxWindowIsVisible(xwindow))
     {

-        // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );

         m_needsInputFocus = FALSE;
     }
     else
         m_needsInputFocus = FALSE;
     }
     else


@@ -253,6 +253,7 @@ wxWindow *wxWindowBase::FindFocus()
     return NULL;
 }
 
     return NULL;
 }
 

+#if 0

 wxWindow *wxWindowX11::GetFocusWidget()
 {
    wxWindow *win = (wxWindow*) this;
 wxWindow *wxWindowX11::GetFocusWidget()
 {
    wxWindow *win = (wxWindow*) this;


@@ -265,6 +266,7 @@ wxWindow *wxWindowX11::GetFocusWidget()
    
    return win;
 }
    
    return win;
 }

+#endif

 
 // Enabling/disabling handled by event loop, and not sending events
 // if disabled.
 
 // Enabling/disabling handled by event loop, and not sending events
 // if disabled.