add WXWIN_COMPATIBILITY_2_6 block around wxUsleep deprecation; put wxPlatform declara...

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index ae054a4bbaf373b950d5b182318c29978125f56c..b32d43f71c831777ee9c58e9f93fd3059d80d7a2 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -6,24 +6,20 @@
 // Created:     2002-03-09
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REPARENT_H_
 #define _WX_REPARENT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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,12 +52,12 @@ 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; m_clientWindow = window; }
     WXWindow GetHandle() const { return GetMainWindow(); }