using subclass as impl ptr, common code in macro because mix-in are not possible...

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 8170084a19c59f6fbd54ca09d3a251b7bd4472f9..b32d43f71c831777ee9c58e9f93fd3059d80d7a2 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -12,18 +12,14 @@
 #ifndef _WX_REPARENT_H_
 #define _WX_REPARENT_H_
 
-#ifdef __GNUG__
-#pragma interface "reparent.h"
-#endif
-
 #include "wx/window.h"
 
 /*
  * This class helps to reparent a specific window
  */
 
-class wxAdoptedWindow;
-class wxReparenter: public wxObject
+class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow;
+class WXDLLIMPEXP_CORE wxReparenter: public wxObject
 {
 public:
     wxReparenter() {}
@@ -56,15 +52,15 @@ protected:
  * toolkit. It has no parent until reparented.
  */
 
-class wxAdoptedWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow
 {
   public:
     wxAdoptedWindow();
     wxAdoptedWindow(WXWindow window);
-    ~wxAdoptedWindow();
+    virtual ~wxAdoptedWindow();
 
-    void SetHandle(WXWindow window) { m_mainWidget = window; }
-    WXWindow GetHandle() const { return GetXWindow(); }
+    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
+    WXWindow GetHandle() const { return GetMainWindow(); }
 };
 
 #endif