Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 815024d40bdf4e6cebf6f0040b5eaf4094310d75..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:
 // Purpose:     Reparenting classes
 // Author:      Julian Smart
 // Modified by:


@@ -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() {}


@@ -43,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;


@@ -56,15 +52,15 @@ 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; }
-    WXWindow GetHandle() const { return GetMainWindow(); }
+    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
+    WXWindow GetHandle() const { return X11GetMainWindow(); }

 };
 
 #endif
 };
 
 #endif