fixing warning and compile error against 10.4

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 1d6494a8abca606751f1b3f614e672060588763b..500e2eaf49e9035b3eb0653a69ce2a1f9b090ee8 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -18,7 +18,7 @@
  * This class helps to reparent a specific window
  */
 
  * This class helps to reparent a specific window
  */
 

-class WXDLLIMPEXP_CORE wxAdoptedWindow;
+class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow;

 class WXDLLIMPEXP_CORE wxReparenter: public wxObject
 {
 public:
 class WXDLLIMPEXP_CORE wxReparenter: public wxObject
 {
 public:


@@ -39,7 +39,7 @@ protected:
 
     bool ProcessXEvent(WXEvent* event);
     WXWindow FindAClientWindow(WXWindow window, const wxString& name);
 
     bool ProcessXEvent(WXEvent* event);
     WXWindow FindAClientWindow(WXWindow window, const wxString& name);

-    
+

     static bool sm_done;
     static wxAdoptedWindow* sm_toReparent;
     static wxWindow* sm_newParent;
     static bool sm_done;
     static wxAdoptedWindow* sm_toReparent;
     static wxWindow* sm_newParent;


@@ -57,10 +57,10 @@ 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; m_clientWindow = window; }
 
     void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }

-    WXWindow GetHandle() const { return GetMainWindow(); }
+    WXWindow GetHandle() const { return X11GetMainWindow(); }

 };
 
 #endif
 };
 
 #endif