Move out of HAVE_XKB. (#95129, Phil Blundell)

[~andy/gtk] / demos / pixbuf-demo.c

diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 2ecd6f1d775a481ae8d9052832b8c8a715f4e655..5425f4bc808d860d8e3194b58de5cf7f0cdf7652 100644 (file)
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -138,17 +138,17 @@ timeout (gpointer data)
                GdkRectangle r1, r2, dest;
                double k;
 
-               ang = 2.0 * M_PI * (double) i / N_IMAGES - f * 2.0 * M_PI;
+               ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
 
                iw = gdk_pixbuf_get_width (images[i]);
                ih = gdk_pixbuf_get_height (images[i]);
 
-               r = radius + (radius / 3.0) * sin (f * 2.0 * M_PI);
+               r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
 
                xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
                ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
 
-               k = (i & 1) ? sin (f * 2.0 * M_PI) : cos (f * 2.0 * M_PI);
+               k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
                k = 2.0 * k * k;
                k = MAX (0.25, k);
 
@@ -171,8 +171,8 @@ timeout (gpointer data)
                                              k, k,
                                              GDK_INTERP_NEAREST,
                                              ((i & 1)
-                                              ? MAX (127, fabs (255 * sin (f * 2.0 * M_PI)))
-                                              : MAX (127, fabs (255 * cos (f * 2.0 * M_PI)))));
+                                              ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
+                                              : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
        }
 
        gtk_widget_queue_draw (da);
@@ -215,13 +215,13 @@ main (int argc, char **argv)
        gtk_widget_set_size_request (window, back_width, back_height);
         gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
-       gtk_signal_connect (GTK_OBJECT (window), "destroy",
-                           GTK_SIGNAL_FUNC (destroy_cb), NULL);
+       g_signal_connect (window, "destroy",
+                         G_CALLBACK (destroy_cb), NULL);
 
        da = gtk_drawing_area_new ();
 
-       gtk_signal_connect (GTK_OBJECT (da), "expose_event",
-                           GTK_SIGNAL_FUNC (expose_cb), NULL);
+       g_signal_connect (da, "expose_event",
+                         G_CALLBACK (expose_cb), NULL);
 
        gtk_container_add (GTK_CONTAINER (window), da);