X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..f2b099261f9e46d65f1fbcfd2a35aa816d5a2818:/include/wx/x11/reparent.h?ds=sidebyside diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index 055e0456a8..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,18 +12,14 @@ #ifndef _WX_REPARENT_H_ #define _WX_REPARENT_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "reparent.h" -#endif - #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() {} @@ -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; @@ -56,15 +52,15 @@ protected: * toolkit. It has no parent until reparented. */ -class wxAdoptedWindow: public wxWindow +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