Finish removing GTK+ 2 fallbacks

(bzr r15023.2.8)

1 files changed, 2 insertions, 30 deletions

diff --git a/src/widgets/ege-select-one-action.cpp b/src/widgets/ege-select-one-action.cpp
index 2e106154e..5555663e4 100644
--- a/src/widgets/ege-select-one-action.cpp
+++ b/src/widgets/ege-select-one-action.cpp
@@ -632,12 +632,8 @@ GtkWidget* create_tool_item( GtkAction* action )
         item = GTK_WIDGET( gtk_tool_item_new() );
 
         if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            auto holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
-#else
-            GtkWidget* holder = gtk_hbox_new( FALSE, 0 );
-#endif
 
             GtkRadioAction* ract = 0;
             GSList* group = 0;
@@ -744,12 +740,8 @@ GtkWidget* create_tool_item( GtkAction* action )
 
             gtk_container_add( GTK_CONTAINER(item), holder );
         } else {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+            auto holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
             gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
-#else
-            GtkWidget *holder = gtk_hbox_new( FALSE, 4 );
-#endif
 
             GtkEntry *entry = 0;
             GtkWidget *normal;
@@ -818,14 +810,8 @@ GtkWidget* create_tool_item( GtkAction* action )
             gtk_box_pack_start( GTK_BOX(holder), normal, FALSE, FALSE, 0 );
 
             {
-#if GTK_CHECK_VERSION(3,0,0)
                 gtk_widget_set_halign(holder, GTK_ALIGN_START);
                 gtk_container_add(GTK_CONTAINER(item), holder);
-#else
-                GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0);
-                gtk_container_add( GTK_CONTAINER(align), holder);
-                gtk_container_add( GTK_CONTAINER(item), align );
-#endif
             }
         }
 
@@ -861,13 +847,6 @@ void resync_active( EgeSelectOneAction* act, gint active, gboolean override )
                 if ( children && children->data ) {
                     gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" );
 
-#if !GTK_CHECK_VERSION(3,0,0)
-                    if (!combodata && GTK_IS_ALIGNMENT(children->data)) {
-                        GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) );
-                         combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" );
-                    }
-#endif
-
                     if ( GTK_IS_COMBO_BOX(combodata) ) {
                         GtkComboBox* combo = GTK_COMBO_BOX(combodata);
                         if ((active == -1) && (gtk_combo_box_get_has_entry(combo))) {
@@ -925,13 +904,6 @@ void resync_sensitive( EgeSelectOneAction* act )
             if ( children && children->data ) {
                 gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" );
 
-#if !GTK_CHECK_VERSION(3,0,0)
-                if (!combodata && GTK_IS_ALIGNMENT(children->data)) {
-                    GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) );
-                    combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" );
-                }
-#endif
-
                 if ( GTK_IS_COMBO_BOX(combodata) ) {
                     /* Not implemented */
                 } else if ( GTK_IS_BOX(children->data) ) {