X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b48f51ca745c5d3dfd704947812bbea90a44a1eb..51181d291194b7ae616cfb17c984fd8927e4a977:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 17681cfd9a..d72d9ac85a 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -88,7 +88,7 @@ enum // wxTopLevelWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, +class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative, public wxInputConsumer { public: @@ -122,7 +122,7 @@ public: // decorations anyhow and that by default native decorations are used // // if UseNativeDecorations() is used, it must be called before Create() - static UseNativeDecorationsByDefault(bool native = true); + static void UseNativeDecorationsByDefault(bool native = true); void UseNativeDecorations(bool native = true); bool IsUsingNativeDecorations() const; @@ -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 @@ -152,10 +151,9 @@ public: // move/resize the frame interactively, i.e. let the user do it virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE); - virtual int GetMinWidth() const; - virtual int GetMinHeight() const; + 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;