12 files changed, 13 insertions, 2 deletions

diff --git a/src/drv/cd0emf.c b/src/drv/cd0emf.c
index 7e05134..920d7ee 100644
--- a/src/drv/cd0emf.c
+++ b/src/drv/cd0emf.c
@@ -14,7 +14,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/drv/cd0prn.c b/src/drv/cd0prn.c
index fa313d8..0293bb4 100644
--- a/src/drv/cd0prn.c
+++ b/src/drv/cd0prn.c
@@ -15,7 +15,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/drv/cdcgm.c b/src/drv/cdcgm.c
index 28624d0..17a1239 100644
--- a/src/drv/cdcgm.c
+++ b/src/drv/cdcgm.c
@@ -1136,6 +1136,7 @@ static cdContext cdCGMContext =
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | 
                  CD_CAP_TEXTORIENTATION | CD_CAP_PATH | CD_CAP_BEZIER),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   cdplayCGM,
diff --git a/src/drv/cddebug.c b/src/drv/cddebug.c
index bd91209..3550fc6 100644
--- a/src/drv/cddebug.c
+++ b/src/drv/cddebug.c
@@ -821,6 +821,7 @@ static cdContext cdDebugContext =
 {
   CD_CAP_ALL,
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/drv/cddgn.c b/src/drv/cddgn.c
index e0c497b..505526a 100644
--- a/src/drv/cddgn.c
+++ b/src/drv/cddgn.c
@@ -1688,6 +1688,7 @@ static cdContext cdDGNContext =
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB | 
                  CD_CAP_FPRIMTIVES  | CD_CAP_TEXTORIENTATION),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/drv/cddxf.c b/src/drv/cddxf.c
index c5d0df5..bdb77a4 100644
--- a/src/drv/cddxf.c
+++ b/src/drv/cddxf.c
@@ -1364,6 +1364,7 @@ static cdContext cdDXFContext =
                  CD_CAP_HATCH | CD_CAP_STIPPLE | CD_CAP_PATTERN |
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/drv/cdgl.c b/src/drv/cdgl.c
index fb1739d..120e4bc 100644
--- a/src/drv/cdgl.c
+++ b/src/drv/cdgl.c
@@ -1548,6 +1548,7 @@ static cdContext cdGLContext =
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_PALETTE | CD_CAP_LINEJOIN | CD_CAP_LINECAP |
                  CD_CAP_REGION | CD_CAP_STIPPLE | CD_CAP_PATTERN),
   0,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,              
diff --git a/src/drv/cdirgb.c b/src/drv/cdirgb.c
index fa45f97..5b72dc6 100644
--- a/src/drv/cdirgb.c
+++ b/src/drv/cdirgb.c
@@ -1879,6 +1879,7 @@ static cdContext cdImageRGBContext =
                  CD_CAP_LINECAP | CD_CAP_LINEJOIN | 
                  CD_CAP_PALETTE ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvas,
   cdinittable,
   NULL,
@@ -1975,6 +1976,7 @@ static cdContext cdDBufferRGBContext =
                  CD_CAP_LINECAP | CD_CAP_LINEJOIN | 
                  CD_CAP_PALETTE ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvasDB,  
   cdinittableDB,
   NULL,             
diff --git a/src/drv/cdmf.c b/src/drv/cdmf.c
index ddb109c..ecbdf8c 100644
--- a/src/drv/cdmf.c
+++ b/src/drv/cdmf.c
@@ -1263,6 +1263,7 @@ static cdContext cdMetafileContext =
   CD_CAP_ALL & ~(CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | 
                  CD_CAP_REGION | CD_CAP_FONTDIM | CD_CAP_TEXTSIZE),
   0,
+  CD_CTX_FILE,
   cdcreatecanvasMF,
   cdinittableMF,
   cdplay,
diff --git a/src/drv/cdpdf.c b/src/drv/cdpdf.c
index 3211cba..f7f3b36 100644
--- a/src/drv/cdpdf.c
+++ b/src/drv/cdpdf.c
@@ -1734,6 +1734,7 @@ static cdContext cdPDFContext =
                  CD_CAP_REGION | CD_CAP_IMAGESRV | CD_CAP_TEXTSIZE | 
                  CD_CAP_WRITEMODE | CD_CAP_GETIMAGERGB),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/drv/cdpicture.c b/src/drv/cdpicture.c
index 8cd586e..85bb84a 100644
--- a/src/drv/cdpicture.c
+++ b/src/drv/cdpicture.c
@@ -1397,6 +1397,7 @@ static cdContext cdPictureContext =
   CD_CAP_ALL & ~(CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | 
                  CD_CAP_REGION | CD_CAP_FONTDIM | CD_CAP_TEXTSIZE),
   0,
+  CD_CTX_DEVICE,
   cdcreatecanvas,
   cdinittable,
   cdplay,
diff --git a/src/drv/cdps.c b/src/drv/cdps.c
index 0db3590..abd7359 100644
--- a/src/drv/cdps.c
+++ b/src/drv/cdps.c
@@ -2128,6 +2128,7 @@ static cdContext cdPSContext =
                  CD_CAP_FONTDIM | CD_CAP_TEXTSIZE | 
                  CD_CAP_IMAGERGBA | CD_CAP_GETIMAGERGB),
   0,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,