X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed72fbf723697143940bc927b1a6d6fee35beb3f..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/include/wx/toplevel.h diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index a2cc6c0ef8..ce058932b0 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -23,7 +23,7 @@ #endif #include "wx/window.h" -#include "wx/icon.h" +#include "wx/iconbndl.h" // the default names for various classs WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; @@ -83,10 +83,16 @@ public: virtual bool IsIconized() const = 0; // get the frame icon - const wxIcon& GetIcon() const { return m_icon; } + const wxIcon& GetIcon() const { return m_icons.GetIcon( -1 ); } + + // get the frame icons + const wxIconBundle& GetIcons() const { return m_icons; } // set the frame icon - virtual void SetIcon(const wxIcon& icon) { m_icon = icon; } + virtual void SetIcon(const wxIcon& icon) { m_icons = wxIconBundle( icon ); } + + // set the frame icons + virtual void SetIcons(const wxIconBundle& icons ) { m_icons = icons; } // maximize the window to cover entire screen virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0; @@ -113,6 +119,7 @@ public: // override some base class virtuals virtual bool Destroy(); virtual bool IsTopLevel() const { return TRUE; } + virtual wxSize GetMaxSize() const; // event handlers void OnCloseWindow(wxCloseEvent& event); @@ -122,14 +129,6 @@ public: // so should be there for all platforms void OnActivate(wxActivateEvent &WXUNUSED(event)) { } - // Override in derived, platfrom specific, class if your OS coordinate - // system uses anything other than the top left as 0,0. The second - // method updates any internal sizing parameters such as OS/2's SWP struct - inline virtual void AlterChildPos(void) { } - inline virtual void UpdateInternalSize( wxWindow* WXUNUSED(pChild) - ,int WXUNUSED(nHeight) - ) { } - protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area @@ -140,7 +139,7 @@ protected: bool SendIconizeEvent(bool iconized = TRUE); // the frame icon - wxIcon m_icon; + wxIconBundle m_icons; // test whether this window makes part of the frame // (menubar, toolbar and statusbar are excluded from automatic layout) @@ -157,6 +156,9 @@ protected: #elif defined(__WXGTK__) #include "wx/gtk/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowGTK +#elif defined(__WXX11__) + #include "wx/x11/toplevel.h" + #define wxTopLevelWindowNative wxTopLevelWindowX11 #elif defined(__WXMGL__) #include "wx/mgl/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMGL @@ -196,3 +198,5 @@ protected: #endif // _WX_TOPLEVEL_BASE_H_ + +// vi:sts=4:sw=4:et