X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/frame.h?ds=sidebyside diff --git a/include/wx/frame.h b/include/wx/frame.h index a84dbcd302..e39c17f22e 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[]; @@ -33,6 +34,8 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // ---------------------------------------------------------------------------- // wxFrame-specific (i.e. not for wxDialog) styles +// +// Also see the bit summary table in wx/toplevel.h. #define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only) #define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu #define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent @@ -72,9 +75,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,21 +86,29 @@ 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; -#endif // wxUSE_MENUS + virtual wxMenuItem *FindItemInMenuBar(int menuId) const; + + // generate menu command corresponding to the given menu item + // + // returns true if processed + bool ProcessCommand(wxMenuItem *item); - // process menu command: returns true if processed + // 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, @@ -163,17 +171,6 @@ public: // Implement internal behaviour (menu updating on some platforms) virtual void OnInternalIdle(); - // if there is no real wxTopLevelWindow on this platform we have to define - // some wxTopLevelWindowBase pure virtual functions here to avoid breaking - // old ports (wxMotif) which don't define them in wxFrame -#ifndef wxTopLevelWindowNative - virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style) = wxFULLSCREEN_ALL) - { return false; } - virtual bool IsFullScreen() const - { return false; } -#endif // no wxTopLevelWindowNative - #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 @@ -215,6 +212,9 @@ protected: #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR) // the saved status bar text overwritten by DoGiveHelp() wxString m_oldStatusText; + + // the last help string we have shown in the status bar + wxString m_lastHelpShown; #endif #if wxUSE_STATUSBAR @@ -245,7 +245,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 @@ -263,7 +263,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__)