Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common.

[wxWidgets.git] / src / x11 / window.cpp

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 184282120b31aca37ec4f2bea661fc3b71383d2f..61db6dee8d880544b931703b2a9fa28902c3059b 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -397,7 +397,7 @@ void wxWindowX11::SetFocus()
 
     if (wxWindowIsVisible(xwindow))
     {
 
     if (wxWindowIsVisible(xwindow))
     {

-        wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+        wxLogTrace( wxT("focus"), wxT("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());

         //        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
         XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
         m_needsInputFocus = false;
         //        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
         XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
         m_needsInputFocus = false;


@@ -1641,9 +1641,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col)
 
 wxWindow *wxGetActiveWindow()
 {
 
 wxWindow *wxGetActiveWindow()
 {

-    // TODO
-    wxFAIL_MSG(wxT("Not implemented"));
-    return NULL;
+    return wxGetTopLevelParent(wxWindow::FindFocus());

 }
 
 /* static */
 }
 
 /* static */


@@ -1732,7 +1730,7 @@ public:
     wxWinModule()
     {
         // we must be cleaned up before the display is closed
     wxWinModule()
     {
         // we must be cleaned up before the display is closed

-        AddDependency(wxClassInfo::FindClass(_T("wxX11DisplayModule")));
+        AddDependency(wxClassInfo::FindClass(wxT("wxX11DisplayModule")));

     }
 
     virtual bool OnInit();
     }
 
     virtual bool OnInit();