From f9388714b7aa4ea15f8a45b205d99895ee31bdc0 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Tue, 11 Oct 2011 04:11:08 +0000 Subject: [PATCH] (trunk gtk) add portability wrappers for gtk_hbox_new() and gtk_vbox_new(), which are deprecated now in GTK+ 3.2 --- gtk/details.c | 18 +++++++++++------- gtk/filter.c | 2 +- gtk/hig.c | 7 ++++--- gtk/makemeta-ui.c | 4 ++-- gtk/msgwin.c | 2 +- gtk/tr-prefs.c | 14 +++++++------- gtk/tr-window.c | 10 +++++----- gtk/util.c | 20 ++++++++++++++++++++ gtk/util.h | 6 ++++++ 9 files changed, 57 insertions(+), 26 deletions(-) diff --git a/gtk/details.c b/gtk/details.c index bfd924a06..ae8d13ed2 100644 --- a/gtk/details.c +++ b/gtk/details.c @@ -514,7 +514,7 @@ options_page_new( struct DetailsImpl * d ) hig_workarea_add_section_divider( t, &row ); hig_workarea_add_section_title( t, &row, _( "Seeding Limits" ) ); - h = gtk_hbox_new( FALSE, GUI_PAD ); + h = gtr_hbox_new( FALSE, GUI_PAD ); w = d->ratio_combo = ratio_combo_new( ); d->ratio_combo_tag = g_signal_connect( w, "changed", G_CALLBACK( onComboEnumChanged ), d ); gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); @@ -524,7 +524,7 @@ options_page_new( struct DetailsImpl * d ) gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 ); hig_workarea_add_row( t, &row, _( "_Ratio:" ), h, NULL ); - h = gtk_hbox_new( FALSE, GUI_PAD ); + h = gtr_hbox_new( FALSE, GUI_PAD ); w = d->idle_combo = idle_combo_new( ); d->idle_combo_tag = g_signal_connect( w, "changed", G_CALLBACK( onComboEnumChanged ), d ); gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); @@ -1731,10 +1731,14 @@ peer_page_new( struct DetailsImpl * di ) GTK_SHADOW_IN ); gtk_container_add( GTK_CONTAINER( w ), v ); - vbox = gtk_vbox_new( FALSE, GUI_PAD ); + vbox = gtr_vbox_new( FALSE, GUI_PAD ); gtk_container_set_border_width( GTK_CONTAINER( vbox ), GUI_PAD_BIG ); +#if GTK_CHECK_VERSION(3,2,0) + v = gtk_paned_new( GTK_ORIENTATION_VERTICAL ); +#else v = gtk_vpaned_new( ); +#endif gtk_paned_pack1( GTK_PANED( v ), webtree, FALSE, TRUE ); gtk_paned_pack2( GTK_PANED( v ), sw, TRUE, TRUE ); gtk_box_pack_start( GTK_BOX( vbox ), v, TRUE, TRUE, 0 ); @@ -2372,7 +2376,7 @@ tracker_page_new( struct DetailsImpl * di ) GtkWidget *vbox, *sw, *w, *v, *hbox; const int pad = ( GUI_PAD + GUI_PAD_BIG ) / 2; - vbox = gtk_vbox_new( FALSE, GUI_PAD ); + vbox = gtr_vbox_new( FALSE, GUI_PAD ); gtk_container_set_border_width( GTK_CONTAINER( vbox ), GUI_PAD_BIG ); di->tracker_store = gtk_list_store_new( TRACKER_N_COLS, G_TYPE_INT, @@ -2390,7 +2394,7 @@ tracker_page_new( struct DetailsImpl * di ) gtk_tree_model_filter_set_visible_func( GTK_TREE_MODEL_FILTER( di->trackers_filtered ), trackerVisibleFunc, di, NULL ); - hbox = gtk_hbox_new( FALSE, GUI_PAD_BIG ); + hbox = gtr_hbox_new( FALSE, GUI_PAD_BIG ); v = di->tracker_view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( di->trackers_filtered ) ); g_object_unref( di->trackers_filtered ); @@ -2425,7 +2429,7 @@ tracker_page_new( struct DetailsImpl * di ) gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); - v = gtk_vbox_new( FALSE, GUI_PAD ); + v = gtr_vbox_new( FALSE, GUI_PAD ); w = gtk_button_new_with_mnemonic( _( "_Add" ) ); di->add_tracker_button = w; @@ -2550,7 +2554,7 @@ gtr_torrent_details_dialog_new( GtkWindow * parent, TrCore * core ) l = gtk_label_new( _( "Trackers" ) ); gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, l ); - v = gtk_vbox_new( FALSE, 0 ); + v = gtr_vbox_new( FALSE, 0 ); di->file_list = gtr_file_list_new( core, 0 ); di->file_label = gtk_label_new( _( "File listing not available for combined torrent properties" ) ); gtk_box_pack_start( GTK_BOX( v ), di->file_list, TRUE, TRUE, 0 ); diff --git a/gtk/filter.c b/gtk/filter.c index 15fbe12a3..be57151bb 100644 --- a/gtk/filter.c +++ b/gtk/filter.c @@ -984,7 +984,7 @@ gtr_filter_bar_new( tr_session * session, GtkTreeModel * tmodel, GtkTreeModel ** g_signal_connect( data->activity, "changed", G_CALLBACK( selection_changed_cb ), data ); - h = gtk_hbox_new( FALSE, GUI_PAD_SMALL ); + h = gtr_hbox_new( FALSE, GUI_PAD_SMALL ); /* add the activity combobox */ str = _( "_Show:" ); diff --git a/gtk/hig.c b/gtk/hig.c index 0449dc349..dfb1125a8 100644 --- a/gtk/hig.c +++ b/gtk/hig.c @@ -12,6 +12,7 @@ #include #include "hig.h" +#include "util.h" /* gtr_hbox_new */ GtkWidget* hig_workarea_create( void ) @@ -58,7 +59,7 @@ static GtkWidget* rowNew( GtkWidget * w ) { GtkWidget * a; - GtkWidget * h = gtk_hbox_new( FALSE, 0 ); + GtkWidget * h = gtr_hbox_new( FALSE, 0 ); /* spacer */ a = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); @@ -187,8 +188,8 @@ hig_workarea_add_tall_row( GtkWidget * table, GtkWidget * mnemonic ) { GtkWidget * l = gtk_label_new_with_mnemonic( mnemonic_string ); - GtkWidget * h = gtk_hbox_new( FALSE, 0 ); - GtkWidget * v = gtk_vbox_new( FALSE, 0 ); + GtkWidget * h = gtr_hbox_new( FALSE, 0 ); + GtkWidget * v = gtr_vbox_new( FALSE, 0 ); gtk_box_pack_start( GTK_BOX( h ), l, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( v ), h, FALSE, FALSE, GUI_PAD_SMALL ); diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c index efc3e5a41..8f991c841 100644 --- a/gtk/makemeta-ui.c +++ b/gtk/makemeta-ui.c @@ -177,7 +177,7 @@ makeProgressDialog( GtkWidget * parent, MakeMetaUI * ui ) fr = gtk_frame_new( NULL ); gtk_container_set_border_width( GTK_CONTAINER( fr ), GUI_PAD_BIG ); gtk_frame_set_shadow_type( GTK_FRAME( fr ), GTK_SHADOW_NONE ); - v = gtk_vbox_new( TRUE, GUI_PAD ); + v = gtr_vbox_new( TRUE, GUI_PAD ); gtk_container_add( GTK_CONTAINER( fr ), v ); l = gtk_label_new( _( "Creating torrent..." ) ); @@ -473,7 +473,7 @@ gtr_torrent_creation_dialog_new( GtkWindow * parent, TrCore * core ) hig_workarea_add_section_title ( t, &row, _( "Properties" ) ); str = _( "_Trackers:" ); - v = gtk_vbox_new( FALSE, GUI_PAD_SMALL ); + v = gtr_vbox_new( FALSE, GUI_PAD_SMALL ); ui->announce_text_buffer = gtk_text_buffer_new( NULL ); w = gtk_text_view_new_with_buffer( ui->announce_text_buffer ); gtk_widget_set_size_request( w, -1, 80 ); diff --git a/gtk/msgwin.c b/gtk/msgwin.c index f43c5a042..ac1f52106 100644 --- a/gtk/msgwin.c +++ b/gtk/msgwin.c @@ -445,7 +445,7 @@ gtr_message_log_window_new( GtkWindow * parent, TrCore * core ) gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) ); gtk_window_set_default_size( GTK_WINDOW( win ), 560, 350 ); gtk_window_set_role( GTK_WINDOW( win ), "message-log" ); - vbox = gtk_vbox_new( FALSE, 0 ); + vbox = gtr_vbox_new( FALSE, 0 ); /** *** toolbar diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c index d4e4813db..500d54326 100644 --- a/gtk/tr-prefs.c +++ b/gtk/tr-prefs.c @@ -549,7 +549,7 @@ privacyPage( GObject * core ) gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.5f ); updateBlocklistText( w, TR_CORE( core ) ); data->label = w; - h = gtk_hbox_new( FALSE, GUI_PAD_BIG ); + h = gtr_hbox_new( FALSE, GUI_PAD_BIG ); gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); b = data->updateBlocklistButton = gtk_button_new_with_mnemonic( _( "_Update" ) ); g_object_set_data( G_OBJECT( b ), "session", gtr_core_session( TR_CORE( core ) ) ); @@ -811,7 +811,7 @@ webPage( GObject * core ) w = new_check_button( s, TR_PREFS_KEY_RPC_ENABLED, core ); page->rpc_tb = GTK_TOGGLE_BUTTON( w ); g_signal_connect( w, "clicked", G_CALLBACK( onRPCToggled ), page ); - h = gtk_hbox_new( FALSE, GUI_PAD_BIG ); + h = gtr_hbox_new( FALSE, GUI_PAD_BIG ); gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); w = gtk_button_new_with_mnemonic( _( "_Open web client" ) ); page->widgets = g_slist_prepend( page->widgets, w ); @@ -902,7 +902,7 @@ webPage( GObject * core ) gtk_misc_set_padding( GTK_MISC( w ), 0, GUI_PAD ); page->whitelist_widgets = g_slist_prepend( page->whitelist_widgets, w ); - h = gtk_hbox_new( TRUE, GUI_PAD ); + h = gtr_hbox_new( TRUE, GUI_PAD ); w = gtk_button_new_from_stock( GTK_STOCK_REMOVE ); g_signal_connect( w, "clicked", G_CALLBACK( onRemoveWhitelistClicked ), page ); @@ -913,7 +913,7 @@ webPage( GObject * core ) page->whitelist_widgets = g_slist_prepend( page->whitelist_widgets, w ); g_signal_connect( w, "clicked", G_CALLBACK( onAddWhitelistClicked ), page ); gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); - w = gtk_hbox_new( FALSE, 0 ); + w = gtr_hbox_new( FALSE, 0 ); gtk_box_pack_start( GTK_BOX( w ), gtk_alignment_new( 0, 0, 0, 0 ), TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( w ), h, FALSE, FALSE, 0 ); @@ -1071,7 +1071,7 @@ bandwidthPage( GObject * core ) hig_workarea_add_row_w( t, &row, w, w2, NULL ); hig_workarea_add_section_divider( t, &row ); - h = gtk_hbox_new( FALSE, GUI_PAD ); + h = gtr_hbox_new( FALSE, GUI_PAD ); w = gtk_image_new_from_stock( "alt-speed-on", -1 ); gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 ); g_snprintf( buf, sizeof( buf ), "%s", _( "Alternative Speed Limits" ) ); @@ -1097,7 +1097,7 @@ bandwidthPage( GObject * core ) hig_workarea_add_row( t, &row, buf, w, NULL ); s = _( "_Scheduled times:" ); - h = gtk_hbox_new( FALSE, 0 ); + h = gtr_hbox_new( FALSE, 0 ); w2 = new_time_combo( core, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN ); page->sched_widgets = g_slist_prepend( page->sched_widgets, w2 ); gtk_box_pack_start( GTK_BOX( h ), w2, TRUE, TRUE, 0 ); @@ -1211,7 +1211,7 @@ networkPage( GObject * core ) w = data->portSpin = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, USHRT_MAX, 1 ); hig_workarea_add_row( t, &row, s, w, NULL ); - h = gtk_hbox_new( FALSE, GUI_PAD_BIG ); + h = gtr_hbox_new( FALSE, GUI_PAD_BIG ); l = data->portLabel = gtk_label_new( _( "Status unknown" ) ); gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f ); gtk_box_pack_start( GTK_BOX( h ), l, TRUE, TRUE, 0 ); diff --git a/gtk/tr-window.c b/gtk/tr-window.c index d1be8073a..8cba4e52f 100644 --- a/gtk/tr-window.c +++ b/gtk/tr-window.c @@ -612,7 +612,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core ) gtk_window_add_accel_group( win, gtk_ui_manager_get_accel_group( ui_mgr ) ); /* window's main container */ - vbox = gtk_vbox_new ( FALSE, 0 ); + vbox = gtr_vbox_new ( FALSE, 0 ); gtk_container_add ( GTK_CONTAINER( self ), vbox ); /* main menu */ @@ -652,7 +652,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core ) } /* status */ - h = status = p->status = gtk_hbox_new( FALSE, GUI_PAD_BIG ); + h = status = p->status = gtr_hbox_new( FALSE, GUI_PAD_BIG ); gtk_container_set_border_width( GTK_CONTAINER( h ), GUI_PAD_SMALL ); w = gtk_button_new( ); @@ -674,7 +674,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core ) gtk_label_set_single_line_mode( GTK_LABEL( w ), TRUE ); gtk_box_pack_start( GTK_BOX( h ), w, 1, 1, GUI_PAD ); - hbox = gtk_hbox_new( FALSE, GUI_PAD ); + hbox = gtr_hbox_new( FALSE, GUI_PAD ); w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); gtk_widget_set_size_request( w, GUI_PAD, 0u ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); @@ -685,7 +685,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core ) gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 ); - hbox = gtk_hbox_new( FALSE, GUI_PAD ); + hbox = gtr_hbox_new( FALSE, GUI_PAD ); w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); gtk_widget_set_size_request( w, GUI_PAD, 0u ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); @@ -696,7 +696,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core ) gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_box_pack_end( GTK_BOX( h ), hbox, FALSE, FALSE, 0 ); - hbox = gtk_hbox_new( FALSE, GUI_PAD ); + hbox = gtr_hbox_new( FALSE, GUI_PAD ); w = gtk_button_new( ); gtk_widget_set_tooltip_text( w, _( "Statistics" ) ); gtk_container_add( GTK_CONTAINER( w ), gtk_image_new_from_stock( "ratio", -1 ) ); diff --git a/gtk/util.c b/gtk/util.c index 5868b4825..df114ba22 100644 --- a/gtk/util.c +++ b/gtk/util.c @@ -473,6 +473,26 @@ gtr_priority_combo_new( void ) **** ***/ +GtkWidget* +gtr_hbox_new( gboolean homogenous UNUSED, gint spacing ) +{ +#if GTK_CHECK_VERSION( 3,2,0 ) + return gtk_box_new( GTK_ORIENTATION_HORIZONTAL, spacing ); +#else + return gtk_hbox_new( homogenous, spacing ); +#endif +} + +GtkWidget* +gtr_vbox_new( gboolean homogenous UNUSED, gint spacing ) +{ +#if GTK_CHECK_VERSION( 3,2,0 ) + return gtk_box_new( GTK_ORIENTATION_VERTICAL, spacing ); +#else + return gtk_vbox_new( homogenous, spacing ); +#endif +} + void gtr_widget_set_visible( GtkWidget * w, gboolean b ) { diff --git a/gtk/util.h b/gtk/util.h index aebc6a2b2..444d26326 100644 --- a/gtk/util.h +++ b/gtk/util.h @@ -88,6 +88,12 @@ const char* gtr_get_help_uri( void ); **** ***/ +/* backwards-compatible wrapper around gtk_hbox_new() */ +GtkWidget* gtr_hbox_new( gboolean homogenous, gint spacing ); + +/* backwards-compatible wrapper around gtk_vbox_new() */ +GtkWidget* gtr_vbox_new( gboolean homogenous, gint spacing ); + /* backwards-compatible wrapper around gtk_widget_set_visible() */ void gtr_widget_set_visible( GtkWidget *, gboolean );