X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3bf7524f394af039efe196a186f7969cbabcc19..d95c5149add596d0dec940599332a24edf96dc38:/include/wx/os2/menu.h diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h index 3f00df4844..b871f900e4 100644 --- a/include/wx/os2/menu.h +++ b/include/wx/os2/menu.h @@ -17,7 +17,7 @@ #include "wx/list.h" // for "template" list classes #include "wx/dynarray.h" - WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray); + WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray); #endif // wxUSE_ACCEL class WXDLLEXPORT wxFrame; @@ -55,8 +55,8 @@ public: // // Implement base class virtuals // - virtual bool DoAppend(wxMenuItem* pItem); - virtual bool DoInsert( size_t nPos + virtual wxMenuItem* DoAppend(wxMenuItem* pItem); + virtual wxMenuItem* DoInsert( size_t nPos ,wxMenuItem* pItem ); virtual wxMenuItem* DoRemove(wxMenuItem* pItem); @@ -139,9 +139,9 @@ private: void EndRadioGroup(void); // - // If TRUE, insert a breal before appending the next item + // If true, insert a breal before appending the next item // - bool m_bDoBreak; + bool m_bDoBreak; // // The menu handle of this menu @@ -194,6 +194,7 @@ public: wxMenuBar( int n ,wxMenu* vMenus[] ,const wxString sTitles[] + ,long lStyle = 0 ); virtual ~wxMenuBar(); @@ -244,7 +245,7 @@ public: const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; } // - // Update the accel table (must be called after adding/deletign a menu) + // Update the accel table (must be called after adding/deleting a menu) // void RebuildAccelTable(void); #endif // wxUSE_ACCEL