X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..b41f29c357205531670a156b67247b9345688150:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 0fbb3f4e06..053f50f07d 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -5,8 +5,8 @@ // Modified by: // Created: 15.11.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team -// Licence: wxWindows license +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FRAME_H_BASE_ @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "framebase.h" #endif @@ -32,6 +32,16 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxToolBar; +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// wxFrame-specific (i.e. not for wxDialog) styles +#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 // @@ -44,12 +54,7 @@ class WXDLLEXPORT wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -// FIXME - temporary hack in absence of wxTLW !! -#ifndef wxTopLevelWindowNative -class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase -#else class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow -#endif { public: // construction @@ -57,7 +62,7 @@ public: virtual ~wxFrameBase(); wxFrame *New(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -86,33 +91,29 @@ public: virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } #endif // wxUSE_MENUS -#ifdef WXWIN_COMPATIBILITY_2_2 - // call this to simulate a menu command - bool Command(int id) { return ProcessCommand(id); } -#endif // WXWIN_COMPATIBILITY_2_2 - - // process menu command: returns TRUE if processed - bool ProcessCommand(int id); + // process menu command: returns true if processed + bool ProcessCommand(int winid); // status bar functions // -------------------- #if wxUSE_STATUSBAR // create the main status bar by calling OnCreateStatusBar() virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, - wxWindowID id = 0, + long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, + wxWindowID winid = 0, const wxString& name = wxStatusLineNameStr); // return a new status bar virtual wxStatusBar *OnCreateStatusBar(int number, long style, - wxWindowID id, + wxWindowID winid, const wxString& name); // get the main status bar virtual wxStatusBar *GetStatusBar() const { return m_frameStatusBar; } // sets the main status bar - void SetStatusBar(wxStatusBar *statBar) { m_frameStatusBar = statBar; } + void SetStatusBar(wxStatusBar *statBar) + { m_frameStatusBar = statBar; PositionStatusBar(); } // forward these to status bar virtual void SetStatusText(const wxString &text, int number = 0); @@ -127,14 +128,15 @@ public: // toolbar functions // ----------------- + #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, - wxWindowID id = -1, + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID winid = wxID_ANY, const wxString& name = wxToolBarNameStr); // return a new toolbar virtual wxToolBar *OnCreateToolBar(long style, - wxWindowID id, + wxWindowID winid, const wxString& name ); // get/set the main toolbar @@ -146,30 +148,44 @@ public: // ------------------------------- // event handlers - void OnIdle(wxIdleEvent& event); +#if wxUSE_MENUS +#if wxUSE_STATUSBAR + void OnMenuOpen(wxMenuEvent& event); + void OnMenuClose(wxMenuEvent& event); void OnMenuHighlight(wxMenuEvent& event); +#endif // wxUSE_STATUSBAR -#if wxUSE_MENUS - // send wxUpdateUIEvents for all menu items (called from OnIdle()) - void DoMenuUpdates(); - void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); + // send wxUpdateUIEvents for all menu items in the menubar, + // or just for menu if non-NULL + virtual void DoMenuUpdates(wxMenu* menu = NULL); #endif // wxUSE_MENUS + // do the UI update processing for this window + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); + + // 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; } + { return false; } virtual bool IsFullScreen() const - { return FALSE; } + { return false; } #endif // no wxTopLevelWindowNative - // show help text (typically in the statusbar); show is FALSE - // if you are hiding the help, TRUE otherwise + // show help text (typically in the statusbar); show is false + // if you are hiding the help, true otherwise virtual void DoGiveHelp(const wxString& text, bool show); +#if WXWIN_COMPATIBILITY_2_2 + // call this to simulate a menu command + bool Command(int winid) { return ProcessCommand(winid); } +#endif // WXWIN_COMPATIBILITY_2_2 + protected: // the frame main menu/status/tool bars // ------------------------------------ @@ -194,6 +210,11 @@ protected: virtual void AttachMenuBar(wxMenuBar *menubar); wxMenuBar *m_frameMenuBar; + +#if wxUSE_STATUSBAR + // the saved status bar text overwritten by DoGiveHelp() + wxString m_oldStatusText; +#endif // wxUSE_STATUSBAR #endif // wxUSE_MENUS #if wxUSE_STATUSBAR @@ -202,8 +223,8 @@ protected: 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); + // status bar pointer can be NULL; return true if help was shown + bool ShowMenuHelp(wxStatusBar *statbar, int helpid); wxStatusBar *m_frameStatusBar; #endif // wxUSE_STATUSBAR @@ -219,7 +240,10 @@ protected: wxToolBar *m_frameToolBar; #endif // wxUSE_TOOLBAR +#if wxUSE_MENUS && wxUSE_STATUSBAR DECLARE_EVENT_TABLE() +#endif // wxUSE_MENUS && wxUSE_STATUSBAR + DECLARE_NO_COPY_CLASS(wxFrameBase) }; @@ -235,6 +259,8 @@ protected: #include "wx/motif/frame.h" #elif defined(__WXMAC__) #include "wx/mac/frame.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/frame.h" #elif defined(__WXPM__) #include "wx/os2/frame.h" #endif