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

no more \& in radio buttons labels

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-26 11:01:58 +00:00
parent db8db70a19
commit 2633389890
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/radiobox.cpp
View File

@@ -97,12 +97,21 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
GtkRadioButton *m_radio = (GtkRadioButton*) NULL; GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
wxString label;
GSList *radio_button_group = (GSList *) NULL; GSList *radio_button_group = (GSList *) NULL;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); if ( i != 0 )
radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) ); label.Empty();
for ( const wxChar *pc = choices[i]; *pc; pc++ )
{
if ( *pc != _T('&') )
label += *pc;
}
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
m_boxes.Append( (wxObject*) m_radio ); m_boxes.Append( (wxObject*) m_radio );

13
src/gtk1/radiobox.cpp
View File

@@ -97,12 +97,21 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
GtkRadioButton *m_radio = (GtkRadioButton*) NULL; GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
wxString label;
GSList *radio_button_group = (GSList *) NULL; GSList *radio_button_group = (GSList *) NULL;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); if ( i != 0 )
radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) ); label.Empty();
for ( const wxChar *pc = choices[i]; *pc; pc++ )
{
if ( *pc != _T('&') )
label += *pc;
}
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
m_boxes.Append( (wxObject*) m_radio ); m_boxes.Append( (wxObject*) m_radio );