1. implemented radio menu items for wxGTK
2. changed (in most cases blindly) code for all the others 3. added wx/features.h 4. update wxMenu[Item] docs ---------------------------------------------------------------------- Committing in . Modified Files: distrib/msw/tmake/filelist.txt docs/changes.txt docs/latex/wx/menu.tex docs/latex/wx/menuitem.tex include/wx/defs.h include/wx/menu.h include/wx/menuitem.h include/wx/gtk/menu.h include/wx/gtk/menuitem.h include/wx/mac/menuitem.h include/wx/motif/menuitem.h include/wx/msw/menuitem.h include/wx/os2/MENUITEM.H include/wx/univ/menuitem.h samples/menu/menu.cpp src/common/menucmn.cpp src/gtk/menu.cpp src/mac/menuitem.cpp src/motif/menuitem.cpp src/msw/menuitem.cpp src/os2/MENUITEM.CPP src/univ/menu.cpp Added Files: include/wx/features.h ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1397,20 +1397,10 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
||||
int id,
|
||||
const wxString& text,
|
||||
const wxString& help,
|
||||
bool isCheckable,
|
||||
wxItemKind kind,
|
||||
wxMenu *subMenu)
|
||||
: wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
|
||||
{
|
||||
m_id = id;
|
||||
m_parentMenu = parentMenu;
|
||||
m_subMenu = subMenu;
|
||||
|
||||
m_text = text;
|
||||
m_help = help;
|
||||
|
||||
m_isCheckable = isCheckable;
|
||||
m_isEnabled = TRUE;
|
||||
m_isChecked = FALSE;
|
||||
|
||||
m_posY =
|
||||
m_height = -1;
|
||||
|
||||
@@ -1474,7 +1464,7 @@ void wxMenuItem::SetText(const wxString& text)
|
||||
|
||||
void wxMenuItem::SetCheckable(bool checkable)
|
||||
{
|
||||
if ( checkable != m_isCheckable )
|
||||
if ( checkable != IsCheckable() )
|
||||
{
|
||||
wxMenuItemBase::SetCheckable(checkable);
|
||||
|
||||
|
Reference in New Issue
Block a user