Commits

Anonymous committed 33832be

gtk3: #i111952# The current baseline, enforced in configure, is 2.4.0, As of GTK+ 2.0 gtk_widget_set_rc_style has been deprecated in favour of gtk_widget_set_style

Comments (0)

Files changed (1)

vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx

 		NWAddWidgetToCacheWindow( gWidgetData[nScreen].gDropdownWidget, nScreen );
 		gWidgetData[nScreen].gArrowWidget = gtk_arrow_new( GTK_ARROW_DOWN, GTK_SHADOW_OUT );
 		gtk_container_add( GTK_CONTAINER(gWidgetData[nScreen].gDropdownWidget), gWidgetData[nScreen].gArrowWidget );
-		gtk_widget_set_rc_style( gWidgetData[nScreen].gArrowWidget );
+		gtk_widget_set_style( gWidgetData[nScreen].gArrowWidget, NULL );
 		gtk_widget_realize( gWidgetData[nScreen].gArrowWidget );
 	}
 }
         gtk_container_forall(GTK_CONTAINER(gWidgetData[nScreen].gComboBoxEntryWidget),
             get_combo_box_entry_inner_widgets, GINT_TO_POINTER(nScreen) );
 
-	   //If for some reason or other we couldn't find the expected children,
-	   //alias them to some we know will definitely exist
-       if (!gWidgetData[nScreen].gComboBoxEntry_ButtonWidget)
-       {
-           NWEnsureGTKArrow ( nScreen );
-           gWidgetData[nScreen].gComboBoxEntry_ButtonWidget = gWidgetData[nScreen].gDropdownWidget;
-       }
-       if (!gWidgetData[nScreen].gComboBoxEntry_EntryWidget)
-       {
-           NWEnsureGTKEditBox( nScreen );
-           gWidgetData[nScreen].gComboBoxEntry_EntryWidget = gWidgetData[nScreen].gEditBoxWidget;
-       }
+        //If for some reason or other we couldn't find the expected children,
+        //alias them to some we know will definitely exist
+        if (!gWidgetData[nScreen].gComboBoxEntry_ButtonWidget)
+        {
+            NWEnsureGTKArrow ( nScreen );
+            gWidgetData[nScreen].gComboBoxEntry_ButtonWidget = gWidgetData[nScreen].gDropdownWidget;
+        }
+        if (!gWidgetData[nScreen].gComboBoxEntry_EntryWidget)
+        {
+            NWEnsureGTKEditBox( nScreen );
+            gWidgetData[nScreen].gComboBoxEntry_EntryWidget = gWidgetData[nScreen].gEditBoxWidget;
+        }
     }
 }