The TNXDraw gworld argument is optional.

diff --git a/Mac/Modules/mlte/Mltemodule.c b/Mac/Modules/mlte/Mltemodule.c
index 27bd12106ddbe637584f3c0329ebace3a51d3f21..d2aaec474c05021a5880902b1f11865cee921034 100644 (file)
--- a/Mac/Modules/mlte/Mltemodule.c
+++ b/Mac/Modules/mlte/Mltemodule.c
@@ -70,6 +70,20 @@ OptRectPtr_Convert(PyObject *v, Rect **p_itself)
        return PyMac_GetRect(v, *p_itself);
 }
 
+/*
+** Parse an optional GWorld
+*/
+static int
+OptGWorldObj_Convert(PyObject *v, GWorldPtr *p_itself)
+{      
+       if (v == Py_None)
+       {
+               *p_itself = NULL;
+               return 1;
+       }
+       return GWorldObj_Convert(v, p_itself);
+}
+
 
 static PyObject *Mlte_Error;
 
@@ -276,7 +290,7 @@ static PyObject *TXNObj_TXNDraw(TXNObjectObject *_self, PyObject *_args)
        GWorldPtr iDrawPort;
        PyMac_PRECHECK(TXNDraw);
        if (!PyArg_ParseTuple(_args, "O&",
-                             GWorldObj_Convert, &iDrawPort))
+                             OptGWorldObj_Convert, &iDrawPort))
                return NULL;
        TXNDraw(_self->ob_itself,
                iDrawPort);

diff --git a/Mac/Modules/mlte/mltescan.py b/Mac/Modules/mlte/mltescan.py
index 6da7267ac4c9d00d3a76bcaa75a5834e3a37d9ed..f9c5a6ea45a37a3588b56da48c9e46d0e1698f7a 100644 (file)
--- a/Mac/Modules/mlte/mltescan.py
+++ b/Mac/Modules/mlte/mltescan.py
@@ -116,7 +116,11 @@ MovieFileType = FOUR_CHAR_CODE('moov')
                         
                        # The AdjustCursor region handle is optional
                        ([("RgnHandle", "ioCursorRgn", "InMode")],
-                        [("OptRgnHandle", "*", "*")])
+                        [("OptRgnHandle", "*", "*")]),
+                        
+                       # The GWorld for TXNDraw is optional
+                       ([('GWorldPtr', 'iDrawPort', 'InMode')],
+                        [('OptGWorldPtr', '*', '*')]),
                        ]
                        
 if __name__ == "__main__":

diff --git a/Mac/Modules/mlte/mltesupport.py b/Mac/Modules/mlte/mltesupport.py
index a7969e77bea5b58cf4ea0d51aeda0a3b4eafa3f8..a1152be2e4a455481c00d403e94764ea52160197 100644 (file)
--- a/Mac/Modules/mlte/mltesupport.py
+++ b/Mac/Modules/mlte/mltesupport.py
@@ -74,6 +74,20 @@ OptRectPtr_Convert(PyObject *v, Rect **p_itself)
        return PyMac_GetRect(v, *p_itself);
 }
 
+/*
+** Parse an optional GWorld
+*/
+static int
+OptGWorldObj_Convert(PyObject *v, GWorldPtr *p_itself)
+{      
+       if (v == Py_None)
+       {
+               *p_itself = NULL;
+               return 1;
+       }
+       return GWorldObj_Convert(v, p_itself);
+}
+
 """
 
 initstuff = initstuff + """
@@ -109,6 +123,7 @@ DragTrackingMessage = Type("DragTrackingMessage", "h")
 RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
 OptRgnHandle = OpaqueByValueType("RgnHandle", "OptResObj")
 GWorldPtr = OpaqueByValueType("GWorldPtr", "GWorldObj")
+OptGWorldPtr = OpaqueByValueType("GWorldPtr", "OptGWorldObj")
 MlteInBuffer = VarInputBufferType('void *', 'ByteCount', 'l')
 
 OptFSSpecPtr = OpaqueByValueType("FSSpec *", "OptFSSpecPtr")