X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2327a9f80fa3240ab652da8f95a66b5c25576de..214b7e74f0d6e46fc278d0060b2e864a23f1714e:/include/wx/frame.h?ds=sidebyside diff --git a/include/wx/frame.h b/include/wx/frame.h index d21024cfb2..de126f6a57 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -27,6 +27,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern wxWindow*) wxWndHook; class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; @@ -57,6 +58,9 @@ class WXDLLEXPORT wxFrameBase : public wxWindow public: // construction wxFrameBase(); +#ifdef __WXMAC_X__ + virtual ~wxFrameBase() {} // Added min for Mac X +#endif wxFrame *New(wxWindow *parent, wxWindowID id, @@ -191,6 +195,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 id); + wxStatusBar *m_frameStatusBar; #endif // wxUSE_STATUSBAR