quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace gtk_radio_button_group()

Browse Source
This commit is contained in:
Garux
2020-05-21 12:17:57 +03:00
parent a212ff3b27
commit e8998ab4a8
13 changed files with 73 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gtkutil/button.cpp
View File

@@ -73,7 +73,7 @@ void toggle_button_set_active_no_signal( GtkToggleButton* button, gboolean activ
void radio_button_print_state( GtkRadioButton* button ){
globalOutputStream() << "toggle button: ";
for ( GSList* radio = gtk_radio_button_group( button ); radio != 0; radio = g_slist_next( radio ) )
for ( GSList* radio = gtk_radio_button_get_group( button ); radio != 0; radio = g_slist_next( radio ) )
{
globalOutputStream() << gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio->data ) );
}
@@ -81,7 +81,7 @@ void radio_button_print_state( GtkRadioButton* button ){
}
GtkToggleButton* radio_button_get_nth( GtkRadioButton* radio, int index ){
GSList *group = gtk_radio_button_group( radio );
GSList *group = gtk_radio_button_get_group( radio );
return GTK_TOGGLE_BUTTON( g_slist_nth_data( group, g_slist_length( group ) - index - 1 ) );
}
@@ -109,7 +109,7 @@ void radio_button_set_active_no_signal( GtkRadioButton* radio, int index ){
int radio_button_get_active( GtkRadioButton* radio ){
//radio_button_print_state(radio);
GSList *group = gtk_radio_button_group( radio );
GSList *group = gtk_radio_button_get_group( radio );
int index = g_slist_length( group ) - 1;
for (; group != 0; group = g_slist_next( group ) )
{

5
libs/gtkutil/dialog.cpp
View File

@@ -186,15 +186,12 @@ RadioHBox RadioHBox_new( StringArrayRange names ){
GtkHBox* hbox = GTK_HBOX( gtk_hbox_new( TRUE, 4 ) );
gtk_widget_show( GTK_WIDGET( hbox ) );
GSList* group = 0;
GtkRadioButton* radio = 0;
for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
{
radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) );
radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label_from_widget( radio, *i ) );
gtk_widget_show( GTK_WIDGET( radio ) );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( radio ), FALSE, FALSE, 0 );
group = gtk_radio_button_get_group( radio );
}
return RadioHBox( hbox, radio );

2
libs/gtkutil/nonmodal.h
View File

@@ -148,7 +148,7 @@ public:
NonModalRadio( const Callback& changed ) : m_changed( changed ){
}
void connect( GtkRadioButton* radio ){
GSList* group = gtk_radio_button_group( radio );
GSList* group = gtk_radio_button_get_group( radio );
for (; group != 0; group = g_slist_next( group ) )
{
toggle_button_connect_callback( GTK_TOGGLE_BUTTON( group->data ), m_changed );