gdk: Do final copy with OPERATOR_SOURCE in end_implicit_paint

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

diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 54fc3015c3e756c573a42c5caf44350aaa3071aa..dfb21cd6c65834475bfe68edc52c0c7661fd9f3a 100644 (file)
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
@@ -71,13 +71,13 @@ struct _GdkColormap
   GObject parent_instance;
 
   /*< public >*/
-  gint      size;
-  GdkColor *colors;
+  gint      GSEAL (size);
+  GdkColor *GSEAL (colors);
 
   /*< private >*/
-  GdkVisual *visual;
+  GdkVisual *GSEAL (visual);
   
-  gpointer windowing_data;
+  gpointer GSEAL (windowing_data);
 };
 
 struct _GdkColormapClass
@@ -91,27 +91,12 @@ GType        gdk_colormap_get_type (void) G_GNUC_CONST;
 GdkColormap* gdk_colormap_new    (GdkVisual   *visual,
                                   gboolean     allocate);
 
-#ifndef GDK_DISABLE_DEPRECATED
-GdkColormap* gdk_colormap_ref    (GdkColormap *cmap);
-void        gdk_colormap_unref   (GdkColormap *cmap);
-#endif 
-
 #ifndef GDK_MULTIHEAD_SAFE
 GdkColormap* gdk_colormap_get_system           (void);
 #endif
 
 GdkScreen *gdk_colormap_get_screen (GdkColormap *cmap);
 
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_colormap_get_system_size  (void);
-#endif
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_colors_store () */
-void gdk_colormap_change (GdkColormap  *colormap,
-                         gint           ncolors);
-#endif 
-
 gint  gdk_colormap_alloc_colors   (GdkColormap    *colormap,
                                   GdkColor       *colors,
                                   gint            n_colors,
@@ -125,9 +110,6 @@ gboolean gdk_colormap_alloc_color (GdkColormap    *colormap,
 void     gdk_colormap_free_colors (GdkColormap    *colormap,
                                   const GdkColor *colors,
                                   gint            n_colors);
-void     gdk_colormap_query_color (GdkColormap    *colormap,
-                                  gulong          pixel,
-                                  GdkColor       *result);
 
 GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
 
@@ -142,34 +124,6 @@ gchar *   gdk_color_to_string (const GdkColor *color);
 
 GType     gdk_color_get_type (void) G_GNUC_CONST;
 
-/* The following functions are deprecated */
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_colors_store   (GdkColormap   *colormap,
-                         GdkColor      *colors,
-                         gint           ncolors);
-gint gdk_color_white    (GdkColormap   *colormap,
-                         GdkColor      *color);
-gint gdk_color_black    (GdkColormap   *colormap,
-                         GdkColor      *color);
-gint gdk_color_alloc    (GdkColormap   *colormap,
-                         GdkColor      *color);
-gint gdk_color_change   (GdkColormap   *colormap,
-                         GdkColor      *color);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_rgb_try_colormap () */
-gint gdk_colors_alloc   (GdkColormap   *colormap,
-                         gboolean       contiguous,
-                         gulong        *planes,
-                         gint           nplanes,
-                         gulong        *pixels,
-                         gint           npixels);
-void gdk_colors_free    (GdkColormap   *colormap,
-                         gulong        *pixels,
-                         gint           npixels,
-                         gulong         planes);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
 
 G_END_DECLS