mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

On the Mac a call to TkMacInitMenus is needed. Also, we pass

Browse source 
appropriate events to Sioux so the console window remains functional.
(Jack)
This commit is contained in:
Guido van Rossum 1998-04-28 16:12:43 +00:00
parent 19efc5fb80
commit 2ea1c94b9a
1 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Modules/_tkinter.c
View file

@ -62,6 +62,8 @@ PERFORMANCE OF THIS SOFTWARE.
#if TKMAJORMINOR >= 8000 && defined(macintosh) #if TKMAJORMINOR >= 8000 && defined(macintosh)
/* Sigh, we have to include this to get at the tcl qd pointer */ /* Sigh, we have to include this to get at the tcl qd pointer */
#include <tkMac.h> #include <tkMac.h>
/* And this one we need to clear the menu bar */
#include <Menus.h>
#endif #endif
#if TKMAJORMINOR < 4001 #if TKMAJORMINOR < 4001
@ -96,6 +98,16 @@ int TkMacConvertEvent Py_PROTO((EventRecord *eventPtr));
staticforward int PyMacConvertEvent Py_PROTO((EventRecord *eventPtr)); staticforward int PyMacConvertEvent Py_PROTO((EventRecord *eventPtr));
#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
#pragma import on
#endif
#include <SIOUX.h>
extern int SIOUXIsAppWindow(WindowPtr);
#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
#pragma import reset
#endif
#endif /* macintosh */ #endif /* macintosh */
#ifndef FREECAST #ifndef FREECAST
@ -337,6 +349,11 @@ Tkapp_New(screenName, baseName, className, interactive)
v->interp = Tcl_CreateInterp(); v->interp = Tcl_CreateInterp();
#if defined(macintosh) && TKMAJORMINOR >= 8000
/* This seems to be needed since Tk 8.0 */
ClearMenuBar();
TkMacInitMenus(v->interp);
#endif
/* Delete the 'exit' command, which can screw things up */ /* Delete the 'exit' command, which can screw things up */
Tcl_DeleteCommand(v->interp, "exit"); Tcl_DeleteCommand(v->interp, "exit");
@ -1600,8 +1617,20 @@ static int
PyMacConvertEvent(eventPtr) PyMacConvertEvent(eventPtr)
EventRecord *eventPtr; EventRecord *eventPtr;
{ {
if (SIOUXHandleOneEvent(eventPtr)) WindowPtr frontwin;
return 0; /* Nothing happened to the Tcl event queue */ /*
** Sioux eats too many events, so we don't pass it everything.
** We always pass update events to Sioux, and we only pass other events if
** the Sioux window is frontmost. This means that Tk menus don't work
** in that case, but at least we can scroll the sioux window.
** Note that the SIOUXIsAppWindow() routine we use here is not really
** part of the external interface of Sioux...
*/
frontwin = FrontWindow();
if ( eventPtr->what == updateEvt || SIOUXIsAppWindow(frontwin) ) {
if (SIOUXHandleOneEvent(eventPtr))
return 0; /* Nothing happened to the Tcl event queue */
}
return TkMacConvertEvent(eventPtr); return TkMacConvertEvent(eventPtr);
} }