X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/x11/reparent.h diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index 6956c7eed9..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: @@ -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