X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..d38819f56f68eebd88fd88f47fa44711bf6ec5d0:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 2af6cd1d8d..8c599ae435 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,22 +16,27 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "framebase.h" -#endif - #include "wx/toplevel.h" // the base class // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; class WXDLLEXPORT wxFrame; 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 +49,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 +57,7 @@ public: virtual ~wxFrameBase(); wxFrame *New(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -73,10 +73,7 @@ public: // sends a size event to the window using its current size -- this has an // effect of refreshing the window layout - // - // currently it is only implemented under MSW but is declared here to make - // it possible to call it in portable code without using #ifdef's - virtual void SendSizeEvent() { } + virtual void SendSizeEvent(); // menu bar functions // ------------------ @@ -86,31 +83,28 @@ public: virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } #endif // wxUSE_MENUS - // call this to simulate a menu command - bool Command(int id) { return ProcessCommand(id); } - - // 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; } + virtual void SetStatusBar(wxStatusBar *statBar); // forward these to status bar virtual void SetStatusText(const wxString &text, int number = 0); @@ -125,48 +119,60 @@ 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 virtual wxToolBar *GetToolBar() const { return m_frameToolBar; } - virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; } + virtual void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR // implementation only from now on // ------------------------------- // 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 +#if wxUSE_MENUS || wxUSE_TOOLBAR + // 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); +#endif protected: // the frame main menu/status/tool bars @@ -194,14 +200,19 @@ protected: wxMenuBar *m_frameMenuBar; #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR) + // the saved status bar text overwritten by DoGiveHelp() + wxString m_oldStatusText; +#endif + #if wxUSE_STATUSBAR // override to update status bar position (or anything else) when // 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); + // status bar pointer can be NULL; return true if help was shown + bool ShowMenuHelp(wxStatusBar *statbar, int helpid); wxStatusBar *m_frameStatusBar; #endif // wxUSE_STATUSBAR @@ -217,21 +228,31 @@ 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) }; // include the real class declaration #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #if defined(__WXMSW__) + #if defined(__WXPALMOS__) + #include "wx/palmos/frame.h" + #elif defined(__WXMSW__) #include "wx/msw/frame.h" - #elif defined(__WXGTK__) + #elif defined(__WXGTK20__) #include "wx/gtk/frame.h" + #elif defined(__WXGTK__) + #include "wx/gtk1/frame.h" #elif defined(__WXMOTIF__) #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