From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 15 Jan 1996 14:39:56 +0000 (+0000)
Subject: Added rgbFgColor and a few other members of CGrafPort
X-Git-Tag: v1.4b1~400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61f3df4543751f98d02c86b03aa97b72bc80992f;p=python

Added rgbFgColor and a few other members of CGrafPort
---

diff --git a/Mac/Modules/qd/Qdmodule.c b/Mac/Modules/qd/Qdmodule.c
index fd70eec99f..54176f3087 100644
--- a/Mac/Modules/qd/Qdmodule.c
+++ b/Mac/Modules/qd/Qdmodule.c
@@ -163,10 +163,26 @@ static PyObject *GrafObj_getattr(self, name)
 						return Py_BuildValue("h", itself_color->chExtra);
 					if ( strcmp(name, "pnLocHFrac") == 0 )
 						return Py_BuildValue("h", itself_color->pnLocHFrac);
+					if ( strcmp(name, "bkPixPat") == 0 )
+						return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->bkPixPat);
+					if ( strcmp(name, "rgbFgColor") == 0 )
+						return Py_BuildValue("O&", QdRGB_New, &itself_color->rgbFgColor);
+					if ( strcmp(name, "rgbBkColor") == 0 )
+						return Py_BuildValue("O&", QdRGB_New, &itself_color->rgbBkColor);
+					if ( strcmp(name, "pnPixPat") == 0 )
+						return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->pnPixPat);
+					if ( strcmp(name, "fillPixPat") == 0 )
+						return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->fillPixPat);
 				} else {
 					/* Mono-only attributes */
 					if ( strcmp(name, "portBits") == 0 )
 						return BMObj_New(&self->ob_itself->portBits);
+					if ( strcmp(name, "bkPat") == 0 )
+						return Py_BuildValue("s#", (char *)&self->ob_itself->bkPat, sizeof(Pattern));
+					if ( strcmp(name, "fillPat") == 0 )
+						return Py_BuildValue("s#", (char *)&self->ob_itself->fillPat, sizeof(Pattern));
+					if ( strcmp(name, "pnPat") == 0 )
+						return Py_BuildValue("s#", (char *)&self->ob_itself->pnPat, sizeof(Pattern));
 				}
 				/*
 				** Accessible for both color/mono windows.
@@ -183,18 +199,12 @@ static PyObject *GrafObj_getattr(self, name)
 					return Py_BuildValue("O&", ResObj_New, (Handle)self->ob_itself->visRgn);
 				if ( strcmp(name, "clipRgn") == 0 )
 					return Py_BuildValue("O&", ResObj_New, (Handle)self->ob_itself->clipRgn);
-				if ( strcmp(name, "bkPat") == 0 )
-					return Py_BuildValue("s#", (char *)&self->ob_itself->bkPat, sizeof(Pattern));
-				if ( strcmp(name, "fillPat") == 0 )
-					return Py_BuildValue("s#", (char *)&self->ob_itself->fillPat, sizeof(Pattern));
 				if ( strcmp(name, "pnLoc") == 0 )
 					return Py_BuildValue("O&", PyMac_BuildPoint, self->ob_itself->pnLoc);
 				if ( strcmp(name, "pnSize") == 0 )
 					return Py_BuildValue("O&", PyMac_BuildPoint, self->ob_itself->pnSize);
 				if ( strcmp(name, "pnMode") == 0 )
 					return Py_BuildValue("h", self->ob_itself->pnMode);
-				if ( strcmp(name, "pnPat") == 0 )
-					return Py_BuildValue("s#", (char *)&self->ob_itself->pnPat, sizeof(Pattern));
 				if ( strcmp(name, "pnVis") == 0 )
 					return Py_BuildValue("h", self->ob_itself->pnVis);
 				if ( strcmp(name, "txFont") == 0 )
diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index e40e2f5225..39d98959aa 100644
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -165,10 +165,26 @@ class MyGRObjectDefinition(GlobalObjectDefinition):
 					return Py_BuildValue("h", itself_color->chExtra);
 				if ( strcmp(name, "pnLocHFrac") == 0 )
 					return Py_BuildValue("h", itself_color->pnLocHFrac);
+				if ( strcmp(name, "bkPixPat") == 0 )
+					return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->bkPixPat);
+				if ( strcmp(name, "rgbFgColor") == 0 )
+					return Py_BuildValue("O&", QdRGB_New, &itself_color->rgbFgColor);
+				if ( strcmp(name, "rgbBkColor") == 0 )
+					return Py_BuildValue("O&", QdRGB_New, &itself_color->rgbBkColor);
+				if ( strcmp(name, "pnPixPat") == 0 )
+					return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->pnPixPat);
+				if ( strcmp(name, "fillPixPat") == 0 )
+					return Py_BuildValue("O&", ResObj_New, (Handle)itself_color->fillPixPat);
 			} else {
 				/* Mono-only attributes */
 				if ( strcmp(name, "portBits") == 0 )
 					return BMObj_New(&self->ob_itself->portBits);
+				if ( strcmp(name, "bkPat") == 0 )
+					return Py_BuildValue("s#", (char *)&self->ob_itself->bkPat, sizeof(Pattern));
+				if ( strcmp(name, "fillPat") == 0 )
+					return Py_BuildValue("s#", (char *)&self->ob_itself->fillPat, sizeof(Pattern));
+				if ( strcmp(name, "pnPat") == 0 )
+					return Py_BuildValue("s#", (char *)&self->ob_itself->pnPat, sizeof(Pattern));
 			}
 			/*
 			** Accessible for both color/mono windows.
@@ -185,18 +201,12 @@ class MyGRObjectDefinition(GlobalObjectDefinition):
 				return Py_BuildValue("O&", ResObj_New, (Handle)self->ob_itself->visRgn);
 			if ( strcmp(name, "clipRgn") == 0 )
 				return Py_BuildValue("O&", ResObj_New, (Handle)self->ob_itself->clipRgn);
-			if ( strcmp(name, "bkPat") == 0 )
-				return Py_BuildValue("s#", (char *)&self->ob_itself->bkPat, sizeof(Pattern));
-			if ( strcmp(name, "fillPat") == 0 )
-				return Py_BuildValue("s#", (char *)&self->ob_itself->fillPat, sizeof(Pattern));
 			if ( strcmp(name, "pnLoc") == 0 )
 				return Py_BuildValue("O&", PyMac_BuildPoint, self->ob_itself->pnLoc);
 			if ( strcmp(name, "pnSize") == 0 )
 				return Py_BuildValue("O&", PyMac_BuildPoint, self->ob_itself->pnSize);
 			if ( strcmp(name, "pnMode") == 0 )
 				return Py_BuildValue("h", self->ob_itself->pnMode);
-			if ( strcmp(name, "pnPat") == 0 )
-				return Py_BuildValue("s#", (char *)&self->ob_itself->pnPat, sizeof(Pattern));
 			if ( strcmp(name, "pnVis") == 0 )
 				return Py_BuildValue("h", self->ob_itself->pnVis);
 			if ( strcmp(name, "txFont") == 0 )