Typo.

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

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index bbeedaea5dbeb4fb68b4d0c36efacfe59d091c1f..50eb66f5607055be6829561213d7fee204ae9bfa 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -21,10 +21,11 @@
     #pragma implementation "reparent.h"
 #endif
 
     #pragma implementation "reparent.h"
 #endif
 

-#include "wx/x11/reparent.h"
+#include "wx/setup.h"

 
 #if !wxUSE_NANOX
 
 
 #if !wxUSE_NANOX
 

+#include "wx/x11/reparent.h"

 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/app.h"
 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/app.h"


@@ -295,13 +296,13 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
       XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName);
 
       wxString str1(name);
       XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName);
 
       wxString str1(name);

-      wxString str2(clientName);
+      wxString str2 = wxString::FromAscii(clientName);

       str1.Lower();
       str2.Lower();
 
       bool matches;
       if (sm_exactMatch)
       str1.Lower();
       str2.Lower();
 
       bool matches;
       if (sm_exactMatch)

-          matches = (name == clientName);
+          matches = (name == wxString::FromAscii(clientName));

       else
           matches = (str1.Contains(str2) || str2.Contains(str1));
       
       else
           matches = (str1.Contains(str2) || str2.Contains(str1));
       


@@ -315,7 +316,8 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
 
   old = XSetErrorHandler(ErrorHandler);
   if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,
 
   old = XSetErrorHandler(ErrorHandler);
   if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,

-    &children, &numchildren) || Xerror) {
+    &children, &numchildren) || Xerror)
+  {

     XSetErrorHandler(old);
     return NULL;
   }
     XSetErrorHandler(old);
     return NULL;
   }