From 64a0b5ebb41d36a7db87d24c5451f7db925e24f8 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Fri, 18 Mar 2011 22:23:38 +0000
Subject: New: functions cdContextIsPlus and cdContextType.

---
 src/x11/cdxclp.c    | 1 +
 src/x11/cdxdbuf.c   | 3 ++-
 src/x11/cdximg.c    | 3 ++-
 src/x11/cdxnative.c | 5 +++--
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/x11')

diff --git a/src/x11/cdxclp.c b/src/x11/cdxclp.c
index 9363491..ed3b0db 100644
--- a/src/x11/cdxclp.c
+++ b/src/x11/cdxclp.c
@@ -125,6 +125,7 @@ static cdContext cdClipboardContext =
 {
   CD_CAP_ALL & ~(CD_CAP_GETIMAGERGB | CD_CAP_IMAGESRV | CD_CAP_FONTDIM | CD_CAP_TEXTSIZE ),  /* same as CD_MF */
   0,
+  CD_CTX_DEVICE,
   cdcreatecanvas,  
   cdinittable,
   cdplay,          
diff --git a/src/x11/cdxdbuf.c b/src/x11/cdxdbuf.c
index 29d1e4e..7d29467 100644
--- a/src/x11/cdxdbuf.c
+++ b/src/x11/cdxdbuf.c
@@ -128,6 +128,7 @@ static cdContext cdDBufferContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_FPRIMTIVES | CD_CAP_PATH | CD_CAP_BEZIER ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
@@ -138,7 +139,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/x11/cdximg.c b/src/x11/cdximg.c
index c823705..12db352 100644
--- a/src/x11/cdximg.c
+++ b/src/x11/cdximg.c
@@ -32,6 +32,7 @@ static cdContext cdImageContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_FPRIMTIVES | CD_CAP_PATH | CD_CAP_BEZIER ),
   0,
+  CD_CTX_IMAGE,
   cdcreatecanvas,
   cdinittable,
   NULL,
@@ -43,7 +44,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/x11/cdxnative.c b/src/x11/cdxnative.c
index a69314c..ddf6670 100644
--- a/src/x11/cdxnative.c
+++ b/src/x11/cdxnative.c
@@ -144,7 +144,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_FPRIMTIVES | CD_CAP_PATH | CD_CAP_BEZIER),
-  1,
+  0,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,
@@ -156,7 +157,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;
   }
-- 
cgit v1.2.3