* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix...

[ardour.git] / gtk2_ardour / rgb_macros.h

diff --git a/gtk2_ardour/rgb_macros.h b/gtk2_ardour/rgb_macros.h
index f0a67ec0bd7efca9672a48ccefeda0243c73d91b..5660e90ee6f11d527320ed0e9bb0dfea36f4b781 100644 (file)
--- a/gtk2_ardour/rgb_macros.h
+++ b/gtk2_ardour/rgb_macros.h
@@ -18,7 +18,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_rgb_macros_h__
@@ -125,7 +124,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define PAINT_HORIZ(inbuf, colr, colg, colb, ptx0, ptx1, pty) \
 { \
-  GtkCanvasBuf* ph_buf = (inbuf); \
+  GnomeCanvasBuf* ph_buf = (inbuf); \
   guchar* ph_p; \
   gint ph_a0, ph_a1; \
   gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb); \
@@ -144,7 +143,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define FAST_PAINT_HORIZ(inbuf, colr, colg, colb, ptx0, ptx1, pty) \
 { \
-  GtkCanvasBuf* ph_buf = (inbuf); \
+  GnomeCanvasBuf* ph_buf = (inbuf); \
   guchar* ph_p; \
   gint ph_a0, ph_a1; \
   gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb); \
@@ -163,7 +162,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define PAINT_HORIZA(inbuf, colr, colg, colb, cola, ptx0, ptx1, pty) \
 { \
-  GtkCanvasBuf* ph_buf = (inbuf); \
+  GnomeCanvasBuf* ph_buf = (inbuf); \
   guchar* ph_p; \
   gint ph_a0, ph_a1; \
   gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb), ph_cola=(cola); \
@@ -182,7 +181,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define PAINT_VERT(inbuf, colr, colg, colb, ptx, pty0, pty1) \
 { \
-  GtkCanvasBuf* pv_buf = (inbuf); \
+  GnomeCanvasBuf* pv_buf = (inbuf); \
   guchar* pv_p; \
   gint pv_b0, pv_b1; \
   gint pv_colr=(colr), pv_colg=(colg), pv_colb=(colb);\
@@ -201,7 +200,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define FAST_PAINT_VERT(inbuf, colr, colg, colb, ptx, pty0, pty1) \
 { \
-  GtkCanvasBuf* fpv_buf = (inbuf); \
+  GnomeCanvasBuf* fpv_buf = (inbuf); \
   guchar* fpv_p; \
   gint fpv_b0, fpv_b1; \
 \
@@ -218,7 +217,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 }
 #define PAINT_VERTA(inbuf, colr, colg, colb, cola, ptx, pty0, pty1) \
 { \
-  GtkCanvasBuf* pv_buf = (inbuf); \
+  GnomeCanvasBuf* pv_buf = (inbuf); \
   guchar* pv_p; \
   gint pv_b0, pv_b1; \
   gint pv_colr=(colr), pv_colg=(colg), pv_colb=(colb), pv_cola=(cola);\
@@ -236,12 +235,12 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
   } \
 }
 
-/* Paint a solid-colored box into a GtkCanvasBuf (clipping as necessary).
+/* Paint a solid-colored box into a GnomeCanvasBuf (clipping as necessary).
    The box contains (ptx0,pty0), but not (ptx1, pty1).
    Each macro arg should appear exactly once in the body of the code. */
 #define PAINT_BOX(inbuf, colr, colg, colb, cola, ptx0, pty0, ptx1, pty1) \
 { \
-  GtkCanvasBuf* pb_buf = (inbuf); \
+  GnomeCanvasBuf* pb_buf = (inbuf); \
   guchar* pb_p; \
   guchar* pb_pp; \
   gint pb_a0, pb_a1, pb_b0, pb_b1, pb_i, pb_j; \
@@ -269,7 +268,7 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2)
 
 #define FAST_PAINT_BOX(inbuf, colr, colg, colb, cola, ptx0, pty0, ptx1, pty1) \
 { \
-  GtkCanvasBuf* pb_buf = (inbuf); \
+  GnomeCanvasBuf* pb_buf = (inbuf); \
   guchar* pb_p; \
   guchar* pb_pp; \
   gint pb_i, pb_j; \