Committing in .

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40bdf4e6cebf6f0040b5eaf4094310d75..6956c7eed9dc15b093b4e26d44d75d2f469e19a6 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "reparent.h"
 #endif
 
@@ -22,8 +22,8 @@
  * This class helps to reparent a specific window
  */
 
-class wxAdoptedWindow;
-class wxReparenter: public wxObject
+class WXDLLIMPEXP_CORE wxAdoptedWindow;
+class WXDLLIMPEXP_CORE wxReparenter: public wxObject
 {
 public:
     wxReparenter() {}
@@ -56,14 +56,14 @@ protected:
  * toolkit. It has no parent until reparented.
  */
 
-class wxAdoptedWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow
 {
   public:
     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(); }
 };