X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ghelpers.c;h=7acf588ab311ef9bb02a73746b40e74594e0ec81;hp=967040885a81d3b546c4bec623755c758ff8e10e;hb=48d86be55597762c6747081aae1936f49429d13b;hpb=b4d669e6465f535919edc0830e7ace08e7886f2e

diff --git a/ghelpers.c b/ghelpers.c
index 96704088..7acf588a 100644
--- a/ghelpers.c
+++ b/ghelpers.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
+#include "gcompat.h"
 #include "ghelpers.h"
 
 GtkWidget *new_combo_entry_in_frame(GtkWidget *box, const char *label)
@@ -9,7 +10,7 @@ GtkWidget *new_combo_entry_in_frame(GtkWidget *box, const char *label)
 	GtkWidget *entry, *frame;
 
 	frame = gtk_frame_new(label);
-	entry = gtk_combo_box_new_text();
+	entry = gtk_combo_box_text_new();
 	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3);
 	gtk_container_add(GTK_CONTAINER(frame), entry);
 
@@ -22,13 +23,38 @@ GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label)
 
 	frame = gtk_frame_new(label);
 	entry = gtk_entry_new();
-	gtk_entry_set_editable(GTK_ENTRY(entry), 0);
+	gtk_editable_set_editable(GTK_EDITABLE(entry), 0);
 	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3);
 	gtk_container_add(GTK_CONTAINER(frame), entry);
 
 	return entry;
 }
 
+static void fill_color_from_rgb(GdkColor *c, gfloat r, gfloat g, gfloat b)
+{
+	gint R, G, B;
+	gchar tmp[8];
+
+	memset(c, 0, sizeof(*c));
+	R = r * 255;
+	G = g * 255;
+	B = b * 255;
+	snprintf(tmp, sizeof(tmp), "#%02x%02x%02x", R, G, B);
+	gdk_color_parse(tmp, c);
+}
+
+GtkWidget *new_info_entry_in_frame_rgb(GtkWidget *box, const char *label,
+					gfloat r, gfloat g, gfloat b)
+{
+	GtkWidget *entry;
+	GdkColor c;
+
+	entry = new_info_entry_in_frame(box, label);
+	fill_color_from_rgb(&c, r, g, b);
+	gtk_widget_modify_text(entry, GTK_STATE_NORMAL, &c);
+	return entry;
+}
+
 GtkWidget *new_info_label_in_frame(GtkWidget *box, const char *label)
 {
 	GtkWidget *label_widget;
@@ -97,7 +123,7 @@ GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char
 	gtk_tree_view_column_pack_start(col, renderer, TRUE);
 	gtk_tree_view_column_set_expand(col, TRUE);
 	gtk_tree_view_column_add_attribute(col, renderer, "text", index);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL);
+	g_object_set(G_OBJECT(renderer), "alignment", align, NULL);
 	switch (align) {
 	case PANGO_ALIGN_LEFT:
 		xalign = 0.0;