Fixed the embedding demo to correctly show the use of

overriding the console writer.

diff --git a/Mac/Demo/embed/demo.c b/Mac/Demo/embed/demo.c
index 7d450f165f365189fcd042ce3e82bea398c406d0..a022f94fa83026e0d9beb85dafee0f51c2d01cf8 100644 (file)
--- a/Mac/Demo/embed/demo.c
+++ b/Mac/Demo/embed/demo.c
@@ -1,35 +1,43 @@
 /* Example of embedding Python in another program */
 
 #include "Python.h"
-#ifdef macintosh
 #include "macglue.h"
-#endif /* macintosh */
 
 static char *argv0;
 
+long my_writehandler(char *buf, long count)
+{
+       long mycount;
+       unsigned char mybuf[255];
+       
+       mycount = count;
+       if (mycount > 255 ) mycount = 255;
+       mybuf[0] = (unsigned char)mycount;
+       strncpy((char *)mybuf+1, buf, mycount);
+       DebugStr(mybuf);
+       return count;
+}
+
 main(argc, argv)
        int argc;
        char **argv;
 {
-#ifdef macintosh
        /* So the user can set argc/argv to something interesting */
        argc = ccommand(&argv);
-#endif
        /* Save a copy of argv0 */
        argv0 = argv[0];
 
-       /* Initialize the Python interpreter.  Required. */
-#ifdef macintosh
        /* If the first option is "-q" we don't open a console */
        if ( argc > 1 && strcmp(argv[1], "-q") == 0 ) {
                PyMac_SetConsoleHandler(PyMac_DummyReadHandler, PyMac_DummyWriteHandler,
                        PyMac_DummyWriteHandler);
-/*             freopen("demo output", "w", stdout); */
-       }
+       } else
+       if ( argc > 1 && strcmp(argv[1], "-d") == 0 )  {
+               PyMac_SetConsoleHandler(PyMac_DummyReadHandler, my_writehandler,
+                       my_writehandler);
+       } 
+       /* Initialize the Python interpreter.  Required. */
        PyMac_Initialize();
-#else
-       Py_Initialize();
-#endif
 
        /* Define sys.argv.  It is up to the application if you
           want this; you can also let it undefined (since the Python 

diff --git a/Mac/Demo/embed/embeddemo.prj b/Mac/Demo/embed/embeddemo.prj
index e519b5c8fa86b56eb20c56beb9594fa904d6b2e3..778755a65b99b2ca2ab5f86f976ee8600ab5d0cc 100644 (file)
Binary files a/Mac/Demo/embed/embeddemo.prj and b/Mac/Demo/embed/embeddemo.prj differ