Make it compile

[~andy/gtk] / gtk / gtkhsv.h

diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index ffe6ff7fc02d7c2b9a0bf47e4b0c1439a4367647..b8bdd8323a27b3c4e708c032897d27b0ce8416b0 100644 (file)
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -7,77 +7,98 @@
  *          Jonathan Blandford <jrb@redhat.com> (cleanup for GTK+)
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
-
 #ifndef __GTK_HSV_H__
 #define __GTK_HSV_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/*
+ * 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/.
+ */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtkcontainer.h>
 
-\f
+G_BEGIN_DECLS 
 
 #define GTK_TYPE_HSV            (gtk_hsv_get_type ())
-#define GTK_HSV(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
-#define GTK_HSV_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSV))
-#define GTK_IS_HSV(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_HSV))
-#define GTK_IS_HSV_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSV))
+#define GTK_HSV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
+#define GTK_HSV_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSVClass))
+#define GTK_IS_HSV(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSV))
+#define GTK_IS_HSV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSV))
+#define GTK_HSV_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSV, GtkHSVClass))
 
 
-typedef struct _GtkHSV GtkHSV;
+typedef struct _GtkHSV      GtkHSV;
 typedef struct _GtkHSVClass GtkHSVClass;
 
-struct _GtkHSV {
-       GtkWidget widget;
-
-       /* Private data */
-       gpointer priv;
+struct _GtkHSV
+{
+  GtkWidget parent_instance;
+  
+  /* Private data */
+  gpointer priv;
 };
 
-struct _GtkHSVClass {
-       GtkWidgetClass parent_class;
-
-       /* Notification signals */
-
-       void (* changed) (GtkHSV *hsv);
+struct _GtkHSVClass
+{
+  GtkWidgetClass parent_class;
+  
+  /* Notification signals */
+  
+  void (*changed) (GtkHSV *hsv);
+
+  /* Keybindings */
+  void (* move) (GtkHSV          *hsv,
+                 GtkDirectionType type);
 };
 
 
-GtkType gtk_hsv_get_type (void);
-
-GtkWidget *gtk_hsv_new (void);
-
-void gtk_hsv_set_color (GtkHSV *hsv, double h, double s, double v);
-void gtk_hsv_get_color (GtkHSV *hsv, double *h, double *s, double *v);
-
-void gtk_hsv_set_metrics (GtkHSV *hsv, int size, int ring_width);
-void gtk_hsv_get_metrics (GtkHSV *hsv, int *size, int *ring_width);
-
-gboolean gtk_hsv_is_adjusting (GtkHSV *hsv);
-
-void gtk_hsv_to_rgb (double h, double s, double v, double *r, double *g, double *b);
-void gtk_rgb_to_hsv (double r, double g, double b, double *h, double *s, double *v);
-
-\f
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+GType      gtk_hsv_get_type     (void) G_GNUC_CONST;
+GtkWidget* gtk_hsv_new          (void);
+void       gtk_hsv_set_color    (GtkHSV    *hsv,
+                                double     h,
+                                double     s,
+                                double     v);
+void       gtk_hsv_get_color    (GtkHSV    *hsv,
+                                gdouble   *h,
+                                gdouble   *s,
+                                gdouble   *v);
+void       gtk_hsv_set_metrics  (GtkHSV    *hsv,
+                                gint       size,
+                                gint       ring_width);
+void       gtk_hsv_get_metrics  (GtkHSV    *hsv,
+                                gint      *size,
+                                gint      *ring_width);
+gboolean   gtk_hsv_is_adjusting (GtkHSV    *hsv);
+void       gtk_hsv_to_rgb       (gdouble    h,
+                                gdouble    s,
+                                gdouble    v,
+                                gdouble   *r,
+                                gdouble   *g,
+                                gdouble   *b);
+void       gtk_rgb_to_hsv       (gdouble    r,
+                                gdouble    g,
+                                gdouble    b,
+                                gdouble   *h,
+                                gdouble   *s,
+                                gdouble   *v);
+
+
+G_END_DECLS
+
+#endif /* __GTK_HSV_H__ */