projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SourceForge patch #654210 to fix naming/numbering shared libs under OS X
[wxWidgets.git]
/
include
/
wx
/
os2
/
menu.h
diff --git
a/include/wx/os2/menu.h
b/include/wx/os2/menu.h
index 4a0baba04b8e709104f3fcee5271114a9fd1013c..14205d675917eadc2f09a41cd7c7fe526b718783 100644
(file)
--- a/
include/wx/os2/menu.h
+++ b/
include/wx/os2/menu.h
@@
-14,6
+14,7
@@
#if wxUSE_ACCEL
#include "wx/accel.h"
#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);
#include "wx/dynarray.h"
WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
@@
-77,6
+78,8
@@
public:
// Implementation only from now on
// -------------------------------
//
// Implementation only from now on
// -------------------------------
//
+ virtual void Attach(wxMenuBarBase* pMenubar);
+
bool OS2Command( WXUINT uParam
,WXWORD wId
);
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
//
//
// 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;
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
);
,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
//
//
// If TRUE, insert a breal before appending the next item
//
@@
-154,7
+162,12
@@
private:
//
// The helper variable for creating unique IDs.
//
//
// 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
//
#if wxUSE_ACCEL
//