[xine-cvs] CVS: gnome-xine/src preferences.c,1.45,1.46 snapshot.c,1.10,1.11

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8855/src

Modified Files:
	preferences.c snapshot.c 
Log Message:
Start using GtkComboBox (where possible).

Index: preferences.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/preferences.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- preferences.c	3 May 2005 18:15:08 -0000	1.45
+++ preferences.c	11 May 2005 19:59:34 -0000	1.46
@@ -291,7 +291,7 @@
   if (!xine_config_lookup_entry (xine, key, &entry))
     return;
 
-  pos = gtk_option_menu_get_history (GTK_OPTION_MENU(widget));
+  pos = gtk_combo_box_get_active (GTK_COMBO_BOX(widget));
 
   if (entry.num_value != pos)
   {
@@ -311,15 +311,12 @@
   switch (entry->type) {
   case XINE_CONFIG_TYPE_ENUM:
     {
-      GtkWidget *items = gtk_menu_new ();
-      char *v;
-      int i = -1;
-      while ((v = entry->enum_values[++i]))
-        gtk_menu_shell_append (GTK_MENU_SHELL(items),
-			       gtk_menu_item_new_with_label (gettext (v)));
-      widget = gtk_option_menu_new ();
-      gtk_option_menu_set_menu (GTK_OPTION_MENU(widget), items);
-      gtk_option_menu_set_history (GTK_OPTION_MENU(widget), entry->num_value);
+      int i;
+      widget = gtk_combo_box_new_text ();
+      for (i = 0; entry->enum_values[i]; ++i)
+	gtk_combo_box_append_text (GTK_COMBO_BOX(widget),
+				   entry->enum_values[i]);
+      gtk_combo_box_set_active (GTK_COMBO_BOX(widget), entry->num_value);
       g_signal_connect (GTK_OBJECT(widget), "changed",
 			G_CALLBACK(enum_cb), strdup(entry->key));
     }

Index: snapshot.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/snapshot.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- snapshot.c	5 Jan 2005 20:35:22 -0000	1.10
+++ snapshot.c	11 May 2005 19:59:34 -0000	1.11
@@ -128,11 +128,8 @@
   return rgb;
 }
 
-static GtkItemFactoryEntry blend_items[] = {
-  { N_("/Nearest"),	NULL, NULL, 0, NULL },
-  { N_("/Tiles"),	NULL, NULL, 0, NULL },
-  { N_("/Bilinear"),	NULL, NULL, 0, NULL },
-  { N_("/Hyper"),	NULL, NULL, 0, NULL },
+static const char *const blends[] = {
+  N_("Nearest"), N_("Tiles"), N_("Bilinear"), N_("Hyper"), NULL
 };
 
 void make_snapshot (char *fname, int scale, int blend)
@@ -167,8 +164,8 @@
 
   if (scale >= 0)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(scalebtn), scale != 0);
-  if (blend >= 0 && blend < num_menu_items (blend_items))
-    gtk_option_menu_set_history (GTK_OPTION_MENU(blendbtn), blend);
+  if (blend >= 0 && blend < G_N_ELEMENTS(blends))
+    gtk_combo_box_set_active (GTK_COMBO_BOX(blendbtn), blend);
 
   /* get filename & options */
 
@@ -212,7 +209,7 @@
   if (scale < 0)
     scale = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(scalebtn));
   if (blend < 0)
-    blend = gtk_option_menu_get_history (GTK_OPTION_MENU(blendbtn));
+    blend = gtk_combo_box_get_active (GTK_COMBO_BOX(blendbtn));
 
   if (!scale && !blend)
   {
@@ -276,7 +273,7 @@
 
 void snapshot_init (void)
 {
-  GtkItemFactory *factory;
+  int i;
   GtkWidget *w;
 
   bbox = gtk_hbox_new (FALSE, 2);
@@ -285,13 +282,11 @@
   w = gtk_label_new_with_mnemonic (_("_Blend:"));
   gtk_box_pack_start (GTK_BOX(bbox), w, FALSE, FALSE, 2);
 
-  blendbtn = gtk_option_menu_new ();
-  gtk_option_menu_set_menu (GTK_OPTION_MENU(blendbtn),
-			    create_menu_tree (&factory, NULL, NULL,
-					      blend_items,
-					      num_menu_items (blend_items)));
+  blendbtn = gtk_combo_box_new_text ();
+  for (i = 0; blends[i]; ++i)
+    gtk_combo_box_append_text (GTK_COMBO_BOX(blendbtn), gettext (blends[i]));
   gtk_box_pack_start (GTK_BOX(bbox), blendbtn, FALSE, FALSE, 2);
-  gtk_option_menu_set_history (GTK_OPTION_MENU(blendbtn), 2); /* bilinear */
+  gtk_combo_box_set_active (GTK_COMBO_BOX(blendbtn), 2); /* bilinear */
 
   gtk_label_set_mnemonic_widget (GTK_LABEL(w), blendbtn);