Added rgbFgColor and a few other members of CGrafPort

diff --git a/Mac/Modules/qd/Qdmodule.c b/Mac/Modules/qd/Qdmodule.c
index fd70eec99f47acdc4c171d804051cea9f6c9c8ce..54176f30878be15adeaa06cdb5e2585e7301d8ad 100644 (file)
--- 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 e40e2f5225892d1d1f2d671f7c5539baf37b3605..39d98959aae888c08dd70bb407cb5c2cb5efc0a3 100644 (file)
--- 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 )