X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b022169511792a75b3ae7fed895ea88d30e64af..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/frame.h?ds=sidebyside diff --git a/include/wx/frame.h b/include/wx/frame.h index 9b857d9f4b..2889bbecae 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -16,21 +16,16 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "framebase.h" -#endif - #include "wx/toplevel.h" // the base class // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const wxChar) 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 wxStatusBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; // ---------------------------------------------------------------------------- // constants @@ -86,6 +81,11 @@ public: #if wxUSE_MENUS virtual void SetMenuBar(wxMenuBar *menubar); virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } + + // 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; #endif // wxUSE_MENUS // process menu command: returns true if processed @@ -173,14 +173,17 @@ public: { return false; } #endif // no wxTopLevelWindowNative - // show help text (typically in the statusbar); show is false - // if you are hiding the help, true otherwise +#if wxUSE_MENUS || wxUSE_TOOLBAR + // show help text for the currently selected menu or toolbar item + // (typically in the status bar) or hide it and restore the status bar text + // originally shown before the menu was opened if show == false virtual void DoGiveHelp(const wxString& text, bool show); +#endif -#if WXWIN_COMPATIBILITY_2_2 - // call this to simulate a menu command - bool Command(int winid) { return ProcessCommand(winid); } -#endif // WXWIN_COMPATIBILITY_2_2 + virtual bool IsClientAreaChild(const wxWindow *child) const + { + return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); + } protected: // the frame main menu/status/tool bars @@ -206,21 +209,22 @@ protected: virtual void AttachMenuBar(wxMenuBar *menubar); wxMenuBar *m_frameMenuBar; +#endif // wxUSE_MENUS -#if wxUSE_STATUSBAR +#if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR) // the saved status bar text overwritten by DoGiveHelp() wxString m_oldStatusText; -#endif // wxUSE_STATUSBAR -#endif // wxUSE_MENUS +#endif #if wxUSE_STATUSBAR // override to update status bar position (or anything else) when // 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 @@ -247,12 +251,14 @@ protected: #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #if defined(__PALMOS__) + #if defined(__WXPALMOS__) #include "wx/palmos/frame.h" #elif defined(__WXMSW__) #include "wx/msw/frame.h" - #elif defined(__WXGTK__) + #elif defined(__WXGTK20__) #include "wx/gtk/frame.h" + #elif defined(__WXGTK__) + #include "wx/gtk1/frame.h" #elif defined(__WXMOTIF__) #include "wx/motif/frame.h" #elif defined(__WXMAC__)