X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/654e324628ea1efc6dff6e5b494129931115f773..a703012aedeb8064c8294c6aeeea95e6950ad170:/include/wx/toplevel.h?ds=sidebyside diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 8fcb9830d9..d6af2b0aa1 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; // ---------------------------------------------------------------------------- /* - Summary of the bits used (some of them are defined in wx/frame.g and + Summary of the bits used (some of them are defined in wx/frame.h and wx/dialog.h and not here): +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ @@ -200,10 +200,10 @@ public: // maximize the window to cover entire screen virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0; - + // shows the window, but doesn't activate it. If the base code is being run, // it means the port doesn't implement this method yet and so alert the user. - virtual void ShowWithoutActivating() { + virtual void ShowWithoutActivating() { wxFAIL_MSG("ShowWithoutActivating not implemented on this platform."); } @@ -247,6 +247,10 @@ public: void CentreOnScreen(int dir = wxBOTH) { DoCentre(dir | wxCENTRE_ON_SCREEN); } void CenterOnScreen(int dir = wxBOTH) { CentreOnScreen(dir); } + // Get the default size for a new top level window. This is used when + // creating a wxTLW under some platforms if no explicit size given. + static wxSize GetDefaultSize(); + // default item access: we have a permanent default item which is the one // set by the user code but we may also have a temporary default item which @@ -296,7 +300,7 @@ public: // a different API for SetSizeHints virtual void SetMinSize(const wxSize& minSize); virtual void SetMaxSize(const wxSize& maxSize); - + virtual void OSXSetModified(bool modified) { m_modified = modified; } virtual bool OSXIsModified() const { return m_modified; } @@ -331,10 +335,6 @@ protected: // client area void DoLayout(); - // Get the default size for the new window if no explicit size given. If - // there are better default sizes then these can be changed, just as long - // as they are not too small for TLWs (and not larger than screen). - static wxSize GetDefaultSize(); static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; } static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; } @@ -347,7 +347,7 @@ protected: // a temporary override of m_winDefault, use the latter if NULL wxWindowRef m_winTmpDefault; - + bool m_modified; wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase);