X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fgradient-drag.h;h=8cbe9f3052f51e7e58f96211149f1f81e1631e70;hb=a2000ef431355d36b8d856b79add9c2fa7550e02;hp=974bba4deb1411dcd092753ec8710d510b4a7b7d;hpb=6c3e745a94ef6b25a4ef9f018d350a7535aa45af;p=inkscape.git

diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 974bba4de..8cbe9f305 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -2,7 +2,7 @@
 #define __GRADIENT_DRAG_H__
 
 /*
- * On-canvas gradient dragging 
+ * On-canvas gradient dragging
  *
  * Authors:
  *   bulia byak <bulia@users.sf.net>
@@ -78,7 +78,7 @@ struct GrDragger {
 
     void updateKnotShape();
     void updateTip();
-    
+
     void select();
     void deselect();
     bool isSelected();
@@ -124,16 +124,16 @@ public: // FIXME: make more of this private!
     void selectByCoords(std::vector<Geom::Point> coords);
     void selectRect(Geom::Rect const &r);
 
-    bool dropColor(SPItem *item, gchar *c, Geom::Point p);
+    bool dropColor(SPItem *item, gchar const *c, Geom::Point p);
 
     SPStop *addStopNearPoint (SPItem *item, Geom::Point mouse_p, double tolerance);
 
     void deleteSelected (bool just_one = false);
 
     guint32 getColor();
-    
-    bool keep_selection;    
-    
+
+    bool keep_selection;
+
     GrDragger *getDraggerFor (SPItem *item, gint point_type, gint point_i, bool fill_or_stroke);
 
     void grabKnot (GrDragger *dragger, gint x, gint y, guint32 etime);
@@ -154,6 +154,8 @@ public: // FIXME: make more of this private!
     void updateLines ();
     void updateLevels ();
 
+    bool mouseOver();
+
     void selected_move_nowrite (double x, double y, bool scale_radial);
     void selected_move (double x, double y, bool write_repr = true, bool scale_radial = false);
     void selected_move_screen (double x, double y);
@@ -163,7 +165,7 @@ public: // FIXME: make more of this private!
 
     void selected_reverse_vector ();
 
-private: 
+private:
     void deselect_all();
 
     void addLine (SPItem *item, Geom::Point p1, Geom::Point p2, guint32 rgba);
@@ -173,6 +175,10 @@ private:
     void addDraggersRadial (SPRadialGradient *rg, SPItem *item, bool fill_or_stroke);
     void addDraggersLinear (SPLinearGradient *lg, SPItem *item, bool fill_or_stroke);
 
+    bool styleSet( const SPCSSAttr *css );
+
+    Glib::ustring makeStopSafeColor( gchar const *str, bool &isNull );
+
     Inkscape::Selection *selection;
     sigc::connection sel_changed_connection;
     sigc::connection sel_modified_connection;