From 064e6b53faec08a67075dd0f97303f5365d4e79b Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Mon, 25 Apr 2011 18:26:50 +0000
Subject: *** empty log message ***

---
 src/gdiplus/cdwclpp.cpp    | 3 +--
 src/gdiplus/cdwdbufp.cpp   | 3 +--
 src/gdiplus/cdwemfp.cpp    | 3 +--
 src/gdiplus/cdwgdiplus.c   | 2 +-
 src/gdiplus/cdwimgp.cpp    | 3 +--
 src/gdiplus/cdwnativep.cpp | 3 +--
 src/gdiplus/cdwprnp.cpp    | 3 +--
 7 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/gdiplus')

diff --git a/src/gdiplus/cdwclpp.cpp b/src/gdiplus/cdwclpp.cpp
index 9fa2c4c..666f8b1 100644
--- a/src/gdiplus/cdwclpp.cpp
+++ b/src/gdiplus/cdwclpp.cpp
@@ -188,8 +188,7 @@ static cdContext cdClipboardContext =
 {
   CD_CAP_ALL & ~(CD_CAP_CLEAR | CD_CAP_FLUSH | CD_CAP_YAXIS | CD_CAP_PLAY |
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV ),
-  1,
-  CD_CTX_DEVICE,
+  CD_CTX_DEVICE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,          
diff --git a/src/gdiplus/cdwdbufp.cpp b/src/gdiplus/cdwdbufp.cpp
index df81265..cfa0319 100644
--- a/src/gdiplus/cdwdbufp.cpp
+++ b/src/gdiplus/cdwdbufp.cpp
@@ -148,8 +148,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdDBufferContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS ),
-  1,
-  CD_CTX_IMAGE,
+  CD_CTX_IMAGE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/gdiplus/cdwemfp.cpp b/src/gdiplus/cdwemfp.cpp
index b19f4cb..9bf9ec0 100644
--- a/src/gdiplus/cdwemfp.cpp
+++ b/src/gdiplus/cdwemfp.cpp
@@ -87,8 +87,7 @@ static cdContext cdEMFContext =
 {
   CD_CAP_ALL & ~(CD_CAP_CLEAR | CD_CAP_PLAY | CD_CAP_FLUSH | CD_CAP_YAXIS | 
                  CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV),
-  1,
-  CD_CTX_FILE,
+  CD_CTX_FILE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,          
diff --git a/src/gdiplus/cdwgdiplus.c b/src/gdiplus/cdwgdiplus.c
index 4997d3c..8a45239 100644
--- a/src/gdiplus/cdwgdiplus.c
+++ b/src/gdiplus/cdwgdiplus.c
@@ -25,7 +25,7 @@ void cdInitGdiPlus(void)
 
 void cdInitContextPlus(void)
 {
-  cdContext* ctx_list[NUM_CONTEXTPLUS];
+  cdContext* ctx_list[CD_CTXPLUS_COUNT];
   memset(ctx_list, 0, sizeof(ctx_list));
 
   ctx_list[CD_CTXPLUS_NATIVEWINDOW] = cdContextNativeWindowPlus();
diff --git a/src/gdiplus/cdwimgp.cpp b/src/gdiplus/cdwimgp.cpp
index 9b45edb..f04f91c 100644
--- a/src/gdiplus/cdwimgp.cpp
+++ b/src/gdiplus/cdwimgp.cpp
@@ -49,8 +49,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdImageContext =
 {
   CD_CAP_ALL & ~(CD_CAP_FLUSH | CD_CAP_PLAY | CD_CAP_YAXIS ),
-  1,
-  CD_CTX_IMAGE,
+  CD_CTX_IMAGE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/gdiplus/cdwnativep.cpp b/src/gdiplus/cdwnativep.cpp
index 4fdc19a..47979a0 100644
--- a/src/gdiplus/cdwnativep.cpp
+++ b/src/gdiplus/cdwnativep.cpp
@@ -122,8 +122,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdNativeContext =
 {
   CD_CAP_ALL & ~(CD_CAP_FLUSH | CD_CAP_PLAY | CD_CAP_YAXIS ),
-  1,
-  CD_CTX_WINDOW,
+  CD_CTX_WINDOW|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,              
diff --git a/src/gdiplus/cdwprnp.cpp b/src/gdiplus/cdwprnp.cpp
index df62ca5..4d32249 100644
--- a/src/gdiplus/cdwprnp.cpp
+++ b/src/gdiplus/cdwprnp.cpp
@@ -141,8 +141,7 @@ static cdContext cdPrinterContext =
 {
   CD_CAP_ALL & ~(CD_CAP_CLEAR | CD_CAP_PLAY | CD_CAP_YAXIS | 
                  CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV),
-  1,
-  CD_CTX_DEVICE,
+  CD_CTX_DEVICE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
-- 
cgit v1.2.3