Make it compile

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

diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index 396821bed3d475d22dac8712a720fdb85b3c4dd7..b8bdd8323a27b3c4e708c032897d27b0ce8416b0 100644 (file)
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -7,16 +7,16 @@
  *          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.
@@ -31,20 +31,16 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gtk/gtkwidget.h>
-
+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_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HSV, GtkHSVClass))
+#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;
@@ -65,10 +61,14 @@ struct _GtkHSVClass
   /* Notification signals */
   
   void (*changed) (GtkHSV *hsv);
+
+  /* Keybindings */
+  void (* move) (GtkHSV          *hsv,
+                 GtkDirectionType type);
 };
 
 
-GtkType    gtk_hsv_get_type     (void);
+GType      gtk_hsv_get_type     (void) G_GNUC_CONST;
 GtkWidget* gtk_hsv_new          (void);
 void       gtk_hsv_set_color    (GtkHSV    *hsv,
                                 double     h,
@@ -99,8 +99,6 @@ void       gtk_rgb_to_hsv       (gdouble    r,
                                 gdouble   *v);
 
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __GTK_HSV_H__ */