#define M_PI if it isn't already initialize transparent properly, to make

* gtk/gtkcolorsel.c: #define M_PI if it isn't already
* gtk/testgtk.c: initialize transparent properly, to make purify happy

-Yosh

10 files changed, 52 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b70d51ae5..cff6aa3bd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Mar 18 17:03:02 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gtk/gtkcolorsel.c: #define M_PI if it isn't already
+	* gtk/testgtk.c: initialize transparent properly, to make purify
+	happy
+
 Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 5ce2e8811..db8ab8aed 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -24,6 +24,10 @@
  * across all the color info (currently RGBA). - Elliot
  */
 
+#ifndef M_PI
+#define M_PI    3.14159265358979323846
+#endif /* M_PI */
+
 #define DEGTORAD(a) (2.0*M_PI*a/360.0)
 #define SQR(a) (a*a)
 
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 83c2da51d..4b40d6a10 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -3983,7 +3983,7 @@ create_notebook ()
   GtkWidget *submenu;
   GtkWidget *menuitem;
   GSList *group;
-  GdkColor transparent;
+  GdkColor *transparent = NULL;
 
   if (!window)
     {
@@ -4009,11 +4009,11 @@ create_notebook ()
       gtk_widget_realize (notebook);
       book_open = gdk_pixmap_create_from_xpm_d (notebook->window,
 						&book_open_mask, 
-						&transparent, 
+						transparent, 
 						book_open_xpm);
       book_closed = gdk_pixmap_create_from_xpm_d (notebook->window,
 						  &book_closed_mask,
-						  &transparent, 
+						  transparent, 
 						  book_closed_xpm);
 
       create_pages (GTK_NOTEBOOK (notebook), 1, 5);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 83c2da51d..4b40d6a10 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3983,7 +3983,7 @@ create_notebook ()
   GtkWidget *submenu;
   GtkWidget *menuitem;
   GSList *group;
-  GdkColor transparent;
+  GdkColor *transparent = NULL;
 
   if (!window)
     {
@@ -4009,11 +4009,11 @@ create_notebook ()
       gtk_widget_realize (notebook);
       book_open = gdk_pixmap_create_from_xpm_d (notebook->window,
 						&book_open_mask, 
-						&transparent, 
+						transparent, 
 						book_open_xpm);
       book_closed = gdk_pixmap_create_from_xpm_d (notebook->window,
 						  &book_closed_mask,
-						  &transparent, 
+						  transparent, 
 						  book_closed_xpm);
 
       create_pages (GTK_NOTEBOOK (notebook), 1, 5);