X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/msw/menu.h?ds=sidebyside diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 953c23f71c..60f660ccc7 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -12,10 +12,6 @@ #ifndef _WX_MENU_H_ #define _WX_MENU_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "menu.h" -#endif - #if wxUSE_ACCEL #include "wx/accel.h" #include "wx/dynarray.h" @@ -23,10 +19,10 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray); #endif // wxUSE_ACCEL -class WXDLLEXPORT wxFrame; +class WXDLLIMPEXP_FWD_CORE wxFrame; #if defined(__WXWINCE__) && wxUSE_TOOLBAR -class WXDLLEXPORT wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; #endif @@ -49,7 +45,7 @@ class WXDLLEXPORT wxToolBar; // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -60,26 +56,10 @@ public: virtual ~wxMenu(); - // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - virtual void Break(); virtual void SetTitle(const wxString& title); - // 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 // ------------------------------- @@ -95,8 +75,8 @@ public: #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus - bool HasAccels() const { return !m_accels.IsEmpty(); } - size_t GetAccelCount() const { return m_accels.GetCount(); } + bool HasAccels() const { return !m_accels.empty(); } + size_t GetAccelCount() const { return m_accels.size(); } size_t CopyAccels(wxAcceleratorEntry *accels) const; // called by wxMenuItem when its accels changes @@ -104,8 +84,18 @@ public: // helper used by wxMenu itself (returns the index in m_accels) int FindAccel(int id) const; + + // used only by wxMDIParentFrame currently but could be useful elsewhere: + // returns a new accelerator table with accelerators for just this menu + // (shouldn't be called if we don't have any accelerators) + wxAcceleratorTable *CreateAccelTable() const; #endif // wxUSE_ACCEL +protected: + virtual wxMenuItem* DoAppend(wxMenuItem *item); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); + private: // common part of all ctors void Init(); @@ -137,7 +127,7 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuInfo : public wxObject +class WXDLLIMPEXP_CORE wxMenuInfo : public wxObject { public : wxMenuInfo() { m_menu = NULL; } @@ -156,7 +146,7 @@ private : WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors & dtor @@ -178,8 +168,8 @@ public: virtual wxMenu *Remove(size_t pos); virtual void EnableTop( size_t pos, bool flag ); - virtual void SetLabelTop( size_t pos, const wxString& label ); - virtual wxString GetLabelTop( size_t pos ) const; + virtual void SetMenuLabel( size_t pos, const wxString& label ); + virtual wxString GetMenuLabel( size_t pos ) const; // implementation from now on WXHMENU Create(); @@ -198,9 +188,6 @@ public: #endif #if wxUSE_ACCEL - // get the accel table for all the menus - const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; } - // update the accel table (must be called after adding/deleting a menu) void RebuildAccelTable(); #endif // wxUSE_ACCEL @@ -228,10 +215,6 @@ protected: // Return the MSW position for a wxMenu which is sometimes different from // the wxWidgets position. int MSWPositionForWxMenu(wxMenu *menu, int wxpos); -#if wxUSE_ACCEL - // the accelerator table for all accelerators in all our menus - wxAcceleratorTable m_accelTable; -#endif // wxUSE_ACCEL #if defined(__WXWINCE__) && wxUSE_TOOLBAR wxToolBar* m_toolBar;