X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffd84c9476298154de52e55cd9dff3572c68ab18..ad805b9e0d0966647a633220c0c63cd1a89629a0:/include/wx/x11/toplevel.h diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h index ac50971747..7aaffb5243 100644 --- a/include/wx/x11/toplevel.h +++ b/include/wx/x11/toplevel.h @@ -16,7 +16,7 @@ // wxTopLevelWindowX11 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowX11 : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase { public: // constructors and such @@ -50,7 +50,6 @@ public: virtual bool IsMaximized() const; virtual void Iconize(bool iconize = true); virtual bool IsIconized() const; - virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } virtual void SetIcons(const wxIconBundle& icons); virtual void Restore(); @@ -70,6 +69,12 @@ public: virtual bool SetShape(const wxRegion& region); + // For implementation purposes - sometimes decorations make the + // client area smaller + virtual wxPoint GetClientAreaOrigin() const; + + virtual void OnInternalIdle(); + protected: // common part of all ctors void Init(); @@ -77,13 +82,8 @@ protected: // set the icon for the window void DoSetIcon( const wxIcon& icon ); - // For implementation purposes - sometimes decorations make the - // client area smaller - virtual wxPoint GetClientAreaOrigin() const; - // For implementation of delayed resize events bool m_needResizeInIdle; - virtual void OnInternalIdle(); virtual void DoGetClientSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const; @@ -112,6 +112,6 @@ protected: }; // list of all frames and modeless dialogs -//extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; +//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; #endif // _WX_X11_TOPLEVEL_H_