Backport of 1.7:

Added some support for unicode arguments.

diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c
index 4acc4b540eb2783ae5ad63d65c40b035db9a1683..c159e07b9a6c2a764368ab140b31d6f8010d1fab 100644 (file)
--- a/Mac/Modules/mlte/_Mltemodule.c
+++ b/Mac/Modules/mlte/_Mltemodule.c
@@ -1006,6 +1006,31 @@ static PyObject *TXNObj_TXNActivate(TXNObjectObject *_self, PyObject *_args)
        return _res;
 }
 
+static PyObject *TXNObj_TXNEchoMode(TXNObjectObject *_self, PyObject *_args)
+{
+       PyObject *_res = NULL;
+       OSStatus _err;
+       UniChar iEchoCharacter;
+       TextEncoding iEncoding;
+       Boolean iOn;
+#ifndef TXNEchoMode
+       PyMac_PRECHECK(TXNEchoMode);
+#endif
+       if (!PyArg_ParseTuple(_args, "hlb",
+                             &iEchoCharacter,
+                             &iEncoding,
+                             &iOn))
+               return NULL;
+       _err = TXNEchoMode(_self->ob_itself,
+                          iEchoCharacter,
+                          iEncoding,
+                          iOn);
+       if (_err != noErr) return PyMac_Error(_err);
+       Py_INCREF(Py_None);
+       _res = Py_None;
+       return _res;
+}
+
 static PyObject *TXNObj_TXNDoFontMenuSelection(TXNObjectObject *_self, PyObject *_args)
 {
        PyObject *_res = NULL;
@@ -1251,6 +1276,8 @@ static PyMethodDef TXNObj_methods[] = {
         "(TXNFrameID iTXNFrameID, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None"},
        {"TXNActivate", (PyCFunction)TXNObj_TXNActivate, 1,
         "(TXNFrameID iTXNFrameID, TXNScrollBarState iActiveState) -> None"},
+       {"TXNEchoMode", (PyCFunction)TXNObj_TXNEchoMode, 1,
+        "(UniChar iEchoCharacter, TextEncoding iEncoding, Boolean iOn) -> None"},
        {"TXNDoFontMenuSelection", (PyCFunction)TXNObj_TXNDoFontMenuSelection, 1,
         "(TXNFontMenuObject iTXNFontMenuObject, SInt16 iMenuID, SInt16 iMenuItem) -> None"},
        {"TXNPrepareFontMenu", (PyCFunction)TXNObj_TXNPrepareFontMenu, 1,

diff --git a/Mac/Modules/mlte/mltescan.py b/Mac/Modules/mlte/mltescan.py
index c4b3d47895758c2b7feb410e94ff075b534df2cd..80c966eb327ff2a2f1309ce56f381aa9d715b3ad 100644 (file)
--- a/Mac/Modules/mlte/mltescan.py
+++ b/Mac/Modules/mlte/mltescan.py
@@ -93,9 +93,6 @@ MovieFileType = FOUR_CHAR_CODE('moov')
                        "TXNTypeAttributes", #TBD
                        "TXNMatchTextRecord", #TBD
                        "TXNBackground", #TBD
-                       "UniChar", #TBD
-                       "UniCharCount", #TBD
-                       "UniChar_ptr", #TBD
                        "TXNFindUPP", 
                        "ATSUStyle", #TBD
                        "TXNActionKeyMapperProcPtr",

diff --git a/Mac/Modules/mlte/mltesupport.py b/Mac/Modules/mlte/mltesupport.py
index 3ce24638a692bf536a3666a1abd18cf6c68da44d..e2f5767756f938989853f304147828495b6b611b 100644 (file)
--- a/Mac/Modules/mlte/mltesupport.py
+++ b/Mac/Modules/mlte/mltesupport.py
@@ -129,6 +129,8 @@ CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 
 OptFSSpecPtr = OpaqueByValueType("FSSpec *", "OptFSSpecPtr")
 OptRectPtr = OpaqueByValueType("Rect *", "OptRectPtr")
+
+UniChar = Type("UniChar", "h") # XXXX For now...
 # ADD object type here
 
 execfile("mltetypetest.py")