Final touch before release.

diff --git a/Modules/config.c.in b/Modules/config.c.in
index faf36a827bf630d59bdf1413e7539ef788777605..484381ec4ea582a1fe00926f855007e89bc70a29 100644 (file)
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -62,17 +62,17 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "patchlevel.h"
 
-#define VERSION "0.9.%d BETA (%s)"
+#define VERSION "0.9.%d (%s)"
 
 #ifdef __DATE__
 #define DATE __DATE__
 #else
-#define DATE ">= 27 Mar 1993"
+#define DATE ">= 29 Jul 1993"
 #endif
 
 #ifdef USE_STDWIN
 #ifdef macintosh
-#include ":::src:stdwin:H:stdwin.h"
+#include ":::stdwin:H:stdwin.h"
 #else /* !macintosh */
 #include "stdwin.h"
 #endif /* !macintosh */

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 6e666a61b5622a0b7db21355415c449293067c5e..a6f6fba9bdd418dbe3e218ea449369cbf513aa2b 100644 (file)
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -68,9 +68,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "ceval.h"
 
 #ifdef macintosh
-#include ":::src:stdwin:H:stdwin.h"
+#include ":::stdwin:H:stdwin.h"
 #else /* !macintosh */
 #include "stdwin.h"
+#define HAVE_BITMAPS
 #endif /* !macintosh */
 
 #ifdef USE_THREAD
@@ -684,6 +685,8 @@ drawing_setfgcolor(self, args)
        return None;
 }
 
+#ifdef HAVE_BITMAPS
+
 static object *
 drawing_bitmap(self, args)
        object *self;
@@ -722,8 +725,12 @@ drawing_bitmap(self, args)
        return None;
 }
 
+#endif /* HAVE_BITMAPS */
+
 static struct methodlist drawing_methods[] = {
+#ifdef HAVE_BITMAPS
        {"bitmap",      drawing_bitmap},
+#endif
        {"box",         drawing_box},
        {"circle",      drawing_circle},
        {"cliprect",    drawing_cliprect},
@@ -1352,6 +1359,8 @@ typeobject Menutype = {
 };
 
 
+#ifdef HAVE_BITMAPS
+
 /* Bitmaps objects */
 
 static bitmapobject *newbitmapobject PROTO((int, int));
@@ -1506,6 +1515,8 @@ typeobject Bitmaptype = {
        0,                      /*tp_repr*/
 };
 
+#endif /* HAVE_BITMAPS */
+
 
 /* Windows */
 
@@ -2438,6 +2449,7 @@ stdwin_listfontnames(self, args)
        return list;
 }
 
+#ifdef HAVE_BITMAPS
 static object *
 stdwin_newbitmap(self, args)
        object *self;
@@ -2449,6 +2461,7 @@ stdwin_newbitmap(self, args)
                return NULL;
        return (object *)newbitmapobject(width, height);
 }
+#endif
 
 static struct methodlist stdwin_methods[] = {
        {"askfile",             stdwin_askfile},
@@ -2472,7 +2485,9 @@ static struct methodlist stdwin_methods[] = {
        {"listfontnames",       stdwin_listfontnames},
        {"menucreate",          stdwin_menucreate},
        {"message",             stdwin_message},
+#ifdef HAVE_BITMAPS
        {"newbitmap",           stdwin_newbitmap},
+#endif
        {"open",                stdwin_open},
        {"pollevent",           stdwin_pollevent},
        {"resetselection",      stdwin_resetselection},