X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/894057d1dd154ad2ee06e911eef818c52789a576..874dbd3a4a318bd7f34548b84cfe0aed9efa42d5:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 3ab4c58d32..242a46dc38 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -77,18 +77,18 @@ enum // the actions supported by this control // ---------------------------------------------------------------------------- -#define wxACTION_TOPLEVEL_ACTIVATE _T("activate") // (de)activate the frame -#define wxACTION_TOPLEVEL_BUTTON_PRESS _T("pressbtn") // press titlebar btn -#define wxACTION_TOPLEVEL_BUTTON_RELEASE _T("releasebtn") // press titlebar btn -#define wxACTION_TOPLEVEL_BUTTON_CLICK _T("clickbtn") // press titlebar btn -#define wxACTION_TOPLEVEL_MOVE _T("move") // move the frame -#define wxACTION_TOPLEVEL_RESIZE _T("resize") // resize the frame +#define wxACTION_TOPLEVEL_ACTIVATE wxT("activate") // (de)activate the frame +#define wxACTION_TOPLEVEL_BUTTON_PRESS wxT("pressbtn") // press titlebar btn +#define wxACTION_TOPLEVEL_BUTTON_RELEASE wxT("releasebtn") // press titlebar btn +#define wxACTION_TOPLEVEL_BUTTON_CLICK wxT("clickbtn") // press titlebar btn +#define wxACTION_TOPLEVEL_MOVE wxT("move") // move the frame +#define wxACTION_TOPLEVEL_RESIZE wxT("resize") // resize the frame //----------------------------------------------------------------------------- // wxTopLevelWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, +class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative, public wxInputConsumer { public: @@ -130,7 +130,6 @@ public: // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual wxPoint GetClientAreaOrigin() const; - virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } virtual void SetIcons(const wxIconBundle& icons); // implementation from now on @@ -154,7 +153,7 @@ public: virtual wxSize GetMinSize() const; - virtual wxWindow *GetInputWindow() const { return wx_const_cast(wxTopLevelWindow*, this); } + virtual wxWindow *GetInputWindow() const { return const_cast(this); } protected: virtual void DoGetClientSize(int *width, int *height) const;