Various name fixes.

[~andy/gtk] / gdk / gdkdrawable.h

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 6200dc742442e99b65743ea26971bdc2cb103aba..f250f3ea097eb0b59349e39081b97569c715b0d5 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -33,14 +33,14 @@ struct _GdkDrawableClass
                          GdkGCValuesMask mask);
   void (*draw_rectangle) (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          gint          x,
                          gint          y,
                          gint          width,
                          gint          height);
   void (*draw_arc)       (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          gint          x,
                          gint          y,
                          gint          width,
@@ -49,7 +49,7 @@ struct _GdkDrawableClass
                          gint          angle2);
   void (*draw_polygon)   (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          GdkPoint     *points,
                          gint          npoints);
   void (*draw_text)      (GdkDrawable  *drawable,
@@ -211,20 +211,20 @@ void gdk_draw_point     (GdkDrawable      *drawable,
                         gint              y);
 void gdk_draw_line      (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              x1,
-                        gint              y1,
-                        gint              x2,
-                        gint              y2);
+                        gint              x1_,
+                        gint              y1_,
+                        gint              x2_,
+                        gint              y2_);
 void gdk_draw_rectangle (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         gint              x,
                         gint              y,
                         gint              width,
                         gint              height);
 void gdk_draw_arc       (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         gint              x,
                         gint              y,
                         gint              width,
@@ -233,16 +233,20 @@ void gdk_draw_arc       (GdkDrawable      *drawable,
                         gint              angle2);
 void gdk_draw_polygon   (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         GdkPoint         *points,
                         gint              npoints);
-#ifndef GDK_DISABLE_DEPRECATED
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+/* Used by gtk_default_draw_string () */
 void gdk_draw_string    (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
                         gint              x,
                         gint              y,
                         const gchar      *string);
+#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
+/* Used by gdk_pixmap_draw_text (), gdk_window_draw_text() */
 void gdk_draw_text      (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
@@ -250,6 +254,7 @@ void gdk_draw_text      (GdkDrawable      *drawable,
                         gint              y,
                         const gchar      *text,
                         gint              text_length);
+/* Used by gdk_pixmap_draw_text_wc (), gdk_window_draw_text_wc () */
 void gdk_draw_text_wc   (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
@@ -257,7 +262,7 @@ void gdk_draw_text_wc   (GdkDrawable      *drawable,
                         gint              y,
                         const GdkWChar   *text,
                         gint              text_length);
-#endif /* GDK_DISABLE_DEPRECATED */
+#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
 void gdk_draw_drawable  (GdkDrawable      *drawable,
                         GdkGC            *gc,
                         GdkDrawable      *src,