Set current cursor also when changing the cursor of a window that is the

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

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 072ddfe74e49303966ff838655b8d8b713d34d91..c17033e1b51fbe19c0db25649a0ef121967d2441 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -73,6 +73,7 @@ typedef enum
   GDK_COPY_INVERT,
   GDK_OR_INVERT,
   GDK_NAND,
+  GDK_NOR,
   GDK_SET
 } GdkFunction;
 
@@ -150,14 +151,29 @@ struct _GdkGCValues
   GdkJoinStyle     join_style;
 };
 
+#define GDK_TYPE_GC              (gdk_gc_get_type ())
+#define GDK_GC(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC, GdkGC))
+#define GDK_GC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC, GdkGCClass))
+#define GDK_IS_GC(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC))
+#define GDK_IS_GC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GC))
+#define GDK_GC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GC, GdkGCClass))
+
 struct _GdkGC
 {
-  gint dummy_var;
+  GObject parent_instance;
+
+  gint clip_x_origin;
+  gint clip_y_origin;
+  gint ts_x_origin;
+  gint ts_y_origin;
+
+  GdkColormap *colormap;
 };
 
 struct _GdkGCClass 
 {
-  void (*destroy)        (GdkGC          *gc);
+  GObjectClass parent_class;
+  
   void (*get_values)     (GdkGC          *gc,
                          GdkGCValues    *values);
   void (*set_values)     (GdkGC          *gc,
@@ -165,29 +181,41 @@ struct _GdkGCClass
                          GdkGCValuesMask mask);
   void (*set_dashes)     (GdkGC          *gc,
                          gint            dash_offset,
-                         gchar           dash_list[],
+                         gint8           dash_list[],
                          gint            n);
+  
+  /* Padding for future expansion */
+  void         (*_gdk_reserved1)  (void);
+  void         (*_gdk_reserved2)  (void);
+  void         (*_gdk_reserved3)  (void);
+  void         (*_gdk_reserved4)  (void);
 };
 
 
+GType  gdk_gc_get_type            (void) G_GNUC_CONST;
 GdkGC *gdk_gc_new                (GdkDrawable      *drawable);
-GdkGC *gdk_gc_alloc              (void);
-
 GdkGC *gdk_gc_new_with_values    (GdkDrawable      *drawable,
                                   GdkGCValues      *values,
                                   GdkGCValuesMask   values_mask);
-void   gdk_gc_init                (GdkGC            *gc,
-                                  GdkGCClass       *klass);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkGC *gdk_gc_ref                (GdkGC            *gc);
 void   gdk_gc_unref              (GdkGC            *gc);
+#endif
+
 void   gdk_gc_get_values         (GdkGC            *gc,
                                   GdkGCValues      *values);
+void   gdk_gc_set_values          (GdkGC           *gc,
+                                   GdkGCValues    *values,
+                                   GdkGCValuesMask  values_mask);
 void   gdk_gc_set_foreground     (GdkGC            *gc,
-                                  GdkColor         *color);
+                                  const GdkColor   *color);
 void   gdk_gc_set_background     (GdkGC            *gc,
-                                  GdkColor         *color);
+                                  const GdkColor   *color);
+#ifndef GDK_DISABLE_DEPRECATED
 void   gdk_gc_set_font           (GdkGC            *gc,
                                   GdkFont          *font);
+#endif /* GDK_DISABLE_DEPRECATED */
 void   gdk_gc_set_function       (GdkGC            *gc,
                                   GdkFunction       function);
 void   gdk_gc_set_fill           (GdkGC            *gc,
@@ -221,8 +249,25 @@ void   gdk_gc_set_dashes          (GdkGC            *gc,
                                   gint              dash_offset,
                                   gint8             dash_list[],
                                   gint              n);
-void   gdk_gc_copy               (GdkGC             *dst_gc,
-                                  GdkGC             *src_gc);
+void   gdk_gc_offset              (GdkGC            *gc,
+                                  gint              x_offset,
+                                  gint              y_offset);
+void   gdk_gc_copy               (GdkGC            *dst_gc,
+                                  GdkGC            *src_gc);
+
+
+void         gdk_gc_set_colormap     (GdkGC          *gc,
+                                     GdkColormap    *colormap);
+GdkColormap *gdk_gc_get_colormap     (GdkGC          *gc);
+void         gdk_gc_set_rgb_fg_color (GdkGC          *gc,
+                                     const GdkColor *color);
+void         gdk_gc_set_rgb_bg_color (GdkGC          *gc,
+                                     const GdkColor *color);
+GdkScreen *  gdk_gc_get_screen      (GdkGC          *gc);
+
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_gc_destroy                 gdk_gc_unref
+#endif /* GDK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus
 }