- Universal Headers 3 mods

- Started on menubar-restore code (but it still doesn't work 100%)

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 4d0fb1f77e71b2b551e8fd6142bf0b6e74024910..838e27e633c155224a7528d52926f05e0d53d1b5 100644 (file)
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -183,6 +183,7 @@ PyMac_FixGUSIcd()
 ** provide a dummy here.
 */
 void SpinCursor(short x) { /* Dummy */ }
+void RotateCursor(short x) { /* Dummy */ }
 
 /*
 ** Replacement GUSI Spin function
@@ -392,7 +393,7 @@ scan_event_queue(flush)
 {
        register EvQElPtr q;
        
-       q = (EvQElPtr) GetEventQueue()->qHead;
+       q = (EvQElPtr) LMGetEventQueue()->qHead;
        
        for (; q; q = (EvQElPtr)q->qLink) {
                if (q->evtQWhat == keyDown &&
@@ -651,7 +652,8 @@ PyMac_RestoreMenuBar()
        if ( sioux_mbar ) {
                SetMenuBar(sioux_mbar);
                DrawMenuBar();
-       }
+       } else
+               PyMac_InitMenuBar();
 }