// ----------------------------------------------------------------------------
#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 WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
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
-#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped
// ----------------------------------------------------------------------------
// wxFrame is a top-level window with optional menubar, statusbar and toolbar
// CreateXXXBar() is called.
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow
{
public:
// construction
// 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
// ------------------
// 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;
- // process menu command: returns true if processed
+ // 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,
// 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
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
// ------------------------------------
// test whether this window makes part of the frame
virtual bool IsOneOfBars(const wxWindow *win) const;
- virtual bool IsClientAreaChild(const wxWindow *child) const
- {
- return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
- }
#if wxUSE_MENUS
// override to update menu bar position when the frame size changes
// frame
virtual void AttachMenuBar(wxMenuBar *menubar);
+ // Return true if we should update the menu item state from idle event
+ // handler or false if we should delay it until the menu is opened.
+ static bool ShouldUpdateMenuFromIdle();
+
wxMenuBar *m_frameMenuBar;
#endif // wxUSE_MENUS
#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
DECLARE_EVENT_TABLE()
#endif // wxUSE_MENUS && wxUSE_STATUSBAR
- DECLARE_NO_COPY_CLASS(wxFrameBase)
+ wxDECLARE_NO_COPY_CLASS(wxFrameBase);
};
// include the real class declaration
#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
#include "wx/univ/frame.h"
#else // !__WXUNIVERSAL__
- #if defined(__WXPALMOS__)
- #include "wx/palmos/frame.h"
- #elif defined(__WXMSW__)
+ #if defined(__WXMSW__)
#include "wx/msw/frame.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/frame.h"
#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__)