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

added support for GTK2 label mnemonics (patch #689573)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-03-04 23:34:52 +00:00
parent 53eff2a282
commit eaafd2f8b7
11 changed files with 127 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk1/checkbox.cpp
View File

@@ -85,8 +85,6 @@ bool wxCheckBox::Create(wxWindow *parent,
return FALSE;
}
wxControl::SetLabel( label );
if ( style & wxALIGN_RIGHT )
{
// VZ: as I don't know a way to create a right aligned checkbox with
@@ -94,7 +92,7 @@ bool wxCheckBox::Create(wxWindow *parent,
// left of it
m_widgetCheckbox = gtk_check_button_new();
m_widgetLabel = gtk_label_new( wxGTK_CONV( m_label ) );
m_widgetLabel = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
m_widget = gtk_hbox_new(FALSE, 0);
@@ -106,10 +104,11 @@ bool wxCheckBox::Create(wxWindow *parent,
}
else
{
m_widgetCheckbox = gtk_check_button_new_with_label( wxGTK_CONV( m_label ) );
m_widgetCheckbox = gtk_check_button_new_with_label("");
m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
m_widget = m_widgetCheckbox;
}
SetLabel( label );
gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
"clicked",
@@ -166,7 +165,12 @@ void wxCheckBox::SetLabel( const wxString& label )
wxControl::SetLabel( label );
#ifdef __WXGTK20__
wxString label2 = PrepareLabelMnemonics( label );
gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) );
#else
gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );
#endif
}
bool wxCheckBox::Enable( bool enable )