New: functions cdContextIsPlus and cdContextType.

7 files changed, 12 insertions, 6 deletions

diff --git a/src/gdiplus/cdwclpp.cpp b/src/gdiplus/cdwclpp.cpp
index 2d1c7e6..9fa2c4c 100644
--- a/src/gdiplus/cdwclpp.cpp
+++ b/src/gdiplus/cdwclpp.cpp
@@ -189,6 +189,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,
   cdcreatecanvas,  
   cdinittable,
   NULL,          
diff --git a/src/gdiplus/cdwdbufp.cpp b/src/gdiplus/cdwdbufp.cpp
index 68bc7b8..df81265 100644
--- a/src/gdiplus/cdwdbufp.cpp
+++ b/src/gdiplus/cdwdbufp.cpp
@@ -149,6 +149,7 @@ static cdContext cdDBufferContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS ),
   1,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/gdiplus/cdwemfp.cpp b/src/gdiplus/cdwemfp.cpp
index 23ae02d..b19f4cb 100644
--- a/src/gdiplus/cdwemfp.cpp
+++ b/src/gdiplus/cdwemfp.cpp
@@ -88,6 +88,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,
   cdcreatecanvas,  
   cdinittable,
   NULL,          
diff --git a/src/gdiplus/cdwgdiplus.c b/src/gdiplus/cdwgdiplus.c
index a6862bc..4997d3c 100644
--- a/src/gdiplus/cdwgdiplus.c
+++ b/src/gdiplus/cdwgdiplus.c
@@ -28,12 +28,12 @@ void cdInitContextPlus(void)
   cdContext* ctx_list[NUM_CONTEXTPLUS];
   memset(ctx_list, 0, sizeof(ctx_list));
 
-  ctx_list[CD_CTX_NATIVEWINDOW] = cdContextNativeWindowPlus();
-  ctx_list[CD_CTX_IMAGE] = cdContextImagePlus();
-  ctx_list[CD_CTX_DBUFFER] = cdContextDBufferPlus();
-  ctx_list[CD_CTX_PRINTER] = cdContextPrinterPlus();
-  ctx_list[CD_CTX_EMF] = cdContextEMFPlus();
-  ctx_list[CD_CTX_CLIPBOARD] = cdContextClipboardPlus();
+  ctx_list[CD_CTXPLUS_NATIVEWINDOW] = cdContextNativeWindowPlus();
+  ctx_list[CD_CTXPLUS_IMAGE] = cdContextImagePlus();
+  ctx_list[CD_CTXPLUS_DBUFFER] = cdContextDBufferPlus();
+  ctx_list[CD_CTXPLUS_PRINTER] = cdContextPrinterPlus();
+  ctx_list[CD_CTXPLUS_EMF] = cdContextEMFPlus();
+  ctx_list[CD_CTXPLUS_CLIPBOARD] = cdContextClipboardPlus();
 
   cdInitContextPlusList(ctx_list);
 
diff --git a/src/gdiplus/cdwimgp.cpp b/src/gdiplus/cdwimgp.cpp
index 5dd8b96..9b45edb 100644
--- a/src/gdiplus/cdwimgp.cpp
+++ b/src/gdiplus/cdwimgp.cpp
@@ -50,6 +50,7 @@ static cdContext cdImageContext =
 {
   CD_CAP_ALL & ~(CD_CAP_FLUSH | CD_CAP_PLAY | CD_CAP_YAXIS ),
   1,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/gdiplus/cdwnativep.cpp b/src/gdiplus/cdwnativep.cpp
index 80209af..4fdc19a 100644
--- a/src/gdiplus/cdwnativep.cpp
+++ b/src/gdiplus/cdwnativep.cpp
@@ -123,6 +123,7 @@ static cdContext cdNativeContext =
 {
   CD_CAP_ALL & ~(CD_CAP_FLUSH | CD_CAP_PLAY | CD_CAP_YAXIS ),
   1,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,              
diff --git a/src/gdiplus/cdwprnp.cpp b/src/gdiplus/cdwprnp.cpp
index 2eed9d9..df62ca5 100644
--- a/src/gdiplus/cdwprnp.cpp
+++ b/src/gdiplus/cdwprnp.cpp
@@ -142,6 +142,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,
   cdcreatecanvas,  
   cdinittable,
   NULL,