X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6ac49b198cf4693752344cffa20b46bed364c77..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 3816a57b3e..1693a256ef 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -17,6 +17,7 @@ // ---------------------------------------------------------------------------- #include "wx/toplevel.h" // the base class +#include "wx/statusbr.h" // the default names for various classs extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; @@ -72,9 +73,6 @@ public: // if the frame has a toolbar) in client coordinates virtual wxPoint GetClientAreaOrigin() const; - // sends a size event to the window using its current size -- this has an - // effect of refreshing the window layout - virtual void SendSizeEvent(); // menu bar functions // ------------------ @@ -86,7 +84,7 @@ public: // find the item by id in the frame menu bar: this is an internal function // and exists mainly in order to be overridden in the MDI parent frame // which also looks at its active child menu bar - virtual const wxMenuItem *FindItemInMenuBar(int menuId) const; + virtual wxMenuItem *FindItemInMenuBar(int menuId) const; // generate menu command corresponding to the given menu item // @@ -106,10 +104,9 @@ public: #if wxUSE_STATUSBAR // create the main status bar by calling OnCreateStatusBar() virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, + long style = wxSTB_DEFAULT_STYLE, wxWindowID winid = 0, - const wxString& name = - wxStatusLineNameStr); + const wxString& name = wxStatusLineNameStr); // return a new status bar virtual wxStatusBar *OnCreateStatusBar(int number, long style, @@ -254,7 +251,7 @@ protected: DECLARE_EVENT_TABLE() #endif // wxUSE_MENUS && wxUSE_STATUSBAR - DECLARE_NO_COPY_CLASS(wxFrameBase) + wxDECLARE_NO_COPY_CLASS(wxFrameBase); }; // include the real class declaration