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

1
docs/changes.txt
View File

@@ -107,6 +107,7 @@ Unix (Base/GUI):
All (GUI):
- implemented radio menu items
- significantly improved native font support
- wxImage::ComputeHistogram() now uses wxImageHistogram instead of type-unsafe
wxHashTable

131
docs/latex/wx/menu.tex
View File

@@ -77,7 +77,7 @@ and recreation of internal data structures.
\membersection{wxMenu::Append}\label{wxmenuappend}
\func{void}{Append}{\param{int}{ id}, \param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""},\rtfsp
\param{const bool}{ checkable = FALSE}}
\param{wxItemKind}{ kind = wxItem\_Normal}}
Adds a string item to the end of the menu.
@@ -101,7 +101,8 @@ such as bitmaps and fonts.
\docparam{menu}{Pull-right submenu.}
\docparam{checkable}{If TRUE, this item is checkable.}
\docparam{kind}{May be {\tt wxItem\_Separator}, {\tt wxItem\_Normal},
{\tt wxItem\_Check} or {\tt wxItem\_Radio}}
\docparam{helpString}{An optional help string associated with the item.
By default, \helpref{wxFrame::OnMenuHighlight}{wxframeonmenuhighlight} displays
@@ -118,6 +119,8 @@ creation of a menu or menubar.
\wxheading{See also}
\helpref{wxMenu::AppendSeparator}{wxmenuappendseparator},\rtfsp
\helpref{wxMenu::AppendCheckItem}{wxmenuappendcheckitem},\rtfsp
\helpref{wxMenu::AppendRadioItem}{wxmenuappendradioitem},\rtfsp
\helpref{wxMenu::Insert}{wxmenuinsert},\rtfsp
\helpref{wxMenu::SetLabel}{wxmenusetlabel}, \helpref{wxMenu::GetHelpString}{wxmenugethelpstring},\rtfsp
\helpref{wxMenu::SetHelpString}{wxmenusethelpstring}, \helpref{wxMenuItem}{wxmenuitem}
@@ -131,6 +134,35 @@ implements the following methods:\par
\end{twocollist}}
}
\membersection{wxMenu::AppendCheckItem}\label{wxmenuappendcheckitem}
\func{void}{AppendCheckItem}{\param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Adds a checkable item to the end of the menu.
\wxheading{See also}
\helpref{wxMenu::Append}{wxmenuappend},\rtfsp
\helpref{wxMenu::InsertCheckItem}{wxmenuinsertcheckitem}
\membersection{wxMenu::AppendRadioItem}\label{wxmenuappendradioitem}
\func{void}{AppendRadioItem}{\param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Adds a radio item to the end of the menu. All consequent radio items form a
group and when an item in the group is checked, all the others are
automatically unchecked.
{\bf NB:} Currently only implemented under Windows and GTK, use
{\tt #if wxHAS\_RADIO\_MENU\_ITEMS} to test for availability of this feature.
\wxheading{See also}
\helpref{wxMenu::Append}{wxmenuappend},\rtfsp
\helpref{wxMenu::InsertRadioItem}{wxmenuinsertradioitem}
\membersection{wxMenu::AppendSeparator}\label{wxmenuappendseparator}
\func{void}{AppendSeparator}{\void}
@@ -139,7 +171,8 @@ Adds a separator to the end of the menu.
\wxheading{See also}
\helpref{wxMenu::Append}{wxmenuappend}
\helpref{wxMenu::Append}{wxmenuappend},\rtfsp
\helpref{wxMenu::InsertSeparator}{wxmenuinsertseparator}
\membersection{wxMenu::Break}\label{wxmenubreak}
@@ -329,13 +362,53 @@ This is relevant only to popup menus.
\func{bool}{Insert}{\param{size\_t }{pos}, \param{wxMenuItem *}{item}}
\func{void}{Insert}{\param{size\_t }{pos}, \param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""},\rtfsp
\param{wxItemKind}{ kind = wxItem\_Normal}}
Inserts the given {\it item} before the position {\it pos}. Inserting the item
at the position \helpref{GetMenuItemCount}{wxmenugetmenuitemcount} is the same
as appending it.
\wxheading{See also}
\helpref{wxMenu::Append}{wxmenuappend}
\helpref{wxMenu::Append}{wxmenuappend},\rtfsp
\helpref{wxMenu::Prepend}{wxmenuprepend}
\membersection{wxMenu::InsertCheckItem}\label{wxmenuinsertcheckitem}
\func{void}{InsertCheckItem}{\param{size\_t }{pos}, \param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Inserts a checkable item at the given position.
\wxheading{See also}
\helpref{wxMenu::Insert}{wxmenuinsert},\rtfsp
\helpref{wxMenu::AppendCheckItem}{wxmenuappendcheckitem}
\membersection{wxMenu::InsertRadioItem}\label{wxmenuinsertradioitem}
\func{void}{InsertRadioItem}{\param{size\_t }{pos}, \param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Inserts a radio item at the given position.
\wxheading{See also}
\helpref{wxMenu::Insert}{wxmenuinsert},\rtfsp
\helpref{wxMenu::AppendRadioItem}{wxmenuappendradioitem}
\membersection{wxMenu::InsertSeparator}\label{wxmenuinsertseparator}
\func{void}{InsertSeparator}{\param{size\_t }{pos}}
Inserts a separator at the given position.
\wxheading{See also}
\helpref{wxMenu::Insert}{wxmenuinsert},\rtfsp
\helpref{wxMenu::AppendSeparator}{wxmenuappendseparator}
\membersection{wxMenu::IsChecked}\label{wxmenuischecked}
@@ -373,6 +446,56 @@ TRUE if the menu item is enabled, FALSE otherwise.
\helpref{wxMenu::Enable}{wxmenuenable}
\membersection{wxMenu::Prepend}\label{wxmenuprepend}
\func{bool}{Prepend}{\param{size\_t }{pos}, \param{wxMenuItem *}{item}}
\func{void}{Prepend}{\param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""},\rtfsp
\param{wxItemKind}{ kind = wxItem\_Normal}}
Inserts the given {\it item} at the position $0$.
\wxheading{See also}
\helpref{wxMenu::Append}{wxmenuappend},\rtfsp
\helpref{wxMenu::Inserts}{wxmenuinsert}
\membersection{wxMenu::PrependCheckItem}\label{wxmenuprependcheckitem}
\func{void}{PrependCheckItem}{\param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Inserts a checkable item at the position $0$.
\wxheading{See also}
\helpref{wxMenu::Prepend}{wxmenuprepend},\rtfsp
\helpref{wxMenu::AppendCheckItem}{wxmenuappendcheckitem}
\membersection{wxMenu::PrependRadioItem}\label{wxmenuprependradioitem}
\func{void}{PrependRadioItem}{\param{int}{ id},\rtfsp
\param{const wxString\& }{ item}, \param{const wxString\& }{helpString = ""}}
Inserts a radio item at the position $0$.
\wxheading{See also}
\helpref{wxMenu::Prepend}{wxmenuprepend},\rtfsp
\helpref{wxMenu::AppendRadioItem}{wxmenuappendradioitem}
\membersection{wxMenu::PrependSeparator}\label{wxmenuprependseparator}
\func{void}{PrependSeparator}{\param{size\_t }{pos}}
Inserts a separator at the position $0$.
\wxheading{See also}
\helpref{wxMenu::Prepend}{wxmenuprepend},\rtfsp
\helpref{wxMenu::AppendSeparator}{wxmenuappendseparator}
\membersection{wxMenu::Remove}\label{wxmenuremove}
\func{wxMenuItem *}{Remove}{\param{int }{id}}

21
docs/latex/wx/menuitem.tex
View File

@@ -1,8 +1,11 @@
\section{\class{wxMenuItem}}\label{wxmenuitem}
A menu item represents an item in a popup menu. Note that the majority of this
class is only implemented under Windows so far, but everything except fonts, colours and
bitmaps can be achieved via wxMenu on all platforms.
A menu item represents an item in a menu. Note that you usually don't have to
deal with it directly as \helpref{wxMenu}{wxmenu} methods usually construct an
object of this class for you.
Also please note that the methods related to fonts and bitmaps are currently
only implemented for Windows.
\wxheading{Derived from}
@@ -23,7 +26,7 @@ wxOwnerDrawn (Windows only)\\
\func{}{wxMenuItem}{\param{wxMenu*}{ parentMenu = NULL}, \param{int}{ id = ID\_SEPARATOR},
\param{const wxString\& }{text = ""}, \param{const wxString\& }{helpString = ""},
\param{bool }{checkable = FALSE}, \param{wxMenu*}{ subMenu = NULL}, }
\param{wxItemKind }{kind = wxItem\_Normal}, \param{wxMenu*}{ subMenu = NULL}, }
Constructs a wxMenuItem object.
@@ -37,7 +40,8 @@ Constructs a wxMenuItem object.
\docparam{helpString}{Optional help string that will be shown on the status bar.}
\docparam{checkable}{TRUE if this menu item is checkable.}
\docparam{kind}{May be {\tt wxItem\_Separator}, {\tt wxItem\_Normal},
{\tt wxItem\_Check} or {\tt wxItem\_Radio}}
\docparam{subMenu}{If non-NULL, indicates that the menu item is a submenu.}
@@ -95,6 +99,13 @@ Returns the help string associated with the menu item.
Returns the menu item identifier.
\membersection{wxMenuItem::GetKind}\label{wxmenuitemgetkind}
\constfunc{wxItemKind}{GetKind}{\void}
Returns the item kind, one of {\tt wxItem\_Separator}, {\tt wxItem\_Normal},
{\tt wxItem\_Check} or {\tt wxItem\_Radio}.
\membersection{wxMenuItem::GetLabel}\label{wxmenuitemgetlabel}
\constfunc{wxString}{GetLabel}{\void}