New: functions cdContextIsPlus and cdContextType.

7 files changed, 13 insertions, 6 deletions

diff --git a/src/win32/cdwclp.c b/src/win32/cdwclp.c
index 60c29e0..3c31569 100644
--- a/src/win32/cdwclp.c
+++ b/src/win32/cdwclp.c
@@ -531,6 +531,7 @@ static cdContext cdClipboardContext =
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | 
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_DEVICE,
   cdcreatecanvas,  
   cdinittable,
   cdplay,          
@@ -541,7 +542,7 @@ cdContext* cdContextClipboard(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_CLIPBOARD);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_CLIPBOARD);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwdbuf.c b/src/win32/cdwdbuf.c
index 9d79e9b..54dbf16 100644
--- a/src/win32/cdwdbuf.c
+++ b/src/win32/cdwdbuf.c
@@ -142,6 +142,7 @@ static cdContext cdDBufferContext =
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | 
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
@@ -152,7 +153,7 @@ cdContext* cdContextDBuffer(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_DBUFFER);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_DBUFFER);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwemf.c b/src/win32/cdwemf.c
index ad037c9..3932c36 100644
--- a/src/win32/cdwemf.c
+++ b/src/win32/cdwemf.c
@@ -98,6 +98,7 @@ static cdContext cdEMFContext =
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | 
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,  
   cdinittable,
   cdplayEMF,          
@@ -108,7 +109,7 @@ cdContext* cdContextEMF(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_EMF);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_EMF);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwimg.c b/src/win32/cdwimg.c
index 47d99f9..294a8d7 100644
--- a/src/win32/cdwimg.c
+++ b/src/win32/cdwimg.c
@@ -64,6 +64,7 @@ static cdContext cdImageContext =
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | 
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
@@ -74,7 +75,7 @@ cdContext* cdContextImage(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_IMAGE);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_IMAGE);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwnative.c b/src/win32/cdwnative.c
index 3534c6e..bd9d4dd 100644
--- a/src/win32/cdwnative.c
+++ b/src/win32/cdwnative.c
@@ -186,6 +186,7 @@ static cdContext cdNativeContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,              
@@ -196,7 +197,7 @@ cdContext* cdContextNativeWindow(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_NATIVEWINDOW);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_NATIVEWINDOW);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwprn.c b/src/win32/cdwprn.c
index 1b3e1e0..1ffcd03 100644
--- a/src/win32/cdwprn.c
+++ b/src/win32/cdwprn.c
@@ -186,6 +186,7 @@ static cdContext cdPrinterContext =
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | 
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_DEVICE,
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
@@ -196,7 +197,7 @@ cdContext* cdContextPrinter(void)
 {
   if (cdUseContextPlus(CD_QUERY))
   {
-    cdContext* ctx = cdGetContextPlus(CD_CTX_PRINTER);
+    cdContext* ctx = cdGetContextPlus(CD_CTXPLUS_PRINTER);
     if (ctx != NULL)
       return ctx;
   }
diff --git a/src/win32/cdwwmf.c b/src/win32/cdwwmf.c
index 0571c9f..26d8fa9 100644
--- a/src/win32/cdwwmf.c
+++ b/src/win32/cdwwmf.c
@@ -97,6 +97,7 @@ static cdContext cdWMFContext =
                  CD_CAP_LINECAP | CD_CAP_LINEJOIN |
                  CD_CAP_FPRIMTIVES ),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,  
   cdinittable,
   cdplayWMF,