Completely remove NRPixBlock

(bzr r9508.1.67)

5 files changed, 5 insertions, 273 deletions

diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 313e27528..968bbf073 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -42,8 +42,6 @@ ink_common_sources +=	\
 	widgets/sp-color-icc-selector.h	\
 	widgets/sp-color-notebook.cpp	\
 	widgets/sp-color-notebook.h	\
-	widgets/sp-color-preview.cpp	\
-	widgets/sp-color-preview.h	\
 	widgets/sp-color-scales.cpp	\
 	widgets/sp-color-scales.h	\
 	widgets/sp-color-selector.cpp	\
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index c4b7216c6..ef05ad381 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -12,7 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <libnr/nr-pixblock-pattern.h>
 #include "macros.h"
 #include "display/cairo-utils.h"
 #include "gradient-image.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 7f0256665..f37158eec 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -420,7 +420,7 @@ void SPGradientVectorSelector::setSwatched()
   ##################################################################*/
 
 #include "../widgets/sp-color-notebook.h"
-#include "../widgets/sp-color-preview.h"
+#include "ui/widget/color-preview.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
 #include "../svg/svg-color.h"
@@ -558,7 +558,8 @@ static void update_stop_list( GtkWidget *mnu, SPGradient *gradient, SPStop *new_
                 gtk_widget_show(i);
                 g_object_set_data(G_OBJECT(i), "stop", stop);
                 GtkWidget *hb = gtk_hbox_new(FALSE, 4);
-                GtkWidget *cpv = sp_color_preview_new(sp_stop_get_rgba32(stop));
+                GtkWidget *cpv = GTK_WIDGET(Gtk::manage(
+                    new Inkscape::UI::Widget::ColorPreview(sp_stop_get_rgba32(stop)))->gobj());
                 gtk_widget_show(cpv);
                 gtk_container_add( GTK_CONTAINER(hb), cpv );
                 g_object_set_data( G_OBJECT(i), "preview", cpv );
@@ -1190,8 +1191,8 @@ static void sp_gradient_vector_color_changed(SPColorSelector *csel, GtkObject *o
 
     blocked = FALSE;
 
-    SPColorPreview *cpv = static_cast<SPColorPreview *>(g_object_get_data(G_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(mnu)))), "preview"));
-    sp_color_preview_set_rgba32(cpv, sp_stop_get_rgba32(stop));
+    Inkscape::UI::Widget::ColorPreview *cpv = static_cast<Inkscape::UI::Widget::ColorPreview *>(g_object_get_data(G_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(mnu)))), "preview"));
+    cpv->setRgba32(sp_stop_get_rgba32(stop));
 }
 
 /*
diff --git a/src/widgets/sp-color-preview.cpp b/src/widgets/sp-color-preview.cpp
deleted file mode 100644
index ddeb5d123..000000000
--- a/src/widgets/sp-color-preview.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * A simple color preview widget
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 2001-2002 Lauris Kaplinski
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include "../display/nr-plain-stuff-gdk.h"
-#include "sp-color-preview.h"
-
-#define SPCP_DEFAULT_WIDTH 32
-#define SPCP_DEFAULT_HEIGHT 11
-
-static void sp_color_preview_class_init (SPColorPreviewClass *klass);
-static void sp_color_preview_init (SPColorPreview *image);
-static void sp_color_preview_destroy (GtkObject *object);
-
-static void sp_color_preview_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void sp_color_preview_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gint sp_color_preview_expose (GtkWidget *widget, GdkEventExpose *event);
-
-static void sp_color_preview_paint (SPColorPreview *cp, GdkRectangle *area);
-
-static GtkWidgetClass *parent_class;
-
-GType sp_color_preview_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        static const GTypeInfo info = {
-            sizeof(SPColorPreviewClass),
-            NULL, /* base_init */
-            NULL, /* base_finalize */
-            (GClassInitFunc) sp_color_preview_class_init,
-            NULL, /* class_finalize */
-            NULL, /* class_data */
-            sizeof(SPColorPreview),
-            0,    /* n_preallocs */
-            (GInstanceInitFunc) sp_color_preview_init,
-            0,    /* value_table */
-        };
-
-        type = g_type_register_static( GTK_TYPE_WIDGET,
-                                       "SPColorPreview",
-                                       &info,
-                                       static_cast< GTypeFlags > (0) );
-    }
-    return type;
-}
-
-static void
-sp_color_preview_class_init (SPColorPreviewClass *klass)
-{
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = (GtkObjectClass *) klass;
-    widget_class = (GtkWidgetClass *) klass;
-
-    parent_class = (GtkWidgetClass*)gtk_type_class (GTK_TYPE_WIDGET);
-
-    object_class->destroy = sp_color_preview_destroy;
-
-    widget_class->size_request = sp_color_preview_size_request;
-    widget_class->size_allocate = sp_color_preview_size_allocate;
-    widget_class->expose_event = sp_color_preview_expose;
-}
-
-static void
-sp_color_preview_init (SPColorPreview *image)
-{
-    GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW);
-
-    image->rgba = 0xffffffff;
-}
-
-static void
-sp_color_preview_destroy (GtkObject *object)
-{
-    SPColorPreview *image;
-
-    image = SP_COLOR_PREVIEW (object);
-
-    if (((GtkObjectClass *) (parent_class))->destroy)
-        (* ((GtkObjectClass *) (parent_class))->destroy) (object);
-}
-
-static void
-sp_color_preview_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-    SPColorPreview *slider;
-
-    slider = SP_COLOR_PREVIEW (widget);
-
-    requisition->width = SPCP_DEFAULT_WIDTH;
-    requisition->height = SPCP_DEFAULT_HEIGHT;
-}
-
-static void
-sp_color_preview_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-    SPColorPreview *image;
-
-    image = SP_COLOR_PREVIEW (widget);
-
-    widget->allocation = *allocation;
-
-    if (GTK_WIDGET_DRAWABLE (image)) {
-        gtk_widget_queue_draw (GTK_WIDGET (image));
-    }
-}
-
-static gint
-sp_color_preview_expose (GtkWidget *widget, GdkEventExpose *event)
-{
-    SPColorPreview *cp;
-
-    cp = SP_COLOR_PREVIEW (widget);
-
-    if (GTK_WIDGET_DRAWABLE (widget)) {
-        sp_color_preview_paint (cp, &event->area);
-    }
-
-    return TRUE;
-}
-
-GtkWidget *
-sp_color_preview_new (guint32 rgba)
-{
-    SPColorPreview *image;
-
-    image = (SPColorPreview*)gtk_type_new (SP_TYPE_COLOR_PREVIEW);
-
-    sp_color_preview_set_rgba32 (image, rgba);
-
-    return (GtkWidget *) image;
-}
-
-void
-sp_color_preview_set_rgba32 (SPColorPreview *cp, guint32 rgba)
-{
-    cp->rgba = rgba;
-
-    if (GTK_WIDGET_DRAWABLE (cp)) {
-        gtk_widget_queue_draw (GTK_WIDGET (cp));
-    }
-}
-
-static void
-sp_color_preview_paint (SPColorPreview *cp, GdkRectangle *area)
-{
-    GtkWidget *widget;
-    GdkRectangle warea, carea;
-    GdkRectangle wpaint, cpaint;
-    gint w2;
-
-    widget = GTK_WIDGET (cp);
-
-    warea.x = widget->allocation.x;
-    warea.y = widget->allocation.y;
-    warea.width = widget->allocation.width;
-    warea.height = widget->allocation.height;
-
-    if (!gdk_rectangle_intersect (area, &warea, &wpaint)) return;
-
-    /* Transparent area */
-
-    w2 = warea.width / 2;
-
-    carea.x = warea.x;
-    carea.y = warea.y;
-    carea.width = w2;
-    carea.height = warea.height;
-
-    if (gdk_rectangle_intersect (area, &carea, &cpaint)) {
-        nr_gdk_draw_rgba32_solid (widget->window, widget->style->black_gc,
-                                  cpaint.x, cpaint.y,
-                                  cpaint.width, cpaint.height,
-                                  cp->rgba);
-    }
-
-    /* Solid area */
-
-    carea.x = warea.x + w2;
-    carea.y = warea.y;
-    carea.width = warea.width - w2;
-    carea.height = warea.height;
-
-    if (gdk_rectangle_intersect (area, &carea, &cpaint)) {
-        nr_gdk_draw_rgba32_solid (widget->window, widget->style->black_gc,
-                                  cpaint.x, cpaint.y,
-                                  cpaint.width, cpaint.height,
-                                  cp->rgba | 0xff);
-    }
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/widgets/sp-color-preview.h b/src/widgets/sp-color-preview.h
deleted file mode 100644
index 873e59d80..000000000
--- a/src/widgets/sp-color-preview.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef SEEN_COLOR_PREVIEW_H
-#define SEEN_COLOR_PREVIEW_H
-
-/*
- * A simple color preview widget
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 2001-2002 Lauris Kaplinski
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include <gtk/gtkwidget.h>
-
-#include <glib.h>
-
-
-
-#define SP_TYPE_COLOR_PREVIEW (sp_color_preview_get_type ())
-#define SP_COLOR_PREVIEW(o) (GTK_CHECK_CAST ((o), SP_TYPE_COLOR_PREVIEW, SPColorPreview))
-#define SP_COLOR_PREVIEW_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), SP_TYPE_COLOR_PREVIEW, SPColorPreviewClass))
-#define SP_IS_COLOR_PREVIEW(o) (GTK_CHECK_TYPE ((o), SP_TYPE_COLOR_PREVIEW))
-#define SP_IS_COLOR_PREVIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), SP_TYPE_COLOR_PREVIEW))
-
-struct SPColorPreview {
-    GtkWidget widget;
-
-    guint32 rgba;
-};
-
-struct SPColorPreviewClass {
-    GtkWidgetClass parent_class;
-};
-
-GType sp_color_preview_get_type(void);
-
-GtkWidget *sp_color_preview_new(guint32 rgba);
-
-void sp_color_preview_set_rgba32(SPColorPreview *cp, guint32 color);
-
-
-#endif // SEEN_COLOR_PREVIEW_H
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :