X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4f8f8d180afa03110f52eb95f9b083088f5c03..c3f4609ebb56f76065c28352d8db37f65a6fa35e:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index b8308307e4..de126f6a57 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -27,11 +27,20 @@ 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; class WXDLLEXPORT wxToolBar; +// Styles for ShowFullScreen +#define wxFULLSCREEN_NOMENUBAR 0x01 +#define wxFULLSCREEN_NOTOOLBAR 0x02 +#define wxFULLSCREEN_NOSTATUSBAR 0x04 +#define wxFULLSCREEN_NOBORDER 0x08 +#define wxFULLSCREEN_NOCAPTION 0x10 +#define wxFULLSCREEN_ALL (wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION) + // ---------------------------------------------------------------------------- // wxFrame is a top-level window with optional menubar, statusbar and toolbar // @@ -49,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, @@ -183,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