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

So far so good. These now compiles in Unicode mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-15 13:02:22 +00:00
parent b1da76e108
commit b019151f0b
14 changed files with 240 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk1/radiobut.cpp
View File

@@ -64,7 +64,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
SetValidator( validator );
m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label.mbc_str() );
m_theOtherRadioButtton =
gtk_radio_button_new_with_label(
@@ -75,7 +75,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
m_blockFirstEvent = FALSE;
if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label.mbc_str() );
if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y );
@@ -99,17 +99,17 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
void wxRadioButton::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
wxControl::SetLabel( label );
GtkButton *bin = GTK_BUTTON( m_widget );
GtkLabel *g_label = GTK_LABEL( bin->child );
gtk_label_set( g_label, GetLabel() );
gtk_label_set( g_label, GetLabel().mbc_str() );
}
void wxRadioButton::SetValue( bool val )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
if ( val == GetValue() )
return;
@@ -124,14 +124,14 @@ void wxRadioButton::SetValue( bool val )
bool wxRadioButton::GetValue(void) const
{
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" );
wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") );
return GTK_TOGGLE_BUTTON(m_widget)->active;
}
void wxRadioButton::Enable( bool enable )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
wxControl::Enable( enable );
@@ -144,5 +144,3 @@ void wxRadioButton::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle );
gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
}