X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e58dab20ce995856303154a367bcca904066525c..b8ddac49a37a01ca1cf89f97dc97c4945b50ddab:/include/wx/os2/menu.h diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h index 4a0baba04b..14205d6759 100644 --- a/include/wx/os2/menu.h +++ b/include/wx/os2/menu.h @@ -14,6 +14,7 @@ #if wxUSE_ACCEL #include "wx/accel.h" + #include "wx/list.h" // for "template" list classes #include "wx/dynarray.h" WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray); @@ -77,6 +78,8 @@ public: // Implementation only from now on // ------------------------------- // + virtual void Attach(wxMenuBarBase* pMenubar); + bool OS2Command( WXUINT uParam ,WXWORD wId ); @@ -99,7 +102,7 @@ public: // // Called by wxMenuBar to build its accel table from the accels of all menus // - bool HasAccels(void) const { return !m_vAccels.IsEmpty(); } + bool HasAccels(void) const { return m_vAccels.IsEmpty(); } size_t GetAccelCount(void) const { return m_vAccels.GetCount(); } size_t CopyAccels(wxAcceleratorEntry* pAccels) const; @@ -141,6 +144,11 @@ private: ,size_t nPos = (size_t)-1 ); + // + // Terminate the current radio group, if any + // + void EndRadioGroup(void); + // // If TRUE, insert a breal before appending the next item // @@ -154,7 +162,12 @@ private: // // The helper variable for creating unique IDs. // - static USHORT m_nextMenuId; + static USHORT m_nextMenuId; + + // + // The position of the first item in the current radio group or -1 + // + int m_nStartRadioGroup; #if wxUSE_ACCEL //