X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestcombochange.c;h=6f254fe4a284b7e75adbe3ab9776610826db167e;hb=HEAD;hp=89fe3a1a2d7e7bda329648150864d31424fb0736;hpb=d97cdbdf53832729141b3b66de00f770b44e3390;p=~andy%2Fgtk

diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index 89fe3a1a2..6f254fe4a 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -31,12 +29,8 @@ static char next_value = 'A';
 static void
 test_init (void)
 {
-  if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
-		   G_FILE_TEST_EXISTS))
-    {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
-    }
+  if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+    g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
 }
 
 static void
@@ -94,16 +88,9 @@ create_combo (const char *name,
 {
   GtkCellRenderer *cell_renderer;
   GtkWidget *combo;
-  char *rc_string;
-  
-  rc_string = g_strdup_printf ("style \"%s-style\" {\n"
-			       "  GtkComboBox::appears-as-list = %d\n"
-			       "}\n"
-			       "\n"
-			       "widget \"*.%s\" style \"%s-style\"",
-			       name, is_list, name, name);
-  gtk_rc_parse_string (rc_string);
-  g_free (rc_string);
+  GtkCssProvider *provider;
+  GtkStyleContext *context;
+  gchar *css_data;
 
   combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
   cell_renderer = gtk_cell_renderer_text_new ();
@@ -112,7 +99,19 @@ create_combo (const char *name,
 				  "text", 0, NULL);
 
   gtk_widget_set_name (combo, name);
-  
+
+  context = gtk_widget_get_style_context (combo);
+
+  provider = gtk_css_provider_new ();
+  css_data = g_strdup_printf ("#%s { -GtkComboBox-appears-as-list: %s }",
+                              name, is_list ? "true" : "false");
+  gtk_css_provider_load_from_data (provider, css_data, -1, NULL);
+  g_free (css_data);
+
+  gtk_style_context_add_provider (context,
+                                  GTK_STYLE_PROVIDER (provider),
+                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
   return combo;
 }
 
@@ -234,6 +233,7 @@ on_animate (void)
 int
 main (int argc, char **argv)
 {
+  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *scrolled_window;
   GtkWidget *hbox;
@@ -253,15 +253,17 @@ main (int argc, char **argv)
   contents = g_array_new (FALSE, FALSE, sizeof (char));
   
   dialog = gtk_dialog_new_with_buttons ("GtkComboBox model changes",
-					NULL, GTK_DIALOG_NO_SEPARATOR,
+					NULL, 0,
 					GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 					NULL);
-  
-  hbox = gtk_hbox_new (FALSE, 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
-  combo_vbox = gtk_vbox_new (FALSE, 8);
+  combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE, 0);
 
   label = gtk_label_new (NULL);
@@ -297,7 +299,7 @@ main (int argc, char **argv)
 
   gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
 
-  button_vbox = gtk_vbox_new (FALSE, 8);
+  button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE, 0);
   
   gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);