Make styleexamples work

If we are keeping this code in source control, might as well
make it work.

https://bugzilla.gnome.org/show_bug.cgi?id=638179

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fc4b58e1d7bbf4894f9eb3c2399b35cfe3952b3b..61d527066650aaf11a9f6d5256c57df0b7c34a47 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -408,6 +408,7 @@ testswitch_SOURCES = testswitch.c
 styleexamples_SOURCES = styleexamples.c
 
 EXTRA_DIST +=                  \
+       gradient1.png           \
        prop-editor.h           \
        testgtk.1               \
        testgtk.css             \

diff --git a/tests/gradient1.png b/tests/gradient1.png
new file mode 100644 (file)
index 0000000..248c998
Binary files /dev/null and b/tests/gradient1.png differ

diff --git a/tests/styleexamples.c b/tests/styleexamples.c
index 75350ddd2d171447b876654cd7d961fe308c7fcb..e583ce8aead2f017e8586942731fc274b5460442 100644 (file)
--- a/tests/styleexamples.c
+++ b/tests/styleexamples.c
@@ -97,24 +97,17 @@ draw_cb_expanders (GtkWidget *widget, cairo_t *cr)
 static gboolean
 draw_cb_background (GtkWidget *widget, cairo_t *cr)
 {
-  GtkStyleProvider *provider;
   GtkStyleContext *context;
 
   context = gtk_widget_get_style_context (widget);
 
   gtk_style_context_save (context);
 
-  provider = (GtkStyleProvider *)gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
-                                   "* {\n"
-                                   "   border-radius: 10;\n"
-                                   "   border-width: 0;\n"
-                                   "   background-image: -gtk-gradient (linear, left top, right bottom, from(#ff00ff), to(#aabbcc));\n"
-                                   "}\n", -1, NULL);
-  gtk_style_context_add_provider (context, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  gtk_style_context_add_class (context, "background");
   gtk_style_context_set_junction_sides (context, 0);
   gtk_render_background (context, cr, 12, 12, 100, 100);
-  gtk_style_context_remove_provider (context, provider);
+  gtk_style_context_remove_class (context, "background");
+
   gtk_style_context_restore (context);
 
   return TRUE;
@@ -123,33 +116,12 @@ draw_cb_background (GtkWidget *widget, cairo_t *cr)
 static gboolean
 draw_cb_frame (GtkWidget *widget, cairo_t *cr)
 {
-  GtkStyleProvider *provider;
   GtkStyleContext *context;
 
   context = gtk_widget_get_style_context (widget);
 
   gtk_style_context_save (context);
 
-  provider = (GtkStyleProvider *)gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
-                                   ".frame1 {\n"
-                                   "   border-image: url('gradient1.png') 10 10 10 10 stretch;\n"
-                                   "}\n"
-                                   ".frame2 {\n"
-                                   "   border-style: solid;\n"
-                                   "   border-color: rgb(255,0,0);\n"
-                                   "   border-width: 10;\n"
-                                   "   border-radius: 10;\n"
-                                   "}\n"
-                                   ".frame3 {\n"
-                                   "   border-style: solid;\n"
-                                   "   border-color: rgb(0,0,0);\n"
-                                   "   border-width: 2;\n"
-                                   "   border-radius: 10;\n"
-                                   "}\n",
-                                   -1, NULL);
-  gtk_style_context_add_provider (context, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
   gtk_style_context_add_class (context, "frame1");
   gtk_style_context_set_junction_sides (context, 0);
   gtk_render_frame (context, cr, 12, 12, 50, 50);
@@ -166,7 +138,6 @@ draw_cb_frame (GtkWidget *widget, cairo_t *cr)
   gtk_render_frame (context, cr, 68, 74, 56, 50);
   gtk_style_context_remove_class (context, "frame3");
 
-  gtk_style_context_remove_provider (context, provider);
   gtk_style_context_restore (context);
 
   return TRUE;
@@ -269,29 +240,16 @@ static gboolean
 draw_cb_frame_gap (GtkWidget *widget, cairo_t *cr)
 {
   GtkStyleContext *context;
-  GtkStyleProvider *provider;
 
   context = gtk_widget_get_style_context (widget);
 
   gtk_style_context_save (context);
 
-  provider = (GtkStyleProvider *)gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
-                                   ".frame {\n"
-                                   "   border-style: solid;\n"
-                                   "   border-width: 1;\n"
-                                   "   border-radius: 0;\n"
-                                   "}\n",
-                                   -1, NULL);
-  gtk_style_context_add_provider (context, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
   gtk_style_context_add_class (context, "frame");
   gtk_style_context_set_junction_sides (context, 0);
   gtk_render_frame_gap (context, cr, 12, 12, 50, 50, GTK_POS_TOP, 15, 35);
   gtk_style_context_remove_class (context, "frame");
 
-  gtk_style_context_remove_provider (context, provider);
-
   gtk_style_context_restore (context);
 
   return TRUE;
@@ -359,6 +317,8 @@ int main (int argc, char *argv[])
 {
   GtkWidget *window;
   GtkWidget *ebox;
+  GtkStyleContext *context;
+  GtkStyleProvider *provider;
 
   gtk_init (&argc, &argv);
 
@@ -373,12 +333,45 @@ int main (int argc, char *argv[])
   gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), TRUE);
   gtk_container_add (GTK_CONTAINER (window), ebox);
   gtk_widget_set_name (ebox, "ebox");
+
+  context = gtk_widget_get_style_context (ebox);
+  provider = (GtkStyleProvider *)gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
+                                   ".frame1 {\n"
+                                   "   border-image: url('gradient1.png') 10 10 10 10 stretch;\n"
+                                   "}\n"
+                                   ".frame2 {\n"
+                                   "   border-style: solid;\n"
+                                   "   border-color: rgb(255,0,0);\n"
+                                   "   border-width: 10;\n"
+                                   "   border-radius: 10;\n"
+                                   "}\n"
+                                   ".frame3 {\n"
+                                   "   border-style: solid;\n"
+                                   "   border-color: rgb(0,0,0);\n"
+                                   "   border-width: 2;\n"
+                                   "   border-radius: 10;\n"
+                                   "}\n"
+                                   ".background {\n"
+                                   "   border-radius: 10;\n"
+                                   "   border-width: 0;\n"
+                                   "   background-image: -gtk-gradient (linear, left top, right bottom, from(#ff00ff), to(#aabbcc));\n"
+                                   "}\n"
+                                   ".frame {\n"
+                                   "   border-style: solid;\n"
+                                   "   border-width: 1;\n"
+                                   "   border-radius: 0;\n"
+                                   "}\n", -1, NULL);
+  gtk_style_context_add_provider (context, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
   g_signal_connect_after (ebox, "draw", G_CALLBACK (draw_cb), NULL);
 
   gtk_widget_show_all (window);
 
   gtk_main ();
 
+  gtk_style_context_remove_provider (context, provider);
+
   return 0;
 }