From 898e50625bfd7a54a37cc29c8280431f40b6adf7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 23 Jan 2007 22:24:19 +0000 Subject: [PATCH] missed non-array allocations using top-level new svn: r5442 --- src/configure | 1 + src/mred/wxme/wx_mpbrd.cxx | 2 -- src/mzscheme/configure.ac | 1 + src/wxxt/src/GDI-Classes/Colour.cc | 4 ++-- src/wxxt/src/Windows/Menu.h | 2 +- src/wxxt/src/Windows/Window.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/configure b/src/configure index e47c9f9d47..6317bde358 100755 --- a/src/configure +++ b/src/configure @@ -1714,6 +1714,7 @@ show_explicitly_disabled "${enable_mred}" MrEd if test "${enable_mred}" != "no" ; then show_explicitly_disabled "${enable_gl}" OpenGL show_explicitly_disabled "${enable_xrender}" Xrender + show_explicitly_disabled "${enable_xft}" Xft show_explicitly_disabled "${enable_cairo}" Cairo show_explicitly_disabled "${enable_libpng}" "Use-existing-libpng" show_explicitly_disabled "${enable_libjpeg}" "Use-existing-libjpeg" diff --git a/src/mred/wxme/wx_mpbrd.cxx b/src/mred/wxme/wx_mpbrd.cxx index a9bf3aefd9..1438162805 100644 --- a/src/mred/wxme/wx_mpbrd.cxx +++ b/src/mred/wxme/wx_mpbrd.cxx @@ -2566,8 +2566,6 @@ int wxMediaPasteboard::InsertPort(Scheme_Object *f, int WXUNUSED(format), Bool r Bool wxMediaPasteboard::InsertFile(const char *who, Scheme_Object *f, const char *filename, Bool clearStyles, Bool showErrors) { - int n; - char buffer[MRED_START_STR_LEN + 1]; Bool fileerr; if (userLocked || writeLocked) diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index e969c23235..6c914b3400 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -244,6 +244,7 @@ show_explicitly_disabled "${enable_mred}" MrEd if test "${enable_mred}" != "no" ; then show_explicitly_disabled "${enable_gl}" OpenGL show_explicitly_disabled "${enable_xrender}" Xrender + show_explicitly_disabled "${enable_xft}" Xft show_explicitly_disabled "${enable_cairo}" Cairo show_explicitly_disabled "${enable_libpng}" "Use-existing-libpng" show_explicitly_disabled "${enable_libjpeg}" "Use-existing-libjpeg" diff --git a/src/wxxt/src/GDI-Classes/Colour.cc b/src/wxxt/src/GDI-Classes/Colour.cc index a0b4c802cc..f6ff84d663 100644 --- a/src/wxxt/src/GDI-Classes/Colour.cc +++ b/src/wxxt/src/GDI-Classes/Colour.cc @@ -48,14 +48,14 @@ extern Colormap wx_default_colormap; // private data of wxColour and wxColourMap //----------------------------------------------------------------------------- -class wxColour_Xintern { +class wxColour_Xintern : public gc { public: XColor xcolor; Bool have_pixel; Colormap xcolormap; }; -class wxColourMap_Xintern { +class wxColourMap_Xintern : public gc { public: Colormap xcolormap; Bool priv; diff --git a/src/wxxt/src/Windows/Menu.h b/src/wxxt/src/Windows/Menu.h index 75a561b9b3..9898ffc014 100644 --- a/src/wxxt/src/Windows/Menu.h +++ b/src/wxxt/src/Windows/Menu.h @@ -134,7 +134,7 @@ extern char *copystring_xt(const char *s); # define BUNDLE_TOP_MENU(menu) GC_malloc_immobile_box(GC_malloc_weak_box(gcOBJ_TO_PTR(menu), NULL, 0)) # define FREE_TOP_POINTER(p) GC_free_immobile_box((void **)p) #else -# define MALLOC_MENU_ITEM() (new menu_item) +# define MALLOC_MENU_ITEM() (new WXGC_PTRS menu_item) # define FREE_MENU_ITEM(i) /* nothing */ # define MAKE_MENU_STRING(s) s # define FREE_MENU_STRING(s) /* nothing */ diff --git a/src/wxxt/src/Windows/Window.h b/src/wxxt/src/Windows/Window.h index 996b833e2e..f5c0cf1285 100644 --- a/src/wxxt/src/Windows/Window.h +++ b/src/wxxt/src/Windows/Window.h @@ -31,7 +31,7 @@ #endif #ifdef Have_Xt_Types -class wxWindow_Xintern { +class wxWindow_Xintern : public gc { public: Widget frame; // frame widgets Widget scroll; // optional scrollable widget