Make beeps work again

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

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index e21837fad05d5252d2f17a19f0d1ef7abe627659..ff0460504fba14957215f4875128af0b7693d798 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -1,12 +1,40 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_GC_H__
 #define __GDK_GC_H__
 
 #include <gdk/gdkcolor.h>
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkGCValues          GdkGCValues;
 typedef struct _GdkGCClass           GdkGCClass;
@@ -183,6 +211,12 @@ struct _GdkGCClass
                          gint            dash_offset,
                          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);
 };
 
 
@@ -203,9 +237,9 @@ 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);
@@ -227,9 +261,9 @@ void   gdk_gc_set_clip_origin         (GdkGC            *gc,
 void   gdk_gc_set_clip_mask      (GdkGC            *gc,
                                   GdkBitmap        *mask);
 void   gdk_gc_set_clip_rectangle  (GdkGC           *gc,
-                                  GdkRectangle     *rectangle);
+                                  const GdkRectangle *rectangle);
 void   gdk_gc_set_clip_region    (GdkGC            *gc,
-                                  GdkRegion        *region);
+                                  const GdkRegion  *region);
 void   gdk_gc_set_subwindow      (GdkGC            *gc,
                                   GdkSubwindowMode  mode);
 void   gdk_gc_set_exposures      (GdkGC            *gc,
@@ -250,20 +284,19 @@ 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,
-                                     GdkColor    *color);
-void         gdk_gc_set_rgb_bg_color (GdkGC       *gc,
-                                     GdkColor    *color);
+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
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DRAWABLE_H__ */