X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab6b6b15e0790bf3fd9e5b58da7077ac5592d8d3..1828600933a1c9bb4b81d10225bd15e1d505c21f:/include/wx/x11/reparent.h

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40b..43a1b8d34b 100644
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        reparent.h
+// Name:        wx/x11/reparent.h
 // Purpose:     Reparenting classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     2002-03-09
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,18 +11,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() {}
@@ -43,7 +38,7 @@ protected:
 
     bool ProcessXEvent(WXEvent* event);
     WXWindow FindAClientWindow(WXWindow window, const wxString& name);
-    
+
     static bool sm_done;
     static wxAdoptedWindow* sm_toReparent;
     static wxWindow* sm_newParent;
@@ -56,15 +51,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_mainWindow = window; }
-    WXWindow GetHandle() const { return GetMainWindow(); }
+    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
+    WXWindow GetHandle() const { return X11GetMainWindow(); }
 };
 
 #endif