X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ab6adfedf92aa4457821422e77c19b80f10bee..39c0acb66674c5e0424633cf162e6c10c92178d4:/include/wx/msw/menu.h?ds=sidebyside diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 9ea6e9a338..90bc786920 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.h +// Name: wx/msw/menu.h // Purpose: wxMenu, wxMenuBar classes // Author: Julian Smart // Modified by: Vadim Zeitlin (wxMenuItem is now in separate file) // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MENU_H_ #define _WX_MENU_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menu.h" #endif @@ -20,11 +20,17 @@ #include "wx/accel.h" #include "wx/dynarray.h" - WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray); + WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray); #endif // wxUSE_ACCEL class WXDLLEXPORT wxFrame; +#if defined(__WXWINCE__) && wxUSE_TOOLBAR +class WXDLLEXPORT wxToolBar; +#endif + +#include "wx/arrstr.h" + // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- @@ -49,18 +55,22 @@ public: virtual void SetTitle(const wxString& title); - // MSW-specific - bool ProcessCommand(wxCommandEvent& event); - + // deprecated functions +#if wxUSE_MENU_CALLBACK wxMenu(const wxString& title, const wxFunction func) : wxMenuBase(title) { + Init(); + Callback(func); } +#endif // wxUSE_MENU_CALLBACK // implementation only from now on // ------------------------------- + virtual void Attach(wxMenuBarBase *menubar); + bool MSWCommand(WXUINT param, WXWORD id); // semi-private accessors @@ -69,10 +79,6 @@ public: // get the menu handle WXHMENU GetHMenu() const { return m_hMenu; } - // attach/detach menu to/from wxMenuBar - void Attach(wxMenuBar *menubar); - void Detach(); - #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus bool HasAccels() const { return !m_accels.IsEmpty(); } @@ -93,9 +99,15 @@ private: // common part of Append/Insert (behaves as Append is pos == (size_t)-1) bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1); + // terminate the current radio group, if any + void EndRadioGroup(); + // if TRUE, insert a breal before appending the next item bool m_doBreak; + // the position of the first item in the current radio group or -1 + int m_startRadioGroup; + // the menu handle of this menu WXHMENU m_hMenu; @@ -104,17 +116,36 @@ private: wxAcceleratorArray m_accels; #endif // wxUSE_ACCEL - DECLARE_DYNAMIC_CLASS(wxMenu) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu) }; // ---------------------------------------------------------------------------- // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- +class WXDLLEXPORT wxMenuInfo : public wxObject +{ +public : + wxMenuInfo() { m_menu = NULL ; } + virtual ~wxMenuInfo() { } + + void Create( wxMenu *menu , const wxString &title ) + { m_menu = menu ; m_title = title ; } + wxMenu* GetMenu() const { return m_menu ; } + wxString GetTitle() const { return m_title ; } +private : + wxMenu *m_menu ; + wxString m_title ; + + DECLARE_DYNAMIC_CLASS(wxMenuInfo) ; +} ; + +WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); + class WXDLLEXPORT wxMenuBar : public wxMenuBarBase { public: - // ctors & dtor + // ctors & dtor // default constructor wxMenuBar(); // unused under MSW @@ -124,39 +155,28 @@ public: virtual ~wxMenuBar(); // menubar construction + bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; } + const wxMenuInfoList& GetMenuInfos() const ; + virtual bool Append( wxMenu *menu, const wxString &title ); virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); virtual wxMenu *Remove(size_t pos); - virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; - virtual void EnableTop( size_t pos, bool flag ); virtual void SetLabelTop( size_t pos, const wxString& label ); virtual wxString GetLabelTop( size_t pos ) const; - // compatibility: these functions are deprecated -#if WXWIN_COMPATIBILITY - void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - wxEvtHandler *GetEventHandler() { return m_eventHandler; } - - bool Enabled(int id) const { return IsEnabled(id); } - bool Checked(int id) const { return IsChecked(id); } -#endif // WXWIN_COMPATIBILITY - // implementation from now on WXHMENU Create(); - int FindMenu(const wxString& title); - void Detach(); + virtual void Detach(); + virtual void Attach(wxFrame *frame); - // returns TRUE if we're attached to a frame - bool IsAttached() const { return m_menuBarFrame != NULL; } - // get the frame we live in - wxFrame *GetFrame() const { return m_menuBarFrame; } - // attach to a frame - void Attach(wxFrame *frame); +#if defined(__WXWINCE__) && wxUSE_TOOLBAR + // Under WinCE, a menubar is owned by the frame's toolbar + void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; } + wxToolBar* GetToolBar() const { return m_toolBar; } +#endif #if wxUSE_ACCEL // get the accel table for all the menus @@ -173,17 +193,17 @@ public: // call this function to update it (m_menuBarFrame should be !NULL) void Refresh(); + // To avoid compile warning + void Refresh( bool eraseBackground, + const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); } + protected: // common part of all ctors void Init(); -#if WXWIN_COMPATIBILITY - wxEvtHandler *m_eventHandler; -#endif // WXWIN_COMPATIBILITY + wxArrayString m_titles ; + wxMenuInfoList m_menuInfos; - wxArrayString m_titles; - - wxFrame *m_menuBarFrame; WXHMENU m_hMenu; #if wxUSE_ACCEL @@ -191,8 +211,12 @@ protected: wxAcceleratorTable m_accelTable; #endif // wxUSE_ACCEL +#if defined(__WXWINCE__) && wxUSE_TOOLBAR + wxToolBar* m_toolBar; +#endif + private: - DECLARE_DYNAMIC_CLASS(wxMenuBar) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar) }; #endif // _WX_MENU_H_