X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d99eb3e379fc5cdb835f9a87f92b612ec58dd1c..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 6740046652..1693a256ef 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -17,15 +17,17 @@ // ---------------------------------------------------------------------------- #include "wx/toplevel.h" // the base class +#include "wx/statusbr.h" // the default names for various classs -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxMenuBar; -class WXDLLEXPORT wxStatusBar; -class WXDLLEXPORT wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxMenuItem; +class WXDLLIMPEXP_FWD_CORE wxStatusBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; // ---------------------------------------------------------------------------- // constants @@ -49,7 +51,7 @@ class WXDLLEXPORT wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow +class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow { public: // construction @@ -71,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 // ------------------ @@ -81,20 +80,33 @@ public: #if wxUSE_MENUS virtual void SetMenuBar(wxMenuBar *menubar); virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } -#endif // wxUSE_MENUS - // process menu command: returns true if processed + // 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 wxMenuItem *FindItemInMenuBar(int menuId) const; + + // generate menu command corresponding to the given menu item + // + // returns true if processed + bool ProcessCommand(wxMenuItem *item); + + // generate menu command corresponding to the given menu command id + // + // returns true if processed bool ProcessCommand(int winid); +#else + bool ProcessCommand(int WXUNUSED(winid)) { return false; } +#endif // wxUSE_MENUS // status bar functions // -------------------- #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, @@ -175,6 +187,11 @@ public: virtual void DoGiveHelp(const wxString& text, bool show); #endif + virtual bool IsClientAreaChild(const wxWindow *child) const + { + return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); + } + protected: // the frame main menu/status/tool bars // ------------------------------------ @@ -211,9 +228,10 @@ protected: // something changes virtual void PositionStatusBar() { } - // show the help string for this menu item in the given status bar: the - // status bar pointer can be NULL; return true if help was shown - bool ShowMenuHelp(wxStatusBar *statbar, int helpid); + // show the help string for the given menu item using DoGiveHelp() if the + // given item does have a help string (as determined by FindInMenuBar()), + // return false if there is no help for such item + bool ShowMenuHelp(int helpid); wxStatusBar *m_frameStatusBar; #endif // wxUSE_STATUSBAR @@ -233,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 @@ -251,7 +269,7 @@ protected: #elif defined(__WXMOTIF__) #include "wx/motif/frame.h" #elif defined(__WXMAC__) - #include "wx/mac/frame.h" + #include "wx/osx/frame.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/frame.h" #elif defined(__WXPM__)