X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..dcc36b34be1e1492894a5be7a027d99d3e74ebd9:/src/x11/reparent.cpp

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index 7fab513311..eea2b4d6fe 100644
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        reparent.cpp
+// Name:        src/x11/reparent.cpp
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
@@ -9,6 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+#pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -17,15 +24,17 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/setup.h"
-
 #if !wxUSE_NANOX
 
 #include "wx/x11/reparent.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/timer.h"
+#endif
+
 #include "wx/evtloop.h"
-#include "wx/log.h"
-#include "wx/app.h"
-#include "wx/timer.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
@@ -53,11 +62,11 @@ wxAdoptedWindow::~wxAdoptedWindow()
 
 static bool Xerror;
 static Atom WM_STATE = 0;
-bool wxReparenter::sm_done = FALSE;
+bool wxReparenter::sm_done = false;
 wxAdoptedWindow* wxReparenter::sm_toReparent = NULL;
 wxWindow* wxReparenter::sm_newParent = NULL;
 wxString wxReparenter::sm_name;
-bool wxReparenter::sm_exactMatch = FALSE;
+bool wxReparenter::sm_exactMatch = false;
 
 static int ErrorHandler(Display* dpy, XErrorEvent* event)
 {
@@ -88,7 +97,7 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
                      &children, &numchildren) || Xerror)
     {
         XSetErrorHandler(old);
-        return TRUE;
+        return true;
     }
 
     if (numchildren > 0)
@@ -118,11 +127,11 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
     }
 
     XSetErrorHandler(old);
-    return TRUE;
+    return true;
 }
 
 // Wait for an appropriate window to be created.
-// If exactMatch is FALSE, a substring match is OK.
+// If exactMatch is false, a substring match is OK.
 // If windowName is empty, then wait for the next overrideRedirect window.
 bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent,
                                    const wxString& windowName,
@@ -132,7 +141,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
     sm_toReparent = toReparent;
     sm_exactMatch = exactMatch;
     sm_name = windowName;
-    
+
     Display* display = wxGlobalDisplay();
     XSelectInput(display,
         RootWindowOfScreen(DefaultScreenOfDisplay(display)),
@@ -142,11 +151,11 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
         WM_STATE = XInternAtom(display, "WM_STATE", False);
 
 #ifdef __WXDEBUG__
-    if (!windowName.IsEmpty())
+    if (!windowName.empty())
         wxLogDebug(_T("Waiting for window %s"), windowName.c_str());
 #endif
-    
-    sm_done = FALSE;
+
+    sm_done = false;
 
     wxEventLoop eventLoop;
     while (!sm_done)
@@ -169,7 +178,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
 #endif
         }
     }
-    return TRUE;
+    return true;
 }
 
 bool wxReparenter::ProcessXEvent(WXEvent* event)
@@ -183,13 +192,13 @@ bool wxReparenter::ProcessXEvent(WXEvent* event)
         {
             wxLogDebug(_T("Window was mapped"));
         }
-        
+
         if (xevent->type == MapNotify && !xevent->xmap.override_redirect &&
             (client = (Window) FindAClientWindow((WXWindow) xevent->xmap.window, sm_name)))
         {
             wxLogDebug(_T("Found a client window, about to reparent"));
             wxASSERT(sm_toReparent->GetParent() == NULL);
-            
+
             sm_toReparent->SetHandle((WXWindow) client);
             sm_newParent->AddChild(sm_toReparent);
             sm_done = Reparent(sm_newParent, sm_toReparent);
@@ -202,12 +211,12 @@ bool wxReparenter::ProcessXEvent(WXEvent* event)
             sm_toReparent->SetHandle((WXWindow) xevent->xmap.window);
             sm_newParent->AddChild(sm_toReparent);
             wxASSERT(sm_toReparent->GetParent() == NULL);
-            
+
             sm_done = Reparent(sm_newParent, sm_toReparent);
             return sm_done;
         }
     }
-    return FALSE;
+    return false;
 }
 
 WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
@@ -223,7 +232,7 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
     Window result = 0;
     XErrorHandler old;
     char *clientName;
-    
+
     Xerror = False;
     old = XSetErrorHandler(ErrorHandler);
     rvalue = XGetWindowProperty((Display*) wxGetDisplay(),
@@ -241,26 +250,26 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
             XFree((char *) propreturn);
         }
         XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName);
-        
+
         wxString str1(name);
         wxString str2 = wxString::FromAscii(clientName);
         str1.Lower();
         str2.Lower();
-        
+
         bool matches;
         if (sm_exactMatch)
             matches = (name == wxString::FromAscii(clientName));
         else
             matches = (str1.Contains(str2) || str2.Contains(str1));
-        
+
         XFree(clientName);
-        
+
         if (matches)
             return (WXWindow) window;
         else
             return NULL;
     }
-    
+
     old = XSetErrorHandler(ErrorHandler);
     if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,
         &children, &numchildren) || Xerror)
@@ -269,7 +278,7 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
         return NULL;
     }
     XSetErrorHandler(old);
-    
+
     result = 0;
     for (i=0; i<(int)numchildren && !result ;i++) {
         result = (Window) FindAClientWindow((WXWindow) children[i], name);
@@ -279,4 +288,4 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
     } return (WXWindow) result;
 }
 
-#endif
+#endif // !wxUSE_NANOX