gdk/gdkimage.h No need any longer on Win32 for the shared memory

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

diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 94630f09801087c9ebb7f29e57dacb6e04bea56d..f7ab3ff5da9bc710b0849022879df66b3ae7d670 100644 (file)
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -24,15 +24,41 @@ struct _GdkColor
 
 /* The colormap type.
  */
+
+typedef struct _GdkColormapClass GdkColormapClass;
+
+#define GDK_TYPE_COLORMAP              (gdk_colormap_get_type ())
+#define GDK_COLORMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_COLORMAP, GdkColormap))
+#define GDK_COLORMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_COLORMAP, GdkColormapClass))
+#define GDK_IS_COLORMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_COLORMAP))
+#define GDK_IS_COLORMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_COLORMAP))
+#define GDK_COLORMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_COLORMAP, GdkColormapClass))
+
+
 struct _GdkColormap
 {
+  GObject parent_instance;
+
+  /*< public >*/
   gint      size;
   GdkColor *colors;
+
+  /*< private >*/
+  GdkVisual *visual;
+  
+  gpointer windowing_data;
 };
 
+struct _GdkColormapClass
+{
+  GObjectClass parent_class;
+
+};
+
+GType        gdk_colormap_get_type (void);
 
 GdkColormap* gdk_colormap_new    (GdkVisual   *visual,
-                                  gint         allocate);
+                                  gboolean     allocate);
 GdkColormap* gdk_colormap_ref    (GdkColormap *cmap);
 void        gdk_colormap_unref   (GdkColormap *cmap);
 
@@ -59,22 +85,20 @@ void     gdk_colormap_free_colors (GdkColormap *colormap,
 
 GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
      
-GdkColor *gdk_color_copy (GdkColor *color);
-void      gdk_color_free (GdkColor *color);
-
-gint gdk_color_parse    (const gchar   *spec,
-                         GdkColor      *color);
-guint gdk_color_hash     (const GdkColor *colora);
-gint gdk_color_equal    (const GdkColor *colora,
-                         const GdkColor *colorb);
-
+GdkColor *gdk_color_copy  (const GdkColor *color);
+void      gdk_color_free  (GdkColor       *color);
+gint      gdk_color_parse (const gchar    *spec,
+                          GdkColor       *color);
+guint     gdk_color_hash  (const GdkColor *colora);
+gboolean  gdk_color_equal (const GdkColor *colora,
+                          const GdkColor *colorb);
 
 /* The following functions are deprecated */
 void gdk_colors_store   (GdkColormap   *colormap,
                          GdkColor      *colors,
                          gint           ncolors);
 gint gdk_colors_alloc   (GdkColormap   *colormap,
-                         gint           contiguous,
+                         gboolean       contiguous,
                          gulong        *planes,
                          gint           nplanes,
                          gulong        *pixels,