moving tlw list up, cleanup

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40bdf4e6cebf6f0040b5eaf4094310d75..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_
 
 #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
  */
 
 #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() {}
 {
 public:
     wxReparenter() {}


@@ -56,14 +52,14 @@ protected:
  * toolkit. It has no parent until reparented.
  */
 
  * toolkit. It has no parent until reparented.
  */
 

-class wxAdoptedWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow

 {
   public:
     wxAdoptedWindow();
     wxAdoptedWindow(WXWindow window);
 {
   public:
     wxAdoptedWindow();
     wxAdoptedWindow(WXWindow window);

-    ~wxAdoptedWindow();
+    virtual ~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(); }
 };