Work around wxFinite() definition conflict with <cmath>.

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 6956c7eed9dc15b093b4e26d44d75d2f469e19a6..32dc594797b5d151ac9896dba34861871ab969b6 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        reparent.h
+// Name:        wx/x11/reparent.h
 // Purpose:     Reparenting classes
 // Author:      Julian Smart
 // Modified by:
@@ -12,17 +12,13 @@
 #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 WXDLLIMPEXP_CORE wxAdoptedWindow;
+class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow;
 class WXDLLIMPEXP_CORE wxReparenter: public wxObject
 {
 public:
@@ -43,7 +39,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;
@@ -61,10 +57,10 @@ 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(); }
+    WXWindow GetHandle() const { return X11GetMainWindow(); }
 };
 
 #endif