Remove custom color wheel widget in favor of the (relatively) recent GtkHSV. Fixes...

[inkscape.git] / src / widgets / sp-color-wheel-selector.h

diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index de358d5aca38dd6fee1e7accb4882e01e921771b..34a5f4cd0c29dcef78e541638bd35545c3160c63 100644 (file)
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -1,21 +1,20 @@
-#ifndef __SP_COLOR_WHEEL_SELECTOR_H__
-#define __SP_COLOR_WHEEL_SELECTOR_H__
+#ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
+#define SEEN_SP_COLOR_WHEEL_SELECTOR_H
 
 #include <glib/gtypes.h>
 #include <gtk/gtktooltips.h>
 #include <gtk/gtkvbox.h>
 
 #include "../color.h"
-#include "sp-color-wheel.h"
 #include "sp-color-slider.h"
 #include "sp-color-selector.h"
 
 
 
+typedef struct _GtkHSV GtkHSV;
 struct SPColorWheelSelector;
 struct SPColorWheelSelectorClass;
 
-
 class ColorWheelSelector: public ColorSelector
 {
 public:
@@ -25,14 +24,14 @@ public:
     virtual void init();
 
 protected:
-    virtual void _colorChanged( const SPColor& color, gfloat alpha );
+    virtual void _colorChanged();
 
     static void _adjustmentChanged ( GtkAdjustment *adjustment, SPColorWheelSelector *cs );
 
     static void _sliderGrabbed( SPColorSlider *slider, SPColorWheelSelector *cs );
     static void _sliderReleased( SPColorSlider *slider, SPColorWheelSelector *cs );
     static void _sliderChanged( SPColorSlider *slider, SPColorWheelSelector *cs );
-    static void _wheelChanged( SPColorWheel* wheel, SPColorWheelSelector *cs );
+    static void _wheelChanged( GtkHSV *hsv, SPColorWheelSelector *cs );
 
     static void _fooChanged( GtkWidget foo, SPColorWheelSelector *cs );
 
@@ -76,7 +75,7 @@ GtkWidget *sp_color_wheel_selector_new (void);
 
 
 
-#endif
+#endif // SEEN_SP_COLOR_WHEEL_SELECTOR_H
 
 /*
   Local Variables:
@@ -87,4 +86,4 @@ GtkWidget *sp_color_wheel_selector_new (void);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :