X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b908d2244a4975ceda4e050744280bf07e9ff350..9853d97739ac40bed4a9690f39e1c51bf9b5733f:/include/wx/msw/menu.h?ds=inline diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index ed9641b35b..84746929c6 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -19,6 +19,11 @@ #include "wx/defs.h" #include "wx/event.h" #include "wx/dynarray.h" +#include "wx/string.h" + +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL class WXDLLEXPORT wxMenuItem; class WXDLLEXPORT wxMenuBar; @@ -27,6 +32,8 @@ class WXDLLEXPORT wxFrame; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; +WX_DEFINE_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray); + // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- @@ -37,13 +44,16 @@ class WXDLLEXPORT wxMenu : public wxEvtHandler public: // ctors & dtor -#ifdef WXWIN_COMPATIBILITY wxMenu(const wxString& title, const wxFunction func) { Init(title, func); } -#endif + + wxMenu( long WXUNUSED(style) ) + { + Init( wxEmptyString ); + } wxMenu(const wxString& title = wxEmptyString, long WXUNUSED(style) = 0) { @@ -118,7 +128,6 @@ public: bool ProcessCommand(wxCommandEvent& event); - virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; } void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } wxEvtHandler *GetEventHandler() const { return m_eventHandler; } @@ -139,28 +148,24 @@ public: void Detach(); #if wxUSE_ACCEL - size_t GetAccelCount() const { return m_accelKeyCodes.GetCount(); } + size_t GetAccelCount() const { return m_accels.GetCount(); } size_t CopyAccels(wxAcceleratorEntry *accels) const; #endif // wxUSE_ACCEL -#ifdef WXWIN_COMPATIBILITY + wxFunction GetCallback() const { return m_callback; } void Callback(const wxFunction func) { m_callback = func; } + wxFunction m_callback; +#ifdef WXWIN_COMPATIBILITY // compatibility: these functions are deprecated bool Enabled(int id) const { return IsEnabled(id); } bool Checked(int id) const { return IsChecked(id); } -private: - wxFunction m_callback; #endif // WXWIN_COMPATIBILITY private: // common part of all ctors - void Init(const wxString& title -#ifdef WXWIN_COMPATIBILITY - , const wxFunction func = NULL -#endif - ); + void Init(const wxString& title, const wxFunction func = NULL ); bool m_doBreak; @@ -176,14 +181,13 @@ private: wxMenu * m_topLevelMenu; wxMenuBar * m_menuBar; wxList m_menuItems; - wxEvtHandler * m_parent; wxEvtHandler * m_eventHandler; wxWindow *m_pInvokingWindow; void* m_clientData; #if wxUSE_ACCEL - // the accelerators data - wxArrayInt m_accelKeyCodes, m_accelFlags, m_accelIds; + // the accelerators for our menu items + wxAcceleratorArray m_accels; #endif // wxUSE_ACCEL }; @@ -191,10 +195,8 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxEvtHandler +class WXDLLEXPORT wxMenuBar : public wxMenuBarBase { - DECLARE_DYNAMIC_CLASS(wxMenuBar) - public: // ctors & dtor // default constructor @@ -206,62 +208,33 @@ public: virtual ~wxMenuBar(); // menubar construction - WXHMENU Create(); - void Append(wxMenu *menu, const wxString& title); - virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */ - - // state control - // NB: must only be used AFTER menu has been attached to frame, - // otherwise use individual menus to enable/disable items - // enable the item - void Enable(int id, bool enable); - // TRUE if item enabled - bool IsEnabled(int id) const; - // - void EnableTop(int pos, bool enable); - - // works only with checkable items - void Check(int id, bool check); - // TRUE if checked - bool IsChecked(int id) const; - - void SetLabel(int id, const wxString& label) ; - wxString GetLabel(int id) const ; - - virtual void SetHelpString(int id, const wxString& helpString); - virtual wxString GetHelpString(int id) const ; - - void SetLabelTop(int pos, const wxString& label) ; - wxString GetLabelTop(int pos) 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); - // notifications: return FALSE to prevent the menu from being - // appended/deleted - virtual bool OnAppend(wxMenu *menu, const wxChar *title); - virtual bool OnDelete(wxMenu *menu, int index); - - // item search - // by menu and item names, returns wxNOT_FOUND if not found virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const; - // returns NULL if not found - wxMenuItem* FindItem(int id) const { return FindItemForId(id); } - // returns NULL if not found, fills menuForItem if !NULL - wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const; + virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; - // submenus access - int GetMenuCount() const { return m_menuCount; } - wxMenu *GetMenu(int i) const { return m_menus[i]; } + 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 +#ifdef WXWIN_COMPATIBILITY void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } wxEvtHandler *GetEventHandler() { return m_eventHandler; } -#ifdef WXWIN_COMPATIBILITY - // compatibility: these functions are deprecated bool Enabled(int id) const { return IsEnabled(id); } bool Checked(int id) const { return IsChecked(id); } #endif // WXWIN_COMPATIBILITY - // IMPLEMENTATION + // implementation from now on + WXHMENU Create(); + int FindMenu(const wxString& title); + void Detach(); + // returns TRUE if we're attached to a frame bool IsAttached() const { return m_menuBarFrame != NULL; } // get the frame we live in @@ -277,18 +250,20 @@ public: // get the menu handle WXHMENU GetHMenu() const { return m_hMenu; } -protected: - // common part of all ctors - void Init(); - // if the menubar is modified, the display is not updated automatically, // call this function to update it (m_menuBarFrame should be !NULL) void Refresh(); +protected: + // common part of all ctors + void Init(); + +#ifdef WXWIN_COMPATIBILITY wxEvtHandler *m_eventHandler; - int m_menuCount; - wxMenu **m_menus; - wxString *m_titles; +#endif // WXWIN_COMPATIBILITY + + wxArrayString m_titles; + wxFrame *m_menuBarFrame; WXHMENU m_hMenu; @@ -296,6 +271,9 @@ protected: // the accelerator table for all accelerators in all our menus wxAcceleratorTable m_accelTable; #endif // wxUSE_ACCEL + +private: + DECLARE_DYNAMIC_CLASS(wxMenuBar) }; #endif // _WX_MENU_H_