mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Added separate main program for the Mac: macmain.c
stdwinmodule.c: wsetfont can now return an error Makefile: add CL_USE and CL_LIB*S; config.c: move CL part around New things in imgfile; also in Makefile. longobject.c: fix comparison of negative long ints... [REAL BUG!] marshal.c: add dumps() and loads() to read/write strings timemodule.c: make sure there's always a floatsleep() posixmodule.c: rationalize struct returned by times() Makefile: add test target, disable imgfile by default thread.c: Improved coexistance with dl module (sjoerd) stdwinmodule.c: Change include stdwin.h if macintosh rotormodule.c: added missing last argument to RTR_?_region calls confic.c: merged with configmac.c, added 1993 to copyright message fileobject.c: int compared to NULL in writestring(); change fopenRF ifdef timemodule.c: simplify times() using mkvalue; include myselect.h earlier (for sequent). posixmodule: for sequent, include unistd.h instead of explicit extern definitions and don't define rename() Makefile: change misleading/wrong MD5 comments
This commit is contained in:
parent
80530ce875
commit
0b0db8e3a0
8 changed files with 367 additions and 160 deletions
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
|
@ -66,7 +66,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "modsupport.h"
|
||||
#include "ceval.h"
|
||||
|
||||
#ifdef macintosh
|
||||
#include ":::src:stdwin:H:stdwin.h"
|
||||
#else /* !macintosh */
|
||||
#include "stdwin.h"
|
||||
#endif /* !macintosh */
|
||||
|
||||
#ifdef USE_THREAD
|
||||
|
||||
|
@ -585,8 +589,12 @@ drawing_setfont(self, args)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
if (font != NULL)
|
||||
wsetfont(font);
|
||||
if (font != NULL) {
|
||||
if (!wsetfont(font)) {
|
||||
err_setstr(StdwinError, "font not found");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (size != 0)
|
||||
wsetsize(size);
|
||||
switch (style) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue