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

1. implemented radio menu items for wxGTK

Browse Source 
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:
Vadim Zeitlin
2002-03-18 19:41:35 +00:00
parent cac344f664
commit d65c269b3f
27 changed files with 551 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
include/wx/menu.h
View File

@@ -75,18 +75,34 @@ public:
// menu construction
// -----------------
// append a normal item to the menu
// append any kind of item (normal/check/radio/separator)
void Append(int id,
const wxString& text,
const wxString& help = wxEmptyString,
bool isCheckable = FALSE)
wxItemKind kind = wxItem_Normal)
{
DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
}
// append a separator to the menu
void AppendSeparator() { Append(wxID_SEPARATOR, wxEmptyString); }
// append a check item
void AppendCheckItem(int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
Append(id, text, help, wxItem_Check);
}
// append a radio item
void AppendRadioItem(int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
Append(id, text, help, wxItem_Radio);
}
// append a submenu
void Append(int id,
const wxString& text,
@@ -105,13 +121,15 @@ public:
// insert an item before given position
bool Insert(size_t pos, wxMenuItem *item);
// insert an item before given position
void Insert(size_t pos,
int id,
const wxString& text,
const wxString& help = wxEmptyString,
bool isCheckable = FALSE)
wxItemKind kind = wxItem_Normal)
{
Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
}
// insert a separator
@@ -120,6 +138,24 @@ public:
Insert(pos, wxMenuItem::New((wxMenu *)this));
}
// insert a check item
void InsertCheckItem(size_t pos,
int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
Insert(pos, id, text, help, wxItem_Check);
}
// insert a radio item
void InsertRadioItem(size_t pos,
int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
Insert(pos, id, text, help, wxItem_Radio);
}
// insert a submenu
void Insert(size_t pos,
int id,
@@ -136,21 +172,38 @@ public:
Insert(0u, item);
}
// prepend any item to the menu
void Prepend(int id,
const wxString& text,
const wxString& help = wxEmptyString,
bool isCheckable = FALSE)
wxItemKind kind = wxItem_Normal)
{
Insert(0u, id, text, help, isCheckable);
Insert(0u, id, text, help, kind);
}
// insert a separator
// prepend a separator
void PrependSeparator()
{
InsertSeparator(0u);
}
// insert a submenu
// prepend a check item
void PrependCheckItem(int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
InsertCheckItem(0u, id, text, help);
}
// prepend a radio item
void PrependRadioItem(int id,
const wxString& text,
const wxString& help = wxEmptyString)
{
InsertRadioItem(0u, id, text, help);
}
// prepend a submenu
void Prepend(int id,
const wxString& text,
wxMenu *submenu,
@@ -241,8 +294,51 @@ public:
void SetParent(wxMenu *parent) { m_menuParent = parent; }
wxMenu *GetParent() const { return m_menuParent; }
#if WXWIN_COMPATIBILITY
// implementation only from now on
// -------------------------------
// unlike FindItem(), this function doesn't recurse but only looks through
// our direct children and also may return the index of the found child if
// pos != NULL
wxMenuItem *FindChildItem(int id, size_t *pos = NULL) const;
// called to generate a wxCommandEvent, return TRUE if it was processed,
// FALSE otherwise
//
// the checked parameter may have boolean value or -1 for uncheckable items
bool SendEvent(int id, int checked = -1);
// compatibility: these functions are deprecated, use the new ones instead
// -----------------------------------------------------------------------
// use the versions taking wxItem_XXX now instead, they're more readable
// and allow adding the radio items as well
void Append(int id,
const wxString& text,
const wxString& help,
bool isCheckable)
{
Append(id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
}
void Insert(size_t pos,
int id,
const wxString& text,
const wxString& help,
bool isCheckable)
{
Insert(pos, id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
}
void Prepend(int id,
const wxString& text,
const wxString& help,
bool isCheckable)
{
Insert(0u, id, text, help, isCheckable);
}
#if WXWIN_COMPATIBILITY
bool Enabled(int id) const { return IsEnabled(id); }
bool Checked(int id) const { return IsChecked(id); }
@@ -260,17 +356,6 @@ public:
wxFunction m_callback;
#endif // wxUSE_MENU_CALLBACK
// unlike FindItem(), this function doesn't recurse but only looks through
// our direct children and also may return the index of the found child if
// pos != NULL
wxMenuItem *FindChildItem(int id, size_t *pos = NULL) const;
// called to generate a wxCommandEvent, return TRUE if it was processed,
// FALSE otherwise
//
// the checked parameter may have boolean value or -1 for uncheckable items
bool SendEvent(int id, int checked = -1);
protected:
// virtuals to override in derived classes
// ---------------------------------------