removed (unused) nCtlColor parameter of OnCtlColor(); added MSWControlColor(); implem...

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

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index 5ea7b27c156b0bd48e9dd9fc80f1df1b60d83c62..7e76d2334d040a052f4eb4aa3c4ee2bd4a63f447 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "reparent.h"
 #endif
 
     #pragma implementation "reparent.h"
 #endif
 


@@ -169,7 +169,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
         {
 #if wxUSE_TIMER
             wxTimer::NotifyTimers();
         {
 #if wxUSE_TIMER
             wxTimer::NotifyTimers();

-            wxTheApp->SendIdleEvents();
+            wxTheApp->ProcessIdle();

 #endif
         }
     }
 #endif
         }
     }