wxSortedArray::Add must return the index of the newly

[wxWidgets.git] / include / wx / x11 / reparent.h

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40bdf4e6cebf6f0040b5eaf4094310d75..055e0456a8ce2f98c0ccdb7fee3c47e19d0fd7b6 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REPARENT_H_
 #define _WX_REPARENT_H_
 
 #ifndef _WX_REPARENT_H_
 #define _WX_REPARENT_H_
 

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

 #pragma interface "reparent.h"
 #endif
 
 #pragma interface "reparent.h"
 #endif
 


@@ -63,7 +63,7 @@ class wxAdoptedWindow: public wxWindow
     wxAdoptedWindow(WXWindow window);
     ~wxAdoptedWindow();
 
     wxAdoptedWindow(WXWindow window);
     ~wxAdoptedWindow();
 

-    void SetHandle(WXWindow window) { m_mainWindow = window; }
+    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }

     WXWindow GetHandle() const { return GetMainWindow(); }
 };
 
     WXWindow GetHandle() const { return GetMainWindow(); }
 };