noop: dialogs/rdf.cpp: Mark a few pointers as not being written through. Make rdf_ma...

[inkscape.git] / src / dialogs / swatches.h

diff --git a/src/dialogs/swatches.h b/src/dialogs/swatches.h
index b6f28f18201be089257b122264f72d92ee867d3a..02861781f8e2746aecca0e8f9698713fdc534109 100644 (file)
--- a/src/dialogs/swatches.h
+++ b/src/dialogs/swatches.h
@@ -43,7 +43,7 @@ public:
     virtual ColorItem &operator=(ColorItem const &other);
     virtual Gtk::Widget* getPreview(PreviewStyle style,
                                     ViewType view,
-                                    Gtk::BuiltinIconSize size);
+                                    Inkscape::IconSize size);
     void buttonClicked(bool secondary = false);
 
     ColorDef def;
@@ -57,6 +57,13 @@ private:
                              guint event_time,
                              gpointer user_data);
 
+    static void _dragGetColorData( GtkWidget *widget,
+                                   GdkDragContext *drag_context,
+                                   GtkSelectionData *data,
+                                   guint info,
+                                   guint time,
+                                   gpointer user_data);
+
     static void _wireMagicColors( void* p );
     static void _colorDefChanged(void* data);
 
@@ -66,6 +73,7 @@ private:
     Gtk::Tooltips tips;
     std::vector<Gtk::Widget*> _previews;
 
+    bool _isLive;
     bool _linkIsTone;
     int _linkPercent;
     int _linkGray;
@@ -81,7 +89,7 @@ private:
 class SwatchesPanel : public Inkscape::UI::Widget::Panel
 {
 public:
-    SwatchesPanel();
+    SwatchesPanel(gchar const* prefsPath = "dialogs.swatches");
     virtual ~SwatchesPanel();
 
     static SwatchesPanel& getInstance();