diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-11-25 23:36:29 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-11-25 23:36:29 +0000 |
| commit | 9a60bfac0c7342461430125098291c6b5d7550fc (patch) | |
| tree | a7692efd5a5d4fa0f40653ae1507aeb7aa6f8429 /demos | |
| parent | 7a181cf52b951103b4037d0d7443c739250c85d0 (diff) | |
| download | gtk+-9a60bfac0c7342461430125098291c6b5d7550fc.tar.gz | |
demos/pixbuf-demo.c M_PI -> G_PI.
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
* demos/gtk-demo/pixbufs.c: M_PI -> G_PI.
* demos/gtk-demo/main.c (read_line): No flockfile() or
getc_unlocked() on Win32.
2001-11-25 Tor Lillqvist <tml@iki.fi>
* configure.in
* acconfig.h: As we now use GDir, no need to check for dirent.h.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/main.c | 12 | ||||
| -rw-r--r-- | demos/gtk-demo/pixbufs.c | 10 | ||||
| -rw-r--r-- | demos/pixbuf-demo.c | 10 |
3 files changed, 22 insertions, 10 deletions
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index a48256df88..d126fdae25 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -87,7 +87,9 @@ read_line (FILE *stream, GString *str) { int n_read = 0; +#ifndef G_OS_WIN32 flockfile (stream); +#endif g_string_truncate (str, 0); @@ -95,7 +97,11 @@ read_line (FILE *stream, GString *str) { int c; +#ifndef G_OS_WIN32 c = getc_unlocked (stream); +#else + c = getc (stream); +#endif if (c == EOF) goto done; @@ -107,7 +113,11 @@ read_line (FILE *stream, GString *str) case '\r': case '\n': { +#ifndef G_OS_WIN32 int next_c = getc_unlocked (stream); +#else + int next_c = getc (stream); +#endif if (!(next_c == EOF || (c == '\r' && next_c == '\n') || @@ -123,7 +133,9 @@ read_line (FILE *stream, GString *str) done: +#ifndef G_OS_WIN32 funlockfile (stream); +#endif return n_read > 0; } diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c index eef2747d05..9a50d6f3c1 100644 --- a/demos/gtk-demo/pixbufs.c +++ b/demos/gtk-demo/pixbufs.c @@ -151,17 +151,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); @@ -184,8 +184,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); diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c index c25d8e6dfe..5425f4bc80 100644 --- 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); |