Added support for accessing a few more TERec members

diff --git a/Mac/Modules/te/TEmodule.c b/Mac/Modules/te/TEmodule.c
index 9d14b095588e60c6d4c2120199ca1f6b9633b093..4d025cf17de787f161b8fe3912e8416a35b9355a 100644 (file)
--- a/Mac/Modules/te/TEmodule.c
+++ b/Mac/Modules/te/TEmodule.c
@@ -808,28 +808,40 @@ static PyObject *TEObj_getattr(self, name)
 
                                if( strcmp(name, "destRect") == 0 )
                                        return Py_BuildValue("O&", PyMac_BuildRect,
-                                                       (*self->ob_itself)->destRect);
+                                                       &(*self->ob_itself)->destRect);
                                if( strcmp(name, "viewRect") == 0 )
                                        return Py_BuildValue("O&", PyMac_BuildRect,
-                                                       (*self->ob_itself)->viewRect);
+                                                       &(*self->ob_itself)->viewRect);
                                if( strcmp(name, "selRect") == 0 )
                                        return Py_BuildValue("O&", PyMac_BuildRect,
-                                                       (*self->ob_itself)->selRect);
+                                                       &(*self->ob_itself)->selRect);
                                if( strcmp(name, "lineHeight") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->lineHeight);
                                if( strcmp(name, "fontAscent") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->fontAscent);
                                if( strcmp(name, "selPoint") == 0 )
                                        return Py_BuildValue("O&", PyMac_BuildPoint,
-                                                       (*self->ob_itself)->selPoint);
+                                                       &(*self->ob_itself)->selPoint);
                                if( strcmp(name, "selStart") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->selStart);
                                if( strcmp(name, "selEnd") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->selEnd);
                                if( strcmp(name, "active") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->active);
+                               if( strcmp(name, "just") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->just);
                                if( strcmp(name, "teLength") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->teLength);
+                               if( strcmp(name, "txFont") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->txFont);
+                               if( strcmp(name, "txFace") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->txFace);
+                               if( strcmp(name, "txMode") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->txMode);
+                               if( strcmp(name, "txSize") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->txSize);
+                               if( strcmp(name, "nLines") == 0 )
+                                       return Py_BuildValue("h", (*self->ob_itself)->nLines);
                        
        return Py_FindMethodInChain(&TEObj_chain, (PyObject *)self, name);
 }

diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py
index daadea048b14994d0507f5f2d1f8b268a98ea342..7802ae9d5eb5d9c80e1aab29b5107141f353af97 100644 (file)
--- a/Mac/Modules/te/tesupport.py
+++ b/Mac/Modules/te/tesupport.py
@@ -91,28 +91,40 @@ class MyObjectDefinition(GlobalObjectDefinition):
                Output("""
                        if( strcmp(name, "destRect") == 0 )
                                return Py_BuildValue("O&", PyMac_BuildRect,
-                                               (*self->ob_itself)->destRect);
+                                               &(*self->ob_itself)->destRect);
                        if( strcmp(name, "viewRect") == 0 )
                                return Py_BuildValue("O&", PyMac_BuildRect,
-                                               (*self->ob_itself)->viewRect);
+                                               &(*self->ob_itself)->viewRect);
                        if( strcmp(name, "selRect") == 0 )
                                return Py_BuildValue("O&", PyMac_BuildRect,
-                                               (*self->ob_itself)->selRect);
+                                               &(*self->ob_itself)->selRect);
                        if( strcmp(name, "lineHeight") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->lineHeight);
                        if( strcmp(name, "fontAscent") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->fontAscent);
                        if( strcmp(name, "selPoint") == 0 )
                                return Py_BuildValue("O&", PyMac_BuildPoint,
-                                               (*self->ob_itself)->selPoint);
+                                               &(*self->ob_itself)->selPoint);
                        if( strcmp(name, "selStart") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->selStart);
                        if( strcmp(name, "selEnd") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->selEnd);
                        if( strcmp(name, "active") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->active);
+                       if( strcmp(name, "just") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->just);
                        if( strcmp(name, "teLength") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->teLength);
+                       if( strcmp(name, "txFont") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->txFont);
+                       if( strcmp(name, "txFace") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->txFace);
+                       if( strcmp(name, "txMode") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->txMode);
+                       if( strcmp(name, "txSize") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->txSize);
+                       if( strcmp(name, "nLines") == 0 )
+                               return Py_BuildValue("h", (*self->ob_itself)->nLines);
                """)
 
 # From here on it's basically all boiler plate...