Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New radio item menu stuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-03-25 18:06:12 +00:00
parent a609a125f0
commit ab4fece809
7 changed files with 299 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/os2/bitmap.h
View File

@@ -183,10 +183,10 @@ public:
void SetMask(wxMask* pMask) ;
inline bool operator==(const wxBitmap& rBitmap)
inline bool operator==(const wxBitmap& rBitmap) const
{ return m_refData == rBitmap.m_refData; }
inline bool operator!=(const wxBitmap& rBitmap)
inline bool operator!=(const wxBitmap& rBitmap) const
{ return m_refData != rBitmap.m_refData; }
#if WXWIN_COMPATIBILITY_2

10
include/wx/os2/menu.h
View File

@@ -141,6 +141,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
//
@@ -156,6 +161,11 @@ private:
//
static USHORT m_nextMenuId;
//
// The position of the first item in the current radio group or -1
//
int m_nStartRadioGroup;
#if wxUSE_ACCEL
//
// The accelerators for our menu items

46
include/wx/os2/menuitem.h
View File

@@ -42,17 +42,32 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
#endif
{
public:
//
// ctor & dtor
//
wxMenuItem( wxMenu* pParentMenu = NULL
,int nId = wxID_SEPARATOR
,const wxString& rStrName = ""
,const wxString& rWxHelp = ""
,wxItemKind kind = wxItem_Normal
,wxItemKind kind = wxITEM_NORMAL
,wxMenu* pSubMenu = NULL
);
//
// Depricated, do not use in new code
//
wxMenuItem( wxMenu* pParentMenu
,int vId
,const wxString& rsText
,const wxString& rsHelp
,bool bIsCheckable
,wxMenu* pSubMenu = (wxMenu *)NULL
);
virtual ~wxMenuItem();
// override base class virtuals
//
// Override base class virtuals
//
virtual void SetText(const wxString& rStrName);
virtual void SetCheckable(bool bCheckable);
@@ -60,21 +75,44 @@ public:
virtual void Check(bool bDoCheck = TRUE);
virtual bool IsChecked(void) const;
// unfortunately needed to resolve ambiguity between
//
// Unfortunately needed to resolve ambiguity between
// wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
//
bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); }
// the id for a popup menu is really its menu handle (as required by
//
// The id for a popup menu is really its menu handle (as required by
// ::AppendMenu() API), so this function will return either the id or the
// menu handle depending on what we're
//
int GetRealId(void) const;
void SetAsRadioGroupStart(void);
void SetRadioGroupStart(int nStart);
void SetRadioGroupEnd(int nEnd);
//
// All OS/2PM Submenus and menus have one of these
//
MENUITEM m_vMenuData;
private:
void Init();
//
// The positions of the first and last items of the radio group this item
// belongs to or -1: start is the radio group start and is valid for all
// but first radio group items (m_isRadioGroupStart == FALSE), end is valid
// only for the first one
//
union
{
int m_nStart;
int m_nEnd;
} m_vRadioGroup;
bool m_bIsRadioGroupStart;
DECLARE_DYNAMIC_CLASS(wxMenuItem)
}; // end of CLASS wxMenuItem