diff options
| author | Guido van Rossum <guido@python.org> | 1993-01-21 16:07:51 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1993-01-21 16:07:51 (GMT) |
| commit | 0b0db8e3a07c92786fde60bf53bd1d5aa32e0aae (patch) | |
| tree | 8750daf2aeb5be8cdb034755f883c1c3557ea809 /Modules/stdwinmodule.c | |
| parent | 80530ce8754956c8d5349d4644dc83113a63cfc1 (diff) | |
| download | cpython-0b0db8e3a07c92786fde60bf53bd1d5aa32e0aae.zip cpython-0b0db8e3a07c92786fde60bf53bd1d5aa32e0aae.tar.gz cpython-0b0db8e3a07c92786fde60bf53bd1d5aa32e0aae.tar.bz2 | |
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
Diffstat (limited to 'Modules/stdwinmodule.c')
| -rw-r--r-- | Modules/stdwinmodule.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c index a33366d..62e9b47 100644 --- a/Modules/stdwinmodule.c +++ b/Modules/stdwinmodule.c @@ -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) { |