From c8e0129ab4988f2fc5cb06c56ff47b38dfde143f Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Sat, 30 Mar 2013 00:46:44 +0100
Subject: Replaced calls to "pattern_new".

(bzr r11608.1.54)
---
 src/sp-gradient.cpp     | 6 +++---
 src/sp-paint-server.cpp | 8 ++++++--
 src/sp-paint-server.h   | 2 +-
 src/sp-pattern.cpp      | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index f33d67e3f..2faf165f0 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -1590,7 +1590,7 @@ static void sp_lineargradient_class_init(SPLinearGradientClass *klass)
     sp_object_class->set = sp_lineargradient_set;
     sp_object_class->write = sp_lineargradient_write;
 
-    ps_class->pattern_new = sp_lineargradient_create_pattern;
+    //ps_class->pattern_new = sp_lineargradient_create_pattern;
 }
 
 CLinearGradient::CLinearGradient(SPLinearGradient* lineargradient) : CGradient(lineargradient) {
@@ -1780,7 +1780,7 @@ static void sp_radialgradient_class_init(SPRadialGradientClass *klass)
     sp_object_class->set = sp_radialgradient_set;
     sp_object_class->write = sp_radialgradient_write;
 
-    ps_class->pattern_new = sp_radialgradient_create_pattern;
+    //ps_class->pattern_new = sp_radialgradient_create_pattern;
 }
 
 CRadialGradient::CRadialGradient(SPRadialGradient* radialgradient) : CGradient(radialgradient) {
@@ -1996,7 +1996,7 @@ static void sp_meshgradient_class_init(SPMeshGradientClass *klass)
     sp_object_class->set = sp_meshgradient_set;
     sp_object_class->write = sp_meshgradient_write;
 
-    ps_class->pattern_new = sp_meshgradient_create_pattern;
+    //ps_class->pattern_new = sp_meshgradient_create_pattern;
 }
 
 CMeshGradient::CMeshGradient(SPMeshGradient* meshgradient) : CGradient(meshgradient) {
diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index 6df8719df..d9e224167 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -59,7 +59,7 @@ GType SPPaintServer::get_type(void)
 
 static void sp_paint_server_class_init(SPPaintServerClass *psc)
 {
-    psc->pattern_new = sp_paint_server_create_dummy_pattern;
+    //psc->pattern_new = sp_paint_server_create_dummy_pattern;
 
     parent_class = static_cast<SPObjectClass *>(g_type_class_ref(SP_TYPE_OBJECT));
 }
@@ -94,7 +94,11 @@ cairo_pattern_t *sp_paint_server_invoke_create_pattern(SPPaintServer *ps,
 
 // CPPIFY: make pure virtual
 cairo_pattern_t* CPaintServer::onCreatePattern(cairo_t *ct, Geom::OptRect const &bbox, double opacity) {
-	throw;
+	//throw;
+
+	// dummy_pattern
+	cairo_pattern_t *cp = cairo_pattern_create_rgb(1.0, 0.0, 1.0);
+	return cp;
 }
 
 cairo_pattern_t *sp_paint_server_create_pattern(SPPaintServer *ps,
diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h
index ca5058b43..41d24970d 100644
--- a/src/sp-paint-server.h
+++ b/src/sp-paint-server.h
@@ -48,7 +48,7 @@ private:
 struct SPPaintServerClass {
     SPObjectClass sp_object_class;
     /** Get SPPaint instance. */
-    cairo_pattern_t *(*pattern_new)(SPPaintServer *ps, cairo_t *ct, Geom::OptRect const &bbox, double opacity);
+    //cairo_pattern_t *(*pattern_new)(SPPaintServer *ps, cairo_t *ct, Geom::OptRect const &bbox, double opacity);
 };
 
 
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 729a68dfc..0c82c9bb8 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -98,7 +98,7 @@ sp_pattern_class_init (SPPatternClass *klass)
 
 	// do we need _write? seems to work without it
 
-    ps_class->pattern_new = sp_pattern_create_pattern;
+    //ps_class->pattern_new = sp_pattern_create_pattern;
 }
 
 CPattern::CPattern(SPPattern* pattern) : CPaintServer(pattern) {
-- 
cgit v1.2.3