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

menu string of choice control allows for all characters now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-12-20 15:39:30 +00:00
parent a48820e9f4
commit 74f9e8e3d9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mac/carbon/choice.cpp
View File

@@ -72,7 +72,10 @@ int wxChoice::DoAppend(const wxString& item)
{ {
Str255 label; Str255 label;
wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) ,
(SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
// was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
m_strings.Add( item ) ; m_strings.Add( item ) ;
m_datas.Add( NULL ) ; m_datas.Add( NULL ) ;
int index = m_strings.GetCount() - 1 ; int index = m_strings.GetCount() - 1 ;

5
src/mac/choice.cpp
View File

@@ -72,7 +72,10 @@ int wxChoice::DoAppend(const wxString& item)
{ {
Str255 label; Str255 label;
wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) ,
(SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
// was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
m_strings.Add( item ) ; m_strings.Add( item ) ;
m_datas.Add( NULL ) ; m_datas.Add( NULL ) ;
int index = m_strings.GetCount() - 1 ; int index = m_strings.GetCount() - 1 ;