X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f2b099261f9e46d65f1fbcfd2a35aa816d5a2818:/include/wx/x11/reparent.h diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index 1d6494a8ab..32dc594797 100644 --- 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: @@ -18,7 +18,7 @@ * This class helps to reparent a specific window */ -class WXDLLIMPEXP_CORE wxAdoptedWindow; +class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow; class WXDLLIMPEXP_CORE wxReparenter: public wxObject { public: @@ -39,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; @@ -57,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