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

Remove obsolete GTK1 compatibility macros. Patch #1413458 - Paul Cornett

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-03 20:38:55 +00:00
parent 1794103bab
commit afa7bd1eef
14 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/radiobox.cpp
View File

@@ -381,7 +381,7 @@ wxString wxRadioBox::GetString( int n ) const
wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child);
wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
@@ -403,7 +403,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
gtk_label_set( g_label, wxGTK_CONV( label ) );
}
@@ -417,7 +417,7 @@ bool wxRadioBox::Enable( bool enable )
while (node)
{
GtkButton *button = GTK_BUTTON( node->GetData() );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
@@ -436,7 +436,7 @@ bool wxRadioBox::Enable( int item, bool enable )
wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->GetData() );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
@@ -531,7 +531,7 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
GtkWidget *widget = GTK_WIDGET( node->GetData() );
gtk_widget_modify_style( widget, style );
gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
gtk_widget_modify_style(GTK_BIN(widget)->child, style);
node = node->GetNext();
}