diff --git a/Makefile.in b/Makefile.in
index 04e2582007..5761b97766 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2620,31 +2620,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
 	wx/gtk/toplevel.h \
 	wx/gtk/window.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR)
-COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
-	wx/generic/caret.h \
-	wx/generic/colour.h \
-	wx/generic/icon.h \
-	wx/generic/imaglist.h \
-	wx/generic/mask.h \
-	wx/mgl/app.h \
-	wx/mgl/bitmap.h \
-	wx/mgl/brush.h \
-	wx/mgl/chkconf.h \
-	wx/mgl/clipbrd.h \
-	wx/mgl/cursor.h \
-	wx/mgl/dc.h \
-	wx/mgl/dcclient.h \
-	wx/mgl/dcmemory.h \
-	wx/mgl/dcscreen.h \
-	wx/mgl/font.h \
-	wx/mgl/palette.h \
-	wx/mgl/pen.h \
-	wx/mgl/popupwin.h \
-	wx/mgl/private.h \
-	wx/mgl/region.h \
-	wx/mgl/toplevel.h \
-	wx/mgl/window.h
-@COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR)
 COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
 	wx/generic/caret.h \
 	wx/generic/imaglist.h \
@@ -3635,9 +3610,6 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/wince/textctrlce.h \
 	wx/msw/wince/resources.h
 @COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ADVANCED_PLATFORM_HDR \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	= wx/unix/joystick.h wx/unix/sound.h \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	wx/unix/taskbarx11.h
 @COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_COCOA@	wx/cocoa/taskbar.h wx/generic/animate.h \
 @COND_TOOLKIT_COCOA@	wx/osx/core/joystick.h
@@ -4974,7 +4946,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_dfb_evtloop.o \
 	monodll_dfb_font.o \
 	monodll_dfb_fontenum.o \
-	monodll_dfb_fontmgr.o \
+	monodll_fontmgr.o \
 	monodll_dfb_nonownedwnd.o \
 	monodll_dfb_overlay.o \
 	monodll_dfb_pen.o \
@@ -5070,38 +5042,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_gtk_win_gtk.o \
 	monodll_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
-	monodll_fontmgrcmn.o \
-	monodll_generic_caret.o \
-	monodll_generic_colour.o \
-	monodll_generic_icon.o \
-	monodll_generic_imaglist.o \
-	monodll_mask.o \
-	monodll_generic_timer.o \
-	monodll_mgl_app.o \
-	monodll_mgl_bitmap.o \
-	monodll_mgl_brush.o \
-	monodll_mgl_clipbrd.o \
-	monodll_mgl_cursor.o \
-	monodll_mgl_data.o \
-	monodll_mgl_dc.o \
-	monodll_mgl_dcclient.o \
-	monodll_mgl_dcmemory.o \
-	monodll_mgl_dcscreen.o \
-	monodll_dirmgl.o \
-	monodll_mgl_evtloop.o \
-	monodll_mgl_font.o \
-	monodll_mgl_fontenum.o \
-	monodll_mgl_fontmgr.o \
-	monodll_mgl_fontutil.o \
-	monodll_mgl_palette.o \
-	monodll_mgl_pen.o \
-	monodll_mgl_region.o \
-	monodll_mgl_settings.o \
-	monodll_mgl_toplevel.o \
-	monodll_mgl_utils.o \
-	monodll_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
@@ -5857,7 +5797,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_dfb_evtloop.o \
 	monodll_dfb_font.o \
 	monodll_dfb_fontenum.o \
-	monodll_dfb_fontmgr.o \
+	monodll_fontmgr.o \
 	monodll_dfb_nonownedwnd.o \
 	monodll_dfb_overlay.o \
 	monodll_dfb_pen.o \
@@ -5953,38 +5893,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_gtk_win_gtk.o \
 	monodll_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
-	monodll_fontmgrcmn.o \
-	monodll_generic_caret.o \
-	monodll_generic_colour.o \
-	monodll_generic_icon.o \
-	monodll_generic_imaglist.o \
-	monodll_mask.o \
-	monodll_generic_timer.o \
-	monodll_mgl_app.o \
-	monodll_mgl_bitmap.o \
-	monodll_mgl_brush.o \
-	monodll_mgl_clipbrd.o \
-	monodll_mgl_cursor.o \
-	monodll_mgl_data.o \
-	monodll_mgl_dc.o \
-	monodll_mgl_dcclient.o \
-	monodll_mgl_dcmemory.o \
-	monodll_mgl_dcscreen.o \
-	monodll_dirmgl.o \
-	monodll_mgl_evtloop.o \
-	monodll_mgl_font.o \
-	monodll_mgl_fontenum.o \
-	monodll_mgl_fontmgr.o \
-	monodll_mgl_fontutil.o \
-	monodll_mgl_palette.o \
-	monodll_mgl_pen.o \
-	monodll_mgl_region.o \
-	monodll_mgl_settings.o \
-	monodll_mgl_toplevel.o \
-	monodll_mgl_utils.o \
-	monodll_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
@@ -6932,7 +6840,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_dfb_evtloop.o \
 	monolib_dfb_font.o \
 	monolib_dfb_fontenum.o \
-	monolib_dfb_fontmgr.o \
+	monolib_fontmgr.o \
 	monolib_dfb_nonownedwnd.o \
 	monolib_dfb_overlay.o \
 	monolib_dfb_pen.o \
@@ -7028,38 +6936,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_gtk_win_gtk.o \
 	monolib_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
-	monolib_fontmgrcmn.o \
-	monolib_generic_caret.o \
-	monolib_generic_colour.o \
-	monolib_generic_icon.o \
-	monolib_generic_imaglist.o \
-	monolib_mask.o \
-	monolib_generic_timer.o \
-	monolib_mgl_app.o \
-	monolib_mgl_bitmap.o \
-	monolib_mgl_brush.o \
-	monolib_mgl_clipbrd.o \
-	monolib_mgl_cursor.o \
-	monolib_mgl_data.o \
-	monolib_mgl_dc.o \
-	monolib_mgl_dcclient.o \
-	monolib_mgl_dcmemory.o \
-	monolib_mgl_dcscreen.o \
-	monolib_dirmgl.o \
-	monolib_mgl_evtloop.o \
-	monolib_mgl_font.o \
-	monolib_mgl_fontenum.o \
-	monolib_mgl_fontmgr.o \
-	monolib_mgl_fontutil.o \
-	monolib_mgl_palette.o \
-	monolib_mgl_pen.o \
-	monolib_mgl_region.o \
-	monolib_mgl_settings.o \
-	monolib_mgl_toplevel.o \
-	monolib_mgl_utils.o \
-	monolib_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
@@ -7815,7 +7691,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_dfb_evtloop.o \
 	monolib_dfb_font.o \
 	monolib_dfb_fontenum.o \
-	monolib_dfb_fontmgr.o \
+	monolib_fontmgr.o \
 	monolib_dfb_nonownedwnd.o \
 	monolib_dfb_overlay.o \
 	monolib_dfb_pen.o \
@@ -7911,38 +7787,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_gtk_win_gtk.o \
 	monolib_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
-	monolib_fontmgrcmn.o \
-	monolib_generic_caret.o \
-	monolib_generic_colour.o \
-	monolib_generic_icon.o \
-	monolib_generic_imaglist.o \
-	monolib_mask.o \
-	monolib_generic_timer.o \
-	monolib_mgl_app.o \
-	monolib_mgl_bitmap.o \
-	monolib_mgl_brush.o \
-	monolib_mgl_clipbrd.o \
-	monolib_mgl_cursor.o \
-	monolib_mgl_data.o \
-	monolib_mgl_dc.o \
-	monolib_mgl_dcclient.o \
-	monolib_mgl_dcmemory.o \
-	monolib_mgl_dcscreen.o \
-	monolib_dirmgl.o \
-	monolib_mgl_evtloop.o \
-	monolib_mgl_font.o \
-	monolib_mgl_fontenum.o \
-	monolib_mgl_fontmgr.o \
-	monolib_mgl_fontutil.o \
-	monolib_mgl_palette.o \
-	monolib_mgl_pen.o \
-	monolib_mgl_region.o \
-	monolib_mgl_settings.o \
-	monolib_mgl_toplevel.o \
-	monolib_mgl_utils.o \
-	monolib_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
@@ -9069,7 +8913,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_dfb_evtloop.o \
 	coredll_dfb_font.o \
 	coredll_dfb_fontenum.o \
-	coredll_dfb_fontmgr.o \
+	coredll_fontmgr.o \
 	coredll_dfb_nonownedwnd.o \
 	coredll_dfb_overlay.o \
 	coredll_dfb_pen.o \
@@ -9165,38 +9009,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_gtk_win_gtk.o \
 	coredll_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
-	coredll_fontmgrcmn.o \
-	coredll_generic_caret.o \
-	coredll_generic_colour.o \
-	coredll_generic_icon.o \
-	coredll_generic_imaglist.o \
-	coredll_mask.o \
-	coredll_generic_timer.o \
-	coredll_mgl_app.o \
-	coredll_mgl_bitmap.o \
-	coredll_mgl_brush.o \
-	coredll_mgl_clipbrd.o \
-	coredll_mgl_cursor.o \
-	coredll_mgl_data.o \
-	coredll_mgl_dc.o \
-	coredll_mgl_dcclient.o \
-	coredll_mgl_dcmemory.o \
-	coredll_mgl_dcscreen.o \
-	coredll_dirmgl.o \
-	coredll_mgl_evtloop.o \
-	coredll_mgl_font.o \
-	coredll_mgl_fontenum.o \
-	coredll_mgl_fontmgr.o \
-	coredll_mgl_fontutil.o \
-	coredll_mgl_palette.o \
-	coredll_mgl_pen.o \
-	coredll_mgl_region.o \
-	coredll_mgl_settings.o \
-	coredll_mgl_toplevel.o \
-	coredll_mgl_utils.o \
-	coredll_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
@@ -9952,7 +9764,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_dfb_evtloop.o \
 	coredll_dfb_font.o \
 	coredll_dfb_fontenum.o \
-	coredll_dfb_fontmgr.o \
+	coredll_fontmgr.o \
 	coredll_dfb_nonownedwnd.o \
 	coredll_dfb_overlay.o \
 	coredll_dfb_pen.o \
@@ -10048,38 +9860,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_gtk_win_gtk.o \
 	coredll_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
-	coredll_fontmgrcmn.o \
-	coredll_generic_caret.o \
-	coredll_generic_colour.o \
-	coredll_generic_icon.o \
-	coredll_generic_imaglist.o \
-	coredll_mask.o \
-	coredll_generic_timer.o \
-	coredll_mgl_app.o \
-	coredll_mgl_bitmap.o \
-	coredll_mgl_brush.o \
-	coredll_mgl_clipbrd.o \
-	coredll_mgl_cursor.o \
-	coredll_mgl_data.o \
-	coredll_mgl_dc.o \
-	coredll_mgl_dcclient.o \
-	coredll_mgl_dcmemory.o \
-	coredll_mgl_dcscreen.o \
-	coredll_dirmgl.o \
-	coredll_mgl_evtloop.o \
-	coredll_mgl_font.o \
-	coredll_mgl_fontenum.o \
-	coredll_mgl_fontmgr.o \
-	coredll_mgl_fontutil.o \
-	coredll_mgl_palette.o \
-	coredll_mgl_pen.o \
-	coredll_mgl_region.o \
-	coredll_mgl_settings.o \
-	coredll_mgl_toplevel.o \
-	coredll_mgl_utils.o \
-	coredll_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
@@ -10663,7 +10443,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_dfb_evtloop.o \
 	corelib_dfb_font.o \
 	corelib_dfb_fontenum.o \
-	corelib_dfb_fontmgr.o \
+	corelib_fontmgr.o \
 	corelib_dfb_nonownedwnd.o \
 	corelib_dfb_overlay.o \
 	corelib_dfb_pen.o \
@@ -10759,38 +10539,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_gtk_win_gtk.o \
 	corelib_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
-	corelib_fontmgrcmn.o \
-	corelib_generic_caret.o \
-	corelib_generic_colour.o \
-	corelib_generic_icon.o \
-	corelib_generic_imaglist.o \
-	corelib_mask.o \
-	corelib_generic_timer.o \
-	corelib_mgl_app.o \
-	corelib_mgl_bitmap.o \
-	corelib_mgl_brush.o \
-	corelib_mgl_clipbrd.o \
-	corelib_mgl_cursor.o \
-	corelib_mgl_data.o \
-	corelib_mgl_dc.o \
-	corelib_mgl_dcclient.o \
-	corelib_mgl_dcmemory.o \
-	corelib_mgl_dcscreen.o \
-	corelib_dirmgl.o \
-	corelib_mgl_evtloop.o \
-	corelib_mgl_font.o \
-	corelib_mgl_fontenum.o \
-	corelib_mgl_fontmgr.o \
-	corelib_mgl_fontutil.o \
-	corelib_mgl_palette.o \
-	corelib_mgl_pen.o \
-	corelib_mgl_region.o \
-	corelib_mgl_settings.o \
-	corelib_mgl_toplevel.o \
-	corelib_mgl_utils.o \
-	corelib_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
@@ -11546,7 +11294,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_dfb_evtloop.o \
 	corelib_dfb_font.o \
 	corelib_dfb_fontenum.o \
-	corelib_dfb_fontmgr.o \
+	corelib_fontmgr.o \
 	corelib_dfb_nonownedwnd.o \
 	corelib_dfb_overlay.o \
 	corelib_dfb_pen.o \
@@ -11642,38 +11390,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_gtk_win_gtk.o \
 	corelib_gtk_window.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7)
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
-	corelib_fontmgrcmn.o \
-	corelib_generic_caret.o \
-	corelib_generic_colour.o \
-	corelib_generic_icon.o \
-	corelib_generic_imaglist.o \
-	corelib_mask.o \
-	corelib_generic_timer.o \
-	corelib_mgl_app.o \
-	corelib_mgl_bitmap.o \
-	corelib_mgl_brush.o \
-	corelib_mgl_clipbrd.o \
-	corelib_mgl_cursor.o \
-	corelib_mgl_data.o \
-	corelib_mgl_dc.o \
-	corelib_mgl_dcclient.o \
-	corelib_mgl_dcmemory.o \
-	corelib_mgl_dcscreen.o \
-	corelib_dirmgl.o \
-	corelib_mgl_evtloop.o \
-	corelib_mgl_font.o \
-	corelib_mgl_fontenum.o \
-	corelib_mgl_fontmgr.o \
-	corelib_mgl_fontutil.o \
-	corelib_mgl_palette.o \
-	corelib_mgl_pen.o \
-	corelib_mgl_region.o \
-	corelib_mgl_settings.o \
-	corelib_mgl_toplevel.o \
-	corelib_mgl_utils.o \
-	corelib_mgl_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
@@ -13336,12 +13052,6 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS =  \
 	monodll_core_timer.o \
 	monodll_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS)
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-	monodll_taskbarcmn.o \
-	monodll_unix_joystick.o \
-	monodll_unix_sound.o \
-	monodll_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_src_cocoa_taskbar.o \
 	monodll_taskbarcmn.o \
@@ -13528,12 +13238,6 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_27 =  \
 	monolib_core_timer.o \
 	monolib_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_27 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_27)
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
-	monolib_taskbarcmn.o \
-	monolib_unix_joystick.o \
-	monolib_unix_sound.o \
-	monolib_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
 	monolib_src_cocoa_taskbar.o \
 	monolib_taskbarcmn.o \
@@ -13818,12 +13522,6 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_2_2 =  \
 	corelib_core_timer.o \
 	corelib_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_2_2 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_2_2)
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-	advdll_taskbarcmn.o \
-	advdll_unix_joystick.o \
-	advdll_unix_sound.o \
-	advdll_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
 	advdll_src_cocoa_taskbar.o \
 	advdll_taskbarcmn.o \
@@ -13912,12 +13610,6 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
 	advdll_unix_sound.o \
 	advdll_taskbarx11.o
 @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-	advlib_taskbarcmn.o \
-	advlib_unix_joystick.o \
-	advlib_unix_sound.o \
-	advlib_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9)
 COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
 	advlib_src_cocoa_taskbar.o \
 	advlib_taskbarcmn.o \
@@ -17960,9 +17652,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
@@ -17984,9 +17673,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -18074,9 +17760,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
@@ -18809,9 +18492,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
 
@@ -18872,93 +18552,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
 
@@ -18992,7 +18594,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
 
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
 
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONODLL_ODEP)
@@ -20804,9 +20406,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -20954,9 +20553,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -20969,9 +20565,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -20984,9 +20577,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
 
@@ -23360,9 +22950,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
@@ -23384,9 +22971,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -23474,9 +23058,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
@@ -24209,9 +23790,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
 
@@ -24272,93 +23850,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
 
@@ -24392,7 +23892,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
 
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
 
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONOLIB_ODEP)
@@ -26204,9 +25704,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -26354,9 +25851,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -26369,9 +25863,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -26384,9 +25875,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
 
@@ -28922,9 +28410,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
@@ -28946,9 +28431,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -29036,9 +28518,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
@@ -29771,9 +29250,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
 
@@ -29834,93 +29310,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
 
@@ -29954,7 +29352,7 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
 
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
 
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(COREDLL_ODEP)
@@ -32936,9 +32334,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
@@ -32960,9 +32355,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -33050,9 +32442,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
@@ -33785,9 +33174,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
-
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
 
@@ -33848,93 +33234,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
-
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
 
@@ -33968,7 +33276,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
 
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
 
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(CORELIB_ODEP)
@@ -35804,9 +35112,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
 @COND_TOOLKIT_MSW@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -35954,9 +35259,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
 @COND_TOOLKIT_MOTIF@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -35969,9 +35271,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
 @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -35984,9 +35283,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
 
@@ -36203,9 +35499,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
 @COND_TOOLKIT_MSW@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -36353,9 +35646,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
 @COND_TOOLKIT_MOTIF@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -36368,9 +35658,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
 @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -36383,9 +35670,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
 
@@ -37555,7 +36839,6 @@ GTKDIR   = $(WXDIR)/src/gtk
 GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
-MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
@@ -38023,16 +37306,6 @@ UNIV_DIST: ALL_GUI_DIST
 	$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
 
-MGL_DIST: UNIV_DIST
-	$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
-	$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
-	mkdir $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
-	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
-	mkdir $(DISTDIR)/src/msdos
-	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index fd83cb7bd0..3cbfcc3e36 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -548,18 +548,6 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../de
         COND_PLATFORM_UNIX_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
-    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -764,18 +752,6 @@ dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/
         COND_TOOLKIT_MAC=""
     fi
     AC_SUBST(COND_TOOLKIT_MAC)
-dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
-    COND_TOOLKIT_MGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MGL)
-dnl ### begin block 20_COND_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
     COND_TOOLKIT_MOTIF="#"
     if test "x$TOOLKIT" = "xMOTIF" ; then
diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 808e249cb4..f606fb54e8 100644
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -9,7 +9,7 @@
     -->
 
     <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
-              TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+              TOOLKIT in ['PM','MSW','MOTIF']">
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 6d139f0137..4570a669ae 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -493,13 +493,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
     </set>
 
-    <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
-        <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
-        <set var="MGLPMLIBPATH">
-            <if cond="DOS32=='DOS4GW'">dos4gw</if>
-        </set>
-    </if>
-
     <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
@@ -515,10 +508,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
         <lib-path>$(LIBDIRNAME)</lib-path>
-        <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
-            <lib-path>$(MGLLIBPATH)</lib-path>
-            <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
-        </if>
 
         <warnings>max</warnings>
         <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
@@ -549,13 +538,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             </if>
         </if>
 
-        <!-- system libraries on mgl: -->
-        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
-            <sys-lib>mgl</sys-lib>
-            <sys-lib>mglcpp</sys-lib>
-            <sys-lib>pm</sys-lib>
-        </if>
-
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
@@ -632,7 +614,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <define>WXBUILDING</define>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
                 <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/common/dummy.cpp
@@ -705,9 +687,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </template>
 
     <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
-        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
-            <include>$(DOLLAR)(%SCITECH)/include</include>
-        </if>
         <include>$(INC_TIFF_BUILD)</include>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 28f74af6a5..19fee62899 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -430,7 +430,6 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
-            <if cond="PLATFORM_MSDOS=='1'">MGL</if>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
@@ -532,11 +531,4 @@ Set the version of your Mingw installation here.
         </if>
     </if>
 
-    <!-- Need for wxUniv within wxMGL: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
-        <set var="WXUNIV">1</set>
-        <set var="USE_THREADS">0</set>
-        <set var="RUNTIME_LIBS">static</set>
-    </if>
-
 </makefile>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ab7999498b..13ce7bb7f2 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1935,69 +1935,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
-<!-- ====================================================================== -->
-<!--                                wxMGL                                   -->
-<!-- ====================================================================== -->
-
-<set var="MGL_LOWLEVEL_SRC" hints="files">
-    src/common/fontmgrcmn.cpp
-    src/generic/caret.cpp
-    src/generic/colour.cpp
-    src/generic/icon.cpp
-    src/generic/imaglist.cpp
-    src/generic/mask.cpp
-    src/generic/timer.cpp
-    src/mgl/app.cpp
-    src/mgl/bitmap.cpp
-    src/mgl/brush.cpp
-    src/mgl/clipbrd.cpp
-    src/mgl/cursor.cpp
-    src/mgl/data.cpp
-    src/mgl/dc.cpp
-    src/mgl/dcclient.cpp
-    src/mgl/dcmemory.cpp
-    src/mgl/dcscreen.cpp
-    src/mgl/dirmgl.cpp
-    src/mgl/evtloop.cpp
-    src/mgl/font.cpp
-    src/mgl/fontenum.cpp
-    src/mgl/fontmgr.cpp
-    src/mgl/fontutil.cpp
-    src/mgl/palette.cpp
-    src/mgl/pen.cpp
-    src/mgl/region.cpp
-    src/mgl/settings.cpp
-    src/mgl/toplevel.cpp
-    src/mgl/utils.cpp
-    src/mgl/window.cpp
-</set>
-<set var="MGL_LOWLEVEL_HDR" hints="files">
-    wx/generic/caret.h
-    wx/generic/colour.h
-    wx/generic/icon.h
-    wx/generic/imaglist.h
-    wx/generic/mask.h
-    wx/mgl/app.h
-    wx/mgl/bitmap.h
-    wx/mgl/brush.h
-    wx/mgl/chkconf.h
-    wx/mgl/clipbrd.h
-    wx/mgl/cursor.h
-    wx/mgl/dc.h
-    wx/mgl/dcclient.h
-    wx/mgl/dcmemory.h
-    wx/mgl/dcscreen.h
-    wx/mgl/font.h
-    wx/mgl/palette.h
-    wx/mgl/pen.h
-    wx/mgl/popupwin.h
-    wx/mgl/private.h
-    wx/mgl/region.h
-    wx/mgl/toplevel.h
-    wx/mgl/window.h
-</set>
-
-
 <!-- ====================================================================== -->
 <!--                                wxDFB                                   -->
 <!-- ====================================================================== -->
@@ -3840,7 +3777,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
@@ -3855,7 +3791,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
 
@@ -3910,7 +3845,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3924,7 +3858,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index c87e5a7097..b7b67dff2a 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -29,7 +29,6 @@ GTKDIR   = $(WXDIR)/src/gtk
 GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
-MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
@@ -497,16 +496,6 @@ UNIV_DIST: ALL_GUI_DIST
 	$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
 
-MGL_DIST: UNIV_DIST
-	$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
-	$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
-	mkdir $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
-	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
-	mkdir $(DISTDIR)/src/msdos
-	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index ce138b6daf..3458143df4 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MOTIF']">../../samples</dir>
     </subproject>
 
     <if cond="FORMAT=='autoconf'">
@@ -178,7 +178,7 @@
 
 
     <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
-    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MOTIF']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index 278aa06a63..870ad5f684 100644
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -80,7 +80,7 @@ Format-specific notes:
             $(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
         </set>
         <option name="WX_PORT">
-            <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
+            <values>gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb</values>
             <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
             <description>
                 Port of the wx library to build against
diff --git a/build/mgl/Bakefiles.mgl.bkgen b/build/mgl/Bakefiles.mgl.bkgen
deleted file mode 100644
index c26407c352..0000000000
--- a/build/mgl/Bakefiles.mgl.bkgen
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<bakefile-gen>
-
-    <!--
-
-    This file contains eperimental build specification for wxMGL port
-    build with Open Watcom for DOS extenders. In order to get complete
-    build, please setup:
-
-      1. wxWidgets CVS Head
-      2. SCITECH/MGL toolkit
-      3. OpenWatcom compiler
-      4. Bakefile later than 0.1.9.1 (CVS at time of writing this)
-
-    To get Open Watcom makefiles for wxMGL port: open console under Windows,
-    setup environment for toolkits listed above and then run:
-
-      cd %WXWIN%\build\bakefiles
-      bakefile_gen -f watcom -d ../mgl/Bakefiles.mgl.bkgen
-
-      cd %WXWIN%\build\mgl
-      wmake -h -f makefile.wat
-
-      cd %WXWIN%\samples\minimal
-      wmake -h -f makefile.wat
-
-    Default build settings are located in %WXWIN%\build\mgl\config.wat
-
-    Note that currently you can't have watcom makefiles for building samples
-    for different platforms in the same tree.
-
-    -->
-
-    <add-flags formats="watcom">
-        -DPLATFORM_MSDOS=1
-    </add-flags>
-
-    <include file="../bakefiles/Bakefiles.bkgen"/>
-
-    <add-flags files="wx.bkl" formats="watcom">
-        -o../mgl/makefile.wat
-    </add-flags>
-
-    <add-flags files="../bakefiles/wx.bkl" formats="watcom">
-        -DOPTIONS_FILE=config.wat
-    </add-flags>
-    <add-flags files="../../*/*" formats="watcom">
-        -DOPTIONS_FILE=../build/mgl/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../build/mgl/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../build/mgl/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../../build/mgl/config.wat
-    </add-flags>
-
-</bakefile-gen>
diff --git a/build/mgl/config.wat b/build/mgl/config.wat
deleted file mode 100644
index 14aee0c130..0000000000
--- a/build/mgl/config.wat
+++ /dev/null
@@ -1,127 +0,0 @@
-# =========================================================================
-#     This configuration file was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Beware that all changes made to this file will be overwritten next
-#     time you run Bakefile!
-# =========================================================================
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# DOS32 mode/extender [X32VM,X32,PMODEW,CAUSEWAY,DOS32A,DOS4GW]
-#   X32VM - FlashTek X-32VM DOS extender
-#   X32 - FlashTek X-32 DOS extender
-#   PMODEW - PMODE/W
-#   CAUSEWAY - CauseWay DOS extender
-#   DOS32A - DOS32/A
-#   DOS4GW - Tenberry/Watcom 32-bit DOS extender
-DOS32 = DOS4GW
-
-# C compiler 
-CC = wcc386
-
-# C++ compiler 
-CXX = wpp386
-
-# Standard flags for CC 
-CFLAGS = 
-
-# Standard flags for C++ 
-CXXFLAGS = 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
-
-# Standard linker flags 
-LDFLAGS = 
-
-# The C preprocessor 
-CPP = $(CC) -p
-
-# What type of library to build? [0,1]
-#   1 - DLL
-SHARED = 0
-
-# Compile Unicode build of wxWidgets? [0,1]
-#   1 - Unicode
-UNICODE = 0
-
-# Type of compiled binaries [debug,release]
-BUILD = debug
-
-# Should debugging info be included in the executables? The default value
-# "default" means that debug info will be included if BUILD=debug
-# and not included if BUILD=release. [0,1,default]
-DEBUG_INFO = default
-
-# Should __WXDEBUG__ be defined? The default value "default" means that it will
-# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
-DEBUG_FLAG = default
-
-# Multiple libraries or single huge monolithic one? [0,1]
-#   0 - Multilib
-#   1 - Monolithic
-MONOLITHIC = 1
-
-# Build GUI libraries? [0,1]
-#   0 - Base
-#   1 - GUI
-USE_GUI = 1
-
-# Build wxHTML library (USE_GUI must be 1)? [0,1]
-USE_HTML = 1
-
-# Build multimedia library (USE_GUI must be 1)? [0,1]
-USE_MEDIA = 1
-
-# Build wxXRC library (USE_GUI must be 1)? [0,1]
-USE_XRC = 1
-
-# Build wxAUI library (USE_GUI must be 1)? [0,1]
-USE_AUI = 1
-
-# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_RICHTEXT = 1
-
-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-USE_OPENGL = 0
-
-# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA = 0
-
-# Enable exceptions in compiled code. [0,1]
-USE_EXCEPTIONS = 1
-
-# Enable run-time type information (RTTI) in compiled code. [0,1]
-USE_RTTI = 1
-
-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
-USE_GDIPLUS = 0
-
-# Is this official build by wxWidgets developers? [0,1]
-OFFICIAL_BUILD = 0
-
-# Use this to name your customized DLLs differently 
-VENDOR = custom
-
-#  
-WX_FLAVOUR = 
-
-#  
-WX_LIB_FLAVOUR = 
-
-# Name of your custom configuration. This affects directory
-# where object files are stored as well as the location of
-# compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG = 
-
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS = 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS = 
-
diff --git a/build/mgl/makefile.wat b/build/mgl/makefile.wat
deleted file mode 100644
index 4a8d116cf7..0000000000
--- a/build/mgl/makefile.wat
+++ /dev/null
@@ -1,8291 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = mgl
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = mgl_lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = mgl_dll
-!endif
-__wxpng___depname =
-!ifeq USE_GUI 1
-__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
-!endif
-__wxjpeg___depname =
-!ifeq USE_GUI 1
-__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__wxtiff___depname =
-!ifeq USE_GUI 1
-__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE = 
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
-!endif
-__monodll___depname =
-!ifeq MONOLITHIC 1
-!ifeq SHARED 1
-__monodll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll
-!endif
-!endif
-____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
-!ifeq USE_GUI 1
-____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
-	$(____CORE_SRC_FILENAMES_OBJECTS) &
-	$(OBJS)\monodll_animatecmn.obj &
-	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_aboutdlgg.obj &
-	$(OBJS)\monodll_animateg.obj &
-	$(OBJS)\monodll_bmpcboxg.obj &
-	$(OBJS)\monodll_calctrl.obj &
-	$(OBJS)\monodll_datavgen.obj &
-	$(OBJS)\monodll_datectlg.obj &
-	$(OBJS)\monodll_grid.obj &
-	$(OBJS)\monodll_gridctrl.obj &
-	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_hyperlink.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_odcombo.obj &
-	$(OBJS)\monodll_propdlg.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_mediactrlcmn.obj &
-	$(OBJS)\monodll_helpctrl.obj &
-	$(OBJS)\monodll_helpdata.obj &
-	$(OBJS)\monodll_helpdlg.obj &
-	$(OBJS)\monodll_helpfrm.obj &
-	$(OBJS)\monodll_helpwnd.obj &
-	$(OBJS)\monodll_htmlcell.obj &
-	$(OBJS)\monodll_htmlfilt.obj &
-	$(OBJS)\monodll_htmlpars.obj &
-	$(OBJS)\monodll_htmltag.obj &
-	$(OBJS)\monodll_htmlwin.obj &
-	$(OBJS)\monodll_htmprint.obj &
-	$(OBJS)\monodll_m_dflist.obj &
-	$(OBJS)\monodll_m_fonts.obj &
-	$(OBJS)\monodll_m_hline.obj &
-	$(OBJS)\monodll_m_image.obj &
-	$(OBJS)\monodll_m_layout.obj &
-	$(OBJS)\monodll_m_links.obj &
-	$(OBJS)\monodll_m_list.obj &
-	$(OBJS)\monodll_m_pre.obj &
-	$(OBJS)\monodll_m_style.obj &
-	$(OBJS)\monodll_m_tables.obj &
-	$(OBJS)\monodll_winpars.obj &
-	$(OBJS)\monodll_htmllbox.obj &
-	$(OBJS)\monodll_debugrpt.obj &
-	$(OBJS)\monodll_dbgrptg.obj &
-	$(OBJS)\monodll_xh_animatctrl.obj &
-	$(OBJS)\monodll_xh_bmp.obj &
-	$(OBJS)\monodll_xh_bmpcbox.obj &
-	$(OBJS)\monodll_xh_bmpbt.obj &
-	$(OBJS)\monodll_xh_bttn.obj &
-	$(OBJS)\monodll_xh_cald.obj &
-	$(OBJS)\monodll_xh_chckb.obj &
-	$(OBJS)\monodll_xh_chckl.obj &
-	$(OBJS)\monodll_xh_choic.obj &
-	$(OBJS)\monodll_xh_choicbk.obj &
-	$(OBJS)\monodll_xh_clrpicker.obj &
-	$(OBJS)\monodll_xh_collpane.obj &
-	$(OBJS)\monodll_xh_combo.obj &
-	$(OBJS)\monodll_xh_datectrl.obj &
-	$(OBJS)\monodll_xh_dirpicker.obj &
-	$(OBJS)\monodll_xh_dlg.obj &
-	$(OBJS)\monodll_xh_frame.obj &
-	$(OBJS)\monodll_xh_mdi.obj &
-	$(OBJS)\monodll_xh_filepicker.obj &
-	$(OBJS)\monodll_xh_fontpicker.obj &
-	$(OBJS)\monodll_xh_gauge.obj &
-	$(OBJS)\monodll_xh_gdctl.obj &
-	$(OBJS)\monodll_xh_grid.obj &
-	$(OBJS)\monodll_xh_html.obj &
-	$(OBJS)\monodll_xh_hyperlink.obj &
-	$(OBJS)\monodll_xh_listb.obj &
-	$(OBJS)\monodll_xh_listbk.obj &
-	$(OBJS)\monodll_xh_listc.obj &
-	$(OBJS)\monodll_xh_menu.obj &
-	$(OBJS)\monodll_xh_notbk.obj &
-	$(OBJS)\monodll_xh_odcombo.obj &
-	$(OBJS)\monodll_xh_panel.obj &
-	$(OBJS)\monodll_xh_radbt.obj &
-	$(OBJS)\monodll_xh_radbx.obj &
-	$(OBJS)\monodll_xh_scrol.obj &
-	$(OBJS)\monodll_xh_scwin.obj &
-	$(OBJS)\monodll_xh_htmllbox.obj &
-	$(OBJS)\monodll_xh_sizer.obj &
-	$(OBJS)\monodll_xh_slidr.obj &
-	$(OBJS)\monodll_xh_spin.obj &
-	$(OBJS)\monodll_xh_split.obj &
-	$(OBJS)\monodll_xh_statbar.obj &
-	$(OBJS)\monodll_xh_stbmp.obj &
-	$(OBJS)\monodll_xh_stbox.obj &
-	$(OBJS)\monodll_xh_stlin.obj &
-	$(OBJS)\monodll_xh_sttxt.obj &
-	$(OBJS)\monodll_xh_text.obj &
-	$(OBJS)\monodll_xh_tglbtn.obj &
-	$(OBJS)\monodll_xh_toolb.obj &
-	$(OBJS)\monodll_xh_tree.obj &
-	$(OBJS)\monodll_xh_treebk.obj &
-	$(OBJS)\monodll_xh_unkwn.obj &
-	$(OBJS)\monodll_xh_wizrd.obj &
-	$(OBJS)\monodll_xmlres.obj &
-	$(OBJS)\monodll_xmlrsall.obj &
-	$(OBJS)\monodll_framemanager.obj &
-	$(OBJS)\monodll_dockart.obj &
-	$(OBJS)\monodll_floatpane.obj &
-	$(OBJS)\monodll_auibook.obj &
-	$(OBJS)\monodll_tabmdi.obj &
-	$(OBJS)\monodll_richtextctrl.obj &
-	$(OBJS)\monodll_richtextbuffer.obj &
-	$(OBJS)\monodll_richtextstyles.obj &
-	$(OBJS)\monodll_richtextxml.obj &
-	$(OBJS)\monodll_richtexthtml.obj &
-	$(OBJS)\monodll_richtextformatdlg.obj &
-	$(OBJS)\monodll_richtextsymboldlg.obj &
-	$(OBJS)\monodll_richtextstyledlg.obj &
-	$(OBJS)\monodll_richtextprint.obj
-!endif
-____CORE_SRC_FILENAMES_OBJECTS =
-!ifeq USE_GUI 1
-____CORE_SRC_FILENAMES_OBJECTS =  &
-	$(OBJS)\monodll_caret.obj &
-	$(OBJS)\monodll_colour.obj &
-	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_mask.obj &
-	$(OBJS)\monodll_timer.obj &
-	$(OBJS)\monodll_app.obj &
-	$(OBJS)\monodll_bitmap.obj &
-	$(OBJS)\monodll_brush.obj &
-	$(OBJS)\monodll_clipbrd.obj &
-	$(OBJS)\monodll_cursor.obj &
-	$(OBJS)\monodll_data.obj &
-	$(OBJS)\monodll_dc.obj &
-	$(OBJS)\monodll_dcclient.obj &
-	$(OBJS)\monodll_dcmemory.obj &
-	$(OBJS)\monodll_dcscreen.obj &
-	$(OBJS)\monodll_dirmgl.obj &
-	$(OBJS)\monodll_evtloop.obj &
-	$(OBJS)\monodll_font.obj &
-	$(OBJS)\monodll_fontenum.obj &
-	$(OBJS)\monodll_fontutil.obj &
-	$(OBJS)\monodll_palette.obj &
-	$(OBJS)\monodll_pen.obj &
-	$(OBJS)\monodll_region.obj &
-	$(OBJS)\monodll_settings.obj &
-	$(OBJS)\monodll_toplevel.obj &
-	$(OBJS)\monodll_utils.obj &
-	$(OBJS)\monodll_window.obj &
-	$(OBJS)\monodll_accel.obj &
-	$(OBJS)\monodll_colrdlgg.obj &
-	$(OBJS)\monodll_dirdlgg.obj &
-	$(OBJS)\monodll_fdrepdlg.obj &
-	$(OBJS)\monodll_filedlgg.obj &
-	$(OBJS)\monodll_fontdlgg.obj &
-	$(OBJS)\monodll_listctrl.obj &
-	$(OBJS)\monodll_mdig.obj &
-	$(OBJS)\monodll_msgdlgg.obj &
-	$(OBJS)\monodll_prntdlgg.obj &
-	$(OBJS)\monodll_tabg.obj &
-	$(OBJS)\monodll_bmpbuttn.obj &
-	$(OBJS)\monodll_button.obj &
-	$(OBJS)\monodll_checkbox.obj &
-	$(OBJS)\monodll_checklst.obj &
-	$(OBJS)\monodll_choice.obj &
-	$(OBJS)\monodll_colschem.obj &
-	$(OBJS)\monodll_combobox.obj &
-	$(OBJS)\monodll_control.obj &
-	$(OBJS)\monodll_ctrlrend.obj &
-	$(OBJS)\monodll_dialog.obj &
-	$(OBJS)\monodll_framuniv.obj &
-	$(OBJS)\monodll_gauge.obj &
-	$(OBJS)\monodll_inpcons.obj &
-	$(OBJS)\monodll_inphand.obj &
-	$(OBJS)\monodll_listbox.obj &
-	$(OBJS)\monodll_menu.obj &
-	$(OBJS)\monodll_notebook.obj &
-	$(OBJS)\monodll_radiobox.obj &
-	$(OBJS)\monodll_radiobut.obj &
-	$(OBJS)\monodll_scrarrow.obj &
-	$(OBJS)\monodll_scrolbar.obj &
-	$(OBJS)\monodll_scrthumb.obj &
-	$(OBJS)\monodll_slider.obj &
-	$(OBJS)\monodll_spinbutt.obj &
-	$(OBJS)\monodll_statbmp.obj &
-	$(OBJS)\monodll_statbox.obj &
-	$(OBJS)\monodll_statline.obj &
-	$(OBJS)\monodll_stattext.obj &
-	$(OBJS)\monodll_statusbr.obj &
-	$(OBJS)\monodll_stdrend.obj &
-	$(OBJS)\monodll_textctrl.obj &
-	$(OBJS)\monodll_tglbtn.obj &
-	$(OBJS)\monodll_theme.obj &
-	$(OBJS)\monodll_toolbar.obj &
-	$(OBJS)\monodll_topluniv.obj &
-	$(OBJS)\monodll_winuniv.obj &
-	$(OBJS)\monodll_gtk.obj &
-	$(OBJS)\monodll_metal.obj &
-	$(OBJS)\monodll_mono.obj &
-	$(OBJS)\monodll_win32.obj &
-	$(OBJS)\monodll_accesscmn.obj &
-	$(OBJS)\monodll_anidecod.obj &
-	$(OBJS)\monodll_appcmn.obj &
-	$(OBJS)\monodll_artprov.obj &
-	$(OBJS)\monodll_artstd.obj &
-	$(OBJS)\monodll_bmpbase.obj &
-	$(OBJS)\monodll_bookctrl.obj &
-	$(OBJS)\monodll_choiccmn.obj &
-	$(OBJS)\monodll_clipcmn.obj &
-	$(OBJS)\monodll_clrpickercmn.obj &
-	$(OBJS)\monodll_colourcmn.obj &
-	$(OBJS)\monodll_combocmn.obj &
-	$(OBJS)\monodll_cmdproc.obj &
-	$(OBJS)\monodll_cmndata.obj &
-	$(OBJS)\monodll_containr.obj &
-	$(OBJS)\monodll_cshelp.obj &
-	$(OBJS)\monodll_ctrlcmn.obj &
-	$(OBJS)\monodll_ctrlsub.obj &
-	$(OBJS)\monodll_datacmn.obj &
-	$(OBJS)\monodll_dcbase.obj &
-	$(OBJS)\monodll_dcbufcmn.obj &
-	$(OBJS)\monodll_dcgraph.obj &
-	$(OBJS)\monodll_dlgcmn.obj &
-	$(OBJS)\monodll_dndcmn.obj &
-	$(OBJS)\monodll_dobjcmn.obj &
-	$(OBJS)\monodll_docmdi.obj &
-	$(OBJS)\monodll_docview.obj &
-	$(OBJS)\monodll_dpycmn.obj &
-	$(OBJS)\monodll_dseldlg.obj &
-	$(OBJS)\monodll_effects.obj &
-	$(OBJS)\monodll_evtloopcmn.obj &
-	$(OBJS)\monodll_fddlgcmn.obj &
-	$(OBJS)\monodll_filepickercmn.obj &
-	$(OBJS)\monodll_fontpickercmn.obj &
-	$(OBJS)\monodll_fldlgcmn.obj &
-	$(OBJS)\monodll_fontcmn.obj &
-	$(OBJS)\monodll_fontenumcmn.obj &
-	$(OBJS)\monodll_fontmap.obj &
-	$(OBJS)\monodll_framecmn.obj &
-	$(OBJS)\monodll_gaugecmn.obj &
-	$(OBJS)\monodll_gbsizer.obj &
-	$(OBJS)\monodll_gdicmn.obj &
-	$(OBJS)\monodll_geometry.obj &
-	$(OBJS)\monodll_gifdecod.obj &
-	$(OBJS)\monodll_graphcmn.obj &
-	$(OBJS)\monodll_helpbase.obj &
-	$(OBJS)\monodll_iconbndl.obj &
-	$(OBJS)\monodll_imagall.obj &
-	$(OBJS)\monodll_imagbmp.obj &
-	$(OBJS)\monodll_image.obj &
-	$(OBJS)\monodll_imagfill.obj &
-	$(OBJS)\monodll_imaggif.obj &
-	$(OBJS)\monodll_imagiff.obj &
-	$(OBJS)\monodll_imagjpeg.obj &
-	$(OBJS)\monodll_imagpcx.obj &
-	$(OBJS)\monodll_imagpng.obj &
-	$(OBJS)\monodll_imagpnm.obj &
-	$(OBJS)\monodll_imagtga.obj &
-	$(OBJS)\monodll_imagtiff.obj &
-	$(OBJS)\monodll_imagxpm.obj &
-	$(OBJS)\monodll_layout.obj &
-	$(OBJS)\monodll_lboxcmn.obj &
-	$(OBJS)\monodll_listctrlcmn.obj &
-	$(OBJS)\monodll_matrix.obj &
-	$(OBJS)\monodll_menucmn.obj &
-	$(OBJS)\monodll_nbkbase.obj &
-	$(OBJS)\monodll_overlaycmn.obj &
-	$(OBJS)\monodll_paper.obj &
-	$(OBJS)\monodll_pickerbase.obj &
-	$(OBJS)\monodll_popupcmn.obj &
-	$(OBJS)\monodll_prntbase.obj &
-	$(OBJS)\monodll_quantize.obj &
-	$(OBJS)\monodll_radiocmn.obj &
-	$(OBJS)\monodll_rendcmn.obj &
-	$(OBJS)\monodll_rgncmn.obj &
-	$(OBJS)\monodll_settcmn.obj &
-	$(OBJS)\monodll_sizer.obj &
-	$(OBJS)\monodll_statbar.obj &
-	$(OBJS)\monodll_stockitem.obj &
-	$(OBJS)\monodll_tbarbase.obj &
-	$(OBJS)\monodll_textcmn.obj &
-	$(OBJS)\monodll_timercmn.obj &
-	$(OBJS)\monodll_toplvcmn.obj &
-	$(OBJS)\monodll_treebase.obj &
-	$(OBJS)\monodll_valgen.obj &
-	$(OBJS)\monodll_validate.obj &
-	$(OBJS)\monodll_valtext.obj &
-	$(OBJS)\monodll_wincmn.obj &
-	$(OBJS)\monodll_xpmdecod.obj &
-	$(OBJS)\monodll_busyinfo.obj &
-	$(OBJS)\monodll_buttonbar.obj &
-	$(OBJS)\monodll_choicdgg.obj &
-	$(OBJS)\monodll_choicbkg.obj &
-	$(OBJS)\monodll_clrpickerg.obj &
-	$(OBJS)\monodll_collpaneg.obj &
-	$(OBJS)\monodll_combog.obj &
-	$(OBJS)\monodll_dcpsg.obj &
-	$(OBJS)\monodll_dirctrlg.obj &
-	$(OBJS)\monodll_dragimgg.obj &
-	$(OBJS)\monodll_filepickerg.obj &
-	$(OBJS)\monodll_fontpickerg.obj &
-	$(OBJS)\monodll_listbkg.obj &
-	$(OBJS)\monodll_logg.obj &
-	$(OBJS)\monodll_numdlgg.obj &
-	$(OBJS)\monodll_panelg.obj &
-	$(OBJS)\monodll_progdlgg.obj &
-	$(OBJS)\monodll_printps.obj &
-	$(OBJS)\monodll_renderg.obj &
-	$(OBJS)\monodll_scrlwing.obj &
-	$(OBJS)\monodll_selstore.obj &
-	$(OBJS)\monodll_spinctlg.obj &
-	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_textdlgg.obj &
-	$(OBJS)\monodll_tipwin.obj &
-	$(OBJS)\monodll_toolbkg.obj &
-	$(OBJS)\monodll_treectlg.obj &
-	$(OBJS)\monodll_treebkg.obj &
-	$(OBJS)\monodll_vlbox.obj &
-	$(OBJS)\monodll_vscroll.obj
-!endif
-__monolib___depname =
-!ifeq MONOLITHIC 1
-!ifeq SHARED 0
-__monolib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!endif
-____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
-!ifeq USE_GUI 1
-____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
-	$(____CORE_SRC_FILENAMES_1_OBJECTS) &
-	$(OBJS)\monolib_animatecmn.obj &
-	$(OBJS)\monolib_datavcmn.obj &
-	$(OBJS)\monolib_aboutdlgg.obj &
-	$(OBJS)\monolib_animateg.obj &
-	$(OBJS)\monolib_bmpcboxg.obj &
-	$(OBJS)\monolib_calctrl.obj &
-	$(OBJS)\monolib_datavgen.obj &
-	$(OBJS)\monolib_datectlg.obj &
-	$(OBJS)\monolib_grid.obj &
-	$(OBJS)\monolib_gridctrl.obj &
-	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_hyperlink.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_odcombo.obj &
-	$(OBJS)\monolib_propdlg.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_mediactrlcmn.obj &
-	$(OBJS)\monolib_helpctrl.obj &
-	$(OBJS)\monolib_helpdata.obj &
-	$(OBJS)\monolib_helpdlg.obj &
-	$(OBJS)\monolib_helpfrm.obj &
-	$(OBJS)\monolib_helpwnd.obj &
-	$(OBJS)\monolib_htmlcell.obj &
-	$(OBJS)\monolib_htmlfilt.obj &
-	$(OBJS)\monolib_htmlpars.obj &
-	$(OBJS)\monolib_htmltag.obj &
-	$(OBJS)\monolib_htmlwin.obj &
-	$(OBJS)\monolib_htmprint.obj &
-	$(OBJS)\monolib_m_dflist.obj &
-	$(OBJS)\monolib_m_fonts.obj &
-	$(OBJS)\monolib_m_hline.obj &
-	$(OBJS)\monolib_m_image.obj &
-	$(OBJS)\monolib_m_layout.obj &
-	$(OBJS)\monolib_m_links.obj &
-	$(OBJS)\monolib_m_list.obj &
-	$(OBJS)\monolib_m_pre.obj &
-	$(OBJS)\monolib_m_style.obj &
-	$(OBJS)\monolib_m_tables.obj &
-	$(OBJS)\monolib_winpars.obj &
-	$(OBJS)\monolib_htmllbox.obj &
-	$(OBJS)\monolib_debugrpt.obj &
-	$(OBJS)\monolib_dbgrptg.obj &
-	$(OBJS)\monolib_xh_animatctrl.obj &
-	$(OBJS)\monolib_xh_bmp.obj &
-	$(OBJS)\monolib_xh_bmpcbox.obj &
-	$(OBJS)\monolib_xh_bmpbt.obj &
-	$(OBJS)\monolib_xh_bttn.obj &
-	$(OBJS)\monolib_xh_cald.obj &
-	$(OBJS)\monolib_xh_chckb.obj &
-	$(OBJS)\monolib_xh_chckl.obj &
-	$(OBJS)\monolib_xh_choic.obj &
-	$(OBJS)\monolib_xh_choicbk.obj &
-	$(OBJS)\monolib_xh_clrpicker.obj &
-	$(OBJS)\monolib_xh_collpane.obj &
-	$(OBJS)\monolib_xh_combo.obj &
-	$(OBJS)\monolib_xh_datectrl.obj &
-	$(OBJS)\monolib_xh_dirpicker.obj &
-	$(OBJS)\monolib_xh_dlg.obj &
-	$(OBJS)\monolib_xh_frame.obj &
-	$(OBJS)\monolib_xh_mdi.obj &
-	$(OBJS)\monolib_xh_filepicker.obj &
-	$(OBJS)\monolib_xh_fontpicker.obj &
-	$(OBJS)\monolib_xh_gauge.obj &
-	$(OBJS)\monolib_xh_gdctl.obj &
-	$(OBJS)\monolib_xh_grid.obj &
-	$(OBJS)\monolib_xh_html.obj &
-	$(OBJS)\monolib_xh_hyperlink.obj &
-	$(OBJS)\monolib_xh_listb.obj &
-	$(OBJS)\monolib_xh_listbk.obj &
-	$(OBJS)\monolib_xh_listc.obj &
-	$(OBJS)\monolib_xh_menu.obj &
-	$(OBJS)\monolib_xh_notbk.obj &
-	$(OBJS)\monolib_xh_odcombo.obj &
-	$(OBJS)\monolib_xh_panel.obj &
-	$(OBJS)\monolib_xh_radbt.obj &
-	$(OBJS)\monolib_xh_radbx.obj &
-	$(OBJS)\monolib_xh_scrol.obj &
-	$(OBJS)\monolib_xh_scwin.obj &
-	$(OBJS)\monolib_xh_htmllbox.obj &
-	$(OBJS)\monolib_xh_sizer.obj &
-	$(OBJS)\monolib_xh_slidr.obj &
-	$(OBJS)\monolib_xh_spin.obj &
-	$(OBJS)\monolib_xh_split.obj &
-	$(OBJS)\monolib_xh_statbar.obj &
-	$(OBJS)\monolib_xh_stbmp.obj &
-	$(OBJS)\monolib_xh_stbox.obj &
-	$(OBJS)\monolib_xh_stlin.obj &
-	$(OBJS)\monolib_xh_sttxt.obj &
-	$(OBJS)\monolib_xh_text.obj &
-	$(OBJS)\monolib_xh_tglbtn.obj &
-	$(OBJS)\monolib_xh_toolb.obj &
-	$(OBJS)\monolib_xh_tree.obj &
-	$(OBJS)\monolib_xh_treebk.obj &
-	$(OBJS)\monolib_xh_unkwn.obj &
-	$(OBJS)\monolib_xh_wizrd.obj &
-	$(OBJS)\monolib_xmlres.obj &
-	$(OBJS)\monolib_xmlrsall.obj &
-	$(OBJS)\monolib_framemanager.obj &
-	$(OBJS)\monolib_dockart.obj &
-	$(OBJS)\monolib_floatpane.obj &
-	$(OBJS)\monolib_auibook.obj &
-	$(OBJS)\monolib_tabmdi.obj &
-	$(OBJS)\monolib_richtextctrl.obj &
-	$(OBJS)\monolib_richtextbuffer.obj &
-	$(OBJS)\monolib_richtextstyles.obj &
-	$(OBJS)\monolib_richtextxml.obj &
-	$(OBJS)\monolib_richtexthtml.obj &
-	$(OBJS)\monolib_richtextformatdlg.obj &
-	$(OBJS)\monolib_richtextsymboldlg.obj &
-	$(OBJS)\monolib_richtextstyledlg.obj &
-	$(OBJS)\monolib_richtextprint.obj
-!endif
-____CORE_SRC_FILENAMES_1_OBJECTS =
-!ifeq USE_GUI 1
-____CORE_SRC_FILENAMES_1_OBJECTS =  &
-	$(OBJS)\monolib_caret.obj &
-	$(OBJS)\monolib_colour.obj &
-	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_mask.obj &
-	$(OBJS)\monolib_timer.obj &
-	$(OBJS)\monolib_app.obj &
-	$(OBJS)\monolib_bitmap.obj &
-	$(OBJS)\monolib_brush.obj &
-	$(OBJS)\monolib_clipbrd.obj &
-	$(OBJS)\monolib_cursor.obj &
-	$(OBJS)\monolib_data.obj &
-	$(OBJS)\monolib_dc.obj &
-	$(OBJS)\monolib_dcclient.obj &
-	$(OBJS)\monolib_dcmemory.obj &
-	$(OBJS)\monolib_dcscreen.obj &
-	$(OBJS)\monolib_dirmgl.obj &
-	$(OBJS)\monolib_evtloop.obj &
-	$(OBJS)\monolib_font.obj &
-	$(OBJS)\monolib_fontenum.obj &
-	$(OBJS)\monolib_fontutil.obj &
-	$(OBJS)\monolib_palette.obj &
-	$(OBJS)\monolib_pen.obj &
-	$(OBJS)\monolib_region.obj &
-	$(OBJS)\monolib_settings.obj &
-	$(OBJS)\monolib_toplevel.obj &
-	$(OBJS)\monolib_utils.obj &
-	$(OBJS)\monolib_window.obj &
-	$(OBJS)\monolib_accel.obj &
-	$(OBJS)\monolib_colrdlgg.obj &
-	$(OBJS)\monolib_dirdlgg.obj &
-	$(OBJS)\monolib_fdrepdlg.obj &
-	$(OBJS)\monolib_filedlgg.obj &
-	$(OBJS)\monolib_fontdlgg.obj &
-	$(OBJS)\monolib_listctrl.obj &
-	$(OBJS)\monolib_mdig.obj &
-	$(OBJS)\monolib_msgdlgg.obj &
-	$(OBJS)\monolib_prntdlgg.obj &
-	$(OBJS)\monolib_tabg.obj &
-	$(OBJS)\monolib_bmpbuttn.obj &
-	$(OBJS)\monolib_button.obj &
-	$(OBJS)\monolib_checkbox.obj &
-	$(OBJS)\monolib_checklst.obj &
-	$(OBJS)\monolib_choice.obj &
-	$(OBJS)\monolib_colschem.obj &
-	$(OBJS)\monolib_combobox.obj &
-	$(OBJS)\monolib_control.obj &
-	$(OBJS)\monolib_ctrlrend.obj &
-	$(OBJS)\monolib_dialog.obj &
-	$(OBJS)\monolib_framuniv.obj &
-	$(OBJS)\monolib_gauge.obj &
-	$(OBJS)\monolib_inpcons.obj &
-	$(OBJS)\monolib_inphand.obj &
-	$(OBJS)\monolib_listbox.obj &
-	$(OBJS)\monolib_menu.obj &
-	$(OBJS)\monolib_notebook.obj &
-	$(OBJS)\monolib_radiobox.obj &
-	$(OBJS)\monolib_radiobut.obj &
-	$(OBJS)\monolib_scrarrow.obj &
-	$(OBJS)\monolib_scrolbar.obj &
-	$(OBJS)\monolib_scrthumb.obj &
-	$(OBJS)\monolib_slider.obj &
-	$(OBJS)\monolib_spinbutt.obj &
-	$(OBJS)\monolib_statbmp.obj &
-	$(OBJS)\monolib_statbox.obj &
-	$(OBJS)\monolib_statline.obj &
-	$(OBJS)\monolib_stattext.obj &
-	$(OBJS)\monolib_statusbr.obj &
-	$(OBJS)\monolib_stdrend.obj &
-	$(OBJS)\monolib_textctrl.obj &
-	$(OBJS)\monolib_tglbtn.obj &
-	$(OBJS)\monolib_theme.obj &
-	$(OBJS)\monolib_toolbar.obj &
-	$(OBJS)\monolib_topluniv.obj &
-	$(OBJS)\monolib_winuniv.obj &
-	$(OBJS)\monolib_gtk.obj &
-	$(OBJS)\monolib_metal.obj &
-	$(OBJS)\monolib_mono.obj &
-	$(OBJS)\monolib_win32.obj &
-	$(OBJS)\monolib_accesscmn.obj &
-	$(OBJS)\monolib_anidecod.obj &
-	$(OBJS)\monolib_appcmn.obj &
-	$(OBJS)\monolib_artprov.obj &
-	$(OBJS)\monolib_artstd.obj &
-	$(OBJS)\monolib_bmpbase.obj &
-	$(OBJS)\monolib_bookctrl.obj &
-	$(OBJS)\monolib_choiccmn.obj &
-	$(OBJS)\monolib_clipcmn.obj &
-	$(OBJS)\monolib_clrpickercmn.obj &
-	$(OBJS)\monolib_colourcmn.obj &
-	$(OBJS)\monolib_combocmn.obj &
-	$(OBJS)\monolib_cmdproc.obj &
-	$(OBJS)\monolib_cmndata.obj &
-	$(OBJS)\monolib_containr.obj &
-	$(OBJS)\monolib_cshelp.obj &
-	$(OBJS)\monolib_ctrlcmn.obj &
-	$(OBJS)\monolib_ctrlsub.obj &
-	$(OBJS)\monolib_datacmn.obj &
-	$(OBJS)\monolib_dcbase.obj &
-	$(OBJS)\monolib_dcbufcmn.obj &
-	$(OBJS)\monolib_dcgraph.obj &
-	$(OBJS)\monolib_dlgcmn.obj &
-	$(OBJS)\monolib_dndcmn.obj &
-	$(OBJS)\monolib_dobjcmn.obj &
-	$(OBJS)\monolib_docmdi.obj &
-	$(OBJS)\monolib_docview.obj &
-	$(OBJS)\monolib_dpycmn.obj &
-	$(OBJS)\monolib_dseldlg.obj &
-	$(OBJS)\monolib_effects.obj &
-	$(OBJS)\monolib_evtloopcmn.obj &
-	$(OBJS)\monolib_fddlgcmn.obj &
-	$(OBJS)\monolib_filepickercmn.obj &
-	$(OBJS)\monolib_fontpickercmn.obj &
-	$(OBJS)\monolib_fldlgcmn.obj &
-	$(OBJS)\monolib_fontcmn.obj &
-	$(OBJS)\monolib_fontenumcmn.obj &
-	$(OBJS)\monolib_fontmap.obj &
-	$(OBJS)\monolib_framecmn.obj &
-	$(OBJS)\monolib_gaugecmn.obj &
-	$(OBJS)\monolib_gbsizer.obj &
-	$(OBJS)\monolib_gdicmn.obj &
-	$(OBJS)\monolib_geometry.obj &
-	$(OBJS)\monolib_gifdecod.obj &
-	$(OBJS)\monolib_graphcmn.obj &
-	$(OBJS)\monolib_helpbase.obj &
-	$(OBJS)\monolib_iconbndl.obj &
-	$(OBJS)\monolib_imagall.obj &
-	$(OBJS)\monolib_imagbmp.obj &
-	$(OBJS)\monolib_image.obj &
-	$(OBJS)\monolib_imagfill.obj &
-	$(OBJS)\monolib_imaggif.obj &
-	$(OBJS)\monolib_imagiff.obj &
-	$(OBJS)\monolib_imagjpeg.obj &
-	$(OBJS)\monolib_imagpcx.obj &
-	$(OBJS)\monolib_imagpng.obj &
-	$(OBJS)\monolib_imagpnm.obj &
-	$(OBJS)\monolib_imagtga.obj &
-	$(OBJS)\monolib_imagtiff.obj &
-	$(OBJS)\monolib_imagxpm.obj &
-	$(OBJS)\monolib_layout.obj &
-	$(OBJS)\monolib_lboxcmn.obj &
-	$(OBJS)\monolib_listctrlcmn.obj &
-	$(OBJS)\monolib_matrix.obj &
-	$(OBJS)\monolib_menucmn.obj &
-	$(OBJS)\monolib_nbkbase.obj &
-	$(OBJS)\monolib_overlaycmn.obj &
-	$(OBJS)\monolib_paper.obj &
-	$(OBJS)\monolib_pickerbase.obj &
-	$(OBJS)\monolib_popupcmn.obj &
-	$(OBJS)\monolib_prntbase.obj &
-	$(OBJS)\monolib_quantize.obj &
-	$(OBJS)\monolib_radiocmn.obj &
-	$(OBJS)\monolib_rendcmn.obj &
-	$(OBJS)\monolib_rgncmn.obj &
-	$(OBJS)\monolib_settcmn.obj &
-	$(OBJS)\monolib_sizer.obj &
-	$(OBJS)\monolib_statbar.obj &
-	$(OBJS)\monolib_stockitem.obj &
-	$(OBJS)\monolib_tbarbase.obj &
-	$(OBJS)\monolib_textcmn.obj &
-	$(OBJS)\monolib_timercmn.obj &
-	$(OBJS)\monolib_toplvcmn.obj &
-	$(OBJS)\monolib_treebase.obj &
-	$(OBJS)\monolib_valgen.obj &
-	$(OBJS)\monolib_validate.obj &
-	$(OBJS)\monolib_valtext.obj &
-	$(OBJS)\monolib_wincmn.obj &
-	$(OBJS)\monolib_xpmdecod.obj &
-	$(OBJS)\monolib_busyinfo.obj &
-	$(OBJS)\monolib_buttonbar.obj &
-	$(OBJS)\monolib_choicdgg.obj &
-	$(OBJS)\monolib_choicbkg.obj &
-	$(OBJS)\monolib_clrpickerg.obj &
-	$(OBJS)\monolib_collpaneg.obj &
-	$(OBJS)\monolib_combog.obj &
-	$(OBJS)\monolib_dcpsg.obj &
-	$(OBJS)\monolib_dirctrlg.obj &
-	$(OBJS)\monolib_dragimgg.obj &
-	$(OBJS)\monolib_filepickerg.obj &
-	$(OBJS)\monolib_fontpickerg.obj &
-	$(OBJS)\monolib_listbkg.obj &
-	$(OBJS)\monolib_logg.obj &
-	$(OBJS)\monolib_numdlgg.obj &
-	$(OBJS)\monolib_panelg.obj &
-	$(OBJS)\monolib_progdlgg.obj &
-	$(OBJS)\monolib_printps.obj &
-	$(OBJS)\monolib_renderg.obj &
-	$(OBJS)\monolib_scrlwing.obj &
-	$(OBJS)\monolib_selstore.obj &
-	$(OBJS)\monolib_spinctlg.obj &
-	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_textdlgg.obj &
-	$(OBJS)\monolib_tipwin.obj &
-	$(OBJS)\monolib_toolbkg.obj &
-	$(OBJS)\monolib_treectlg.obj &
-	$(OBJS)\monolib_treebkg.obj &
-	$(OBJS)\monolib_vlbox.obj &
-	$(OBJS)\monolib_vscroll.obj
-!endif
-__basedll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-__basedll___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll
-!endif
-!endif
-__baselib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-__baselib___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!endif
-__netdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-__netdll___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll
-!endif
-!endif
-__netlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-__netlib___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-!endif
-!endif
-__coredll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-__coredll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll
-!endif
-!endif
-!endif
-____CORE_SRC_FILENAMES_2_OBJECTS =
-!ifeq USE_GUI 1
-____CORE_SRC_FILENAMES_2_OBJECTS =  &
-	$(OBJS)\coredll_caret.obj &
-	$(OBJS)\coredll_colour.obj &
-	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_mask.obj &
-	$(OBJS)\coredll_timer.obj &
-	$(OBJS)\coredll_app.obj &
-	$(OBJS)\coredll_bitmap.obj &
-	$(OBJS)\coredll_brush.obj &
-	$(OBJS)\coredll_clipbrd.obj &
-	$(OBJS)\coredll_cursor.obj &
-	$(OBJS)\coredll_data.obj &
-	$(OBJS)\coredll_dc.obj &
-	$(OBJS)\coredll_dcclient.obj &
-	$(OBJS)\coredll_dcmemory.obj &
-	$(OBJS)\coredll_dcscreen.obj &
-	$(OBJS)\coredll_dirmgl.obj &
-	$(OBJS)\coredll_evtloop.obj &
-	$(OBJS)\coredll_font.obj &
-	$(OBJS)\coredll_fontenum.obj &
-	$(OBJS)\coredll_fontutil.obj &
-	$(OBJS)\coredll_palette.obj &
-	$(OBJS)\coredll_pen.obj &
-	$(OBJS)\coredll_region.obj &
-	$(OBJS)\coredll_settings.obj &
-	$(OBJS)\coredll_toplevel.obj &
-	$(OBJS)\coredll_utils.obj &
-	$(OBJS)\coredll_window.obj &
-	$(OBJS)\coredll_accel.obj &
-	$(OBJS)\coredll_colrdlgg.obj &
-	$(OBJS)\coredll_dirdlgg.obj &
-	$(OBJS)\coredll_fdrepdlg.obj &
-	$(OBJS)\coredll_filedlgg.obj &
-	$(OBJS)\coredll_fontdlgg.obj &
-	$(OBJS)\coredll_listctrl.obj &
-	$(OBJS)\coredll_mdig.obj &
-	$(OBJS)\coredll_msgdlgg.obj &
-	$(OBJS)\coredll_prntdlgg.obj &
-	$(OBJS)\coredll_tabg.obj &
-	$(OBJS)\coredll_bmpbuttn.obj &
-	$(OBJS)\coredll_button.obj &
-	$(OBJS)\coredll_checkbox.obj &
-	$(OBJS)\coredll_checklst.obj &
-	$(OBJS)\coredll_choice.obj &
-	$(OBJS)\coredll_colschem.obj &
-	$(OBJS)\coredll_combobox.obj &
-	$(OBJS)\coredll_control.obj &
-	$(OBJS)\coredll_ctrlrend.obj &
-	$(OBJS)\coredll_dialog.obj &
-	$(OBJS)\coredll_framuniv.obj &
-	$(OBJS)\coredll_gauge.obj &
-	$(OBJS)\coredll_inpcons.obj &
-	$(OBJS)\coredll_inphand.obj &
-	$(OBJS)\coredll_listbox.obj &
-	$(OBJS)\coredll_menu.obj &
-	$(OBJS)\coredll_notebook.obj &
-	$(OBJS)\coredll_radiobox.obj &
-	$(OBJS)\coredll_radiobut.obj &
-	$(OBJS)\coredll_scrarrow.obj &
-	$(OBJS)\coredll_scrolbar.obj &
-	$(OBJS)\coredll_scrthumb.obj &
-	$(OBJS)\coredll_slider.obj &
-	$(OBJS)\coredll_spinbutt.obj &
-	$(OBJS)\coredll_statbmp.obj &
-	$(OBJS)\coredll_statbox.obj &
-	$(OBJS)\coredll_statline.obj &
-	$(OBJS)\coredll_stattext.obj &
-	$(OBJS)\coredll_statusbr.obj &
-	$(OBJS)\coredll_stdrend.obj &
-	$(OBJS)\coredll_textctrl.obj &
-	$(OBJS)\coredll_tglbtn.obj &
-	$(OBJS)\coredll_theme.obj &
-	$(OBJS)\coredll_toolbar.obj &
-	$(OBJS)\coredll_topluniv.obj &
-	$(OBJS)\coredll_winuniv.obj &
-	$(OBJS)\coredll_gtk.obj &
-	$(OBJS)\coredll_metal.obj &
-	$(OBJS)\coredll_mono.obj &
-	$(OBJS)\coredll_win32.obj &
-	$(OBJS)\coredll_accesscmn.obj &
-	$(OBJS)\coredll_anidecod.obj &
-	$(OBJS)\coredll_appcmn.obj &
-	$(OBJS)\coredll_artprov.obj &
-	$(OBJS)\coredll_artstd.obj &
-	$(OBJS)\coredll_bmpbase.obj &
-	$(OBJS)\coredll_bookctrl.obj &
-	$(OBJS)\coredll_choiccmn.obj &
-	$(OBJS)\coredll_clipcmn.obj &
-	$(OBJS)\coredll_clrpickercmn.obj &
-	$(OBJS)\coredll_colourcmn.obj &
-	$(OBJS)\coredll_combocmn.obj &
-	$(OBJS)\coredll_cmdproc.obj &
-	$(OBJS)\coredll_cmndata.obj &
-	$(OBJS)\coredll_containr.obj &
-	$(OBJS)\coredll_cshelp.obj &
-	$(OBJS)\coredll_ctrlcmn.obj &
-	$(OBJS)\coredll_ctrlsub.obj &
-	$(OBJS)\coredll_datacmn.obj &
-	$(OBJS)\coredll_dcbase.obj &
-	$(OBJS)\coredll_dcbufcmn.obj &
-	$(OBJS)\coredll_dcgraph.obj &
-	$(OBJS)\coredll_dlgcmn.obj &
-	$(OBJS)\coredll_dndcmn.obj &
-	$(OBJS)\coredll_dobjcmn.obj &
-	$(OBJS)\coredll_docmdi.obj &
-	$(OBJS)\coredll_docview.obj &
-	$(OBJS)\coredll_dpycmn.obj &
-	$(OBJS)\coredll_dseldlg.obj &
-	$(OBJS)\coredll_effects.obj &
-	$(OBJS)\coredll_evtloopcmn.obj &
-	$(OBJS)\coredll_fddlgcmn.obj &
-	$(OBJS)\coredll_filepickercmn.obj &
-	$(OBJS)\coredll_fontpickercmn.obj &
-	$(OBJS)\coredll_fldlgcmn.obj &
-	$(OBJS)\coredll_fontcmn.obj &
-	$(OBJS)\coredll_fontenumcmn.obj &
-	$(OBJS)\coredll_fontmap.obj &
-	$(OBJS)\coredll_framecmn.obj &
-	$(OBJS)\coredll_gaugecmn.obj &
-	$(OBJS)\coredll_gbsizer.obj &
-	$(OBJS)\coredll_gdicmn.obj &
-	$(OBJS)\coredll_geometry.obj &
-	$(OBJS)\coredll_gifdecod.obj &
-	$(OBJS)\coredll_graphcmn.obj &
-	$(OBJS)\coredll_helpbase.obj &
-	$(OBJS)\coredll_iconbndl.obj &
-	$(OBJS)\coredll_imagall.obj &
-	$(OBJS)\coredll_imagbmp.obj &
-	$(OBJS)\coredll_image.obj &
-	$(OBJS)\coredll_imagfill.obj &
-	$(OBJS)\coredll_imaggif.obj &
-	$(OBJS)\coredll_imagiff.obj &
-	$(OBJS)\coredll_imagjpeg.obj &
-	$(OBJS)\coredll_imagpcx.obj &
-	$(OBJS)\coredll_imagpng.obj &
-	$(OBJS)\coredll_imagpnm.obj &
-	$(OBJS)\coredll_imagtga.obj &
-	$(OBJS)\coredll_imagtiff.obj &
-	$(OBJS)\coredll_imagxpm.obj &
-	$(OBJS)\coredll_layout.obj &
-	$(OBJS)\coredll_lboxcmn.obj &
-	$(OBJS)\coredll_listctrlcmn.obj &
-	$(OBJS)\coredll_matrix.obj &
-	$(OBJS)\coredll_menucmn.obj &
-	$(OBJS)\coredll_nbkbase.obj &
-	$(OBJS)\coredll_overlaycmn.obj &
-	$(OBJS)\coredll_paper.obj &
-	$(OBJS)\coredll_pickerbase.obj &
-	$(OBJS)\coredll_popupcmn.obj &
-	$(OBJS)\coredll_prntbase.obj &
-	$(OBJS)\coredll_quantize.obj &
-	$(OBJS)\coredll_radiocmn.obj &
-	$(OBJS)\coredll_rendcmn.obj &
-	$(OBJS)\coredll_rgncmn.obj &
-	$(OBJS)\coredll_settcmn.obj &
-	$(OBJS)\coredll_sizer.obj &
-	$(OBJS)\coredll_statbar.obj &
-	$(OBJS)\coredll_stockitem.obj &
-	$(OBJS)\coredll_tbarbase.obj &
-	$(OBJS)\coredll_textcmn.obj &
-	$(OBJS)\coredll_timercmn.obj &
-	$(OBJS)\coredll_toplvcmn.obj &
-	$(OBJS)\coredll_treebase.obj &
-	$(OBJS)\coredll_valgen.obj &
-	$(OBJS)\coredll_validate.obj &
-	$(OBJS)\coredll_valtext.obj &
-	$(OBJS)\coredll_wincmn.obj &
-	$(OBJS)\coredll_xpmdecod.obj &
-	$(OBJS)\coredll_busyinfo.obj &
-	$(OBJS)\coredll_buttonbar.obj &
-	$(OBJS)\coredll_choicdgg.obj &
-	$(OBJS)\coredll_choicbkg.obj &
-	$(OBJS)\coredll_clrpickerg.obj &
-	$(OBJS)\coredll_collpaneg.obj &
-	$(OBJS)\coredll_combog.obj &
-	$(OBJS)\coredll_dcpsg.obj &
-	$(OBJS)\coredll_dirctrlg.obj &
-	$(OBJS)\coredll_dragimgg.obj &
-	$(OBJS)\coredll_filepickerg.obj &
-	$(OBJS)\coredll_fontpickerg.obj &
-	$(OBJS)\coredll_listbkg.obj &
-	$(OBJS)\coredll_logg.obj &
-	$(OBJS)\coredll_numdlgg.obj &
-	$(OBJS)\coredll_panelg.obj &
-	$(OBJS)\coredll_progdlgg.obj &
-	$(OBJS)\coredll_printps.obj &
-	$(OBJS)\coredll_renderg.obj &
-	$(OBJS)\coredll_scrlwing.obj &
-	$(OBJS)\coredll_selstore.obj &
-	$(OBJS)\coredll_spinctlg.obj &
-	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_textdlgg.obj &
-	$(OBJS)\coredll_tipwin.obj &
-	$(OBJS)\coredll_toolbkg.obj &
-	$(OBJS)\coredll_treectlg.obj &
-	$(OBJS)\coredll_treebkg.obj &
-	$(OBJS)\coredll_vlbox.obj &
-	$(OBJS)\coredll_vscroll.obj
-!endif
-__corelib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-__corelib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!endif
-!endif
-____CORE_SRC_FILENAMES_3_OBJECTS =
-!ifeq USE_GUI 1
-____CORE_SRC_FILENAMES_3_OBJECTS =  &
-	$(OBJS)\corelib_caret.obj &
-	$(OBJS)\corelib_colour.obj &
-	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_mask.obj &
-	$(OBJS)\corelib_timer.obj &
-	$(OBJS)\corelib_app.obj &
-	$(OBJS)\corelib_bitmap.obj &
-	$(OBJS)\corelib_brush.obj &
-	$(OBJS)\corelib_clipbrd.obj &
-	$(OBJS)\corelib_cursor.obj &
-	$(OBJS)\corelib_data.obj &
-	$(OBJS)\corelib_dc.obj &
-	$(OBJS)\corelib_dcclient.obj &
-	$(OBJS)\corelib_dcmemory.obj &
-	$(OBJS)\corelib_dcscreen.obj &
-	$(OBJS)\corelib_dirmgl.obj &
-	$(OBJS)\corelib_evtloop.obj &
-	$(OBJS)\corelib_font.obj &
-	$(OBJS)\corelib_fontenum.obj &
-	$(OBJS)\corelib_fontutil.obj &
-	$(OBJS)\corelib_palette.obj &
-	$(OBJS)\corelib_pen.obj &
-	$(OBJS)\corelib_region.obj &
-	$(OBJS)\corelib_settings.obj &
-	$(OBJS)\corelib_toplevel.obj &
-	$(OBJS)\corelib_utils.obj &
-	$(OBJS)\corelib_window.obj &
-	$(OBJS)\corelib_accel.obj &
-	$(OBJS)\corelib_colrdlgg.obj &
-	$(OBJS)\corelib_dirdlgg.obj &
-	$(OBJS)\corelib_fdrepdlg.obj &
-	$(OBJS)\corelib_filedlgg.obj &
-	$(OBJS)\corelib_fontdlgg.obj &
-	$(OBJS)\corelib_listctrl.obj &
-	$(OBJS)\corelib_mdig.obj &
-	$(OBJS)\corelib_msgdlgg.obj &
-	$(OBJS)\corelib_prntdlgg.obj &
-	$(OBJS)\corelib_tabg.obj &
-	$(OBJS)\corelib_bmpbuttn.obj &
-	$(OBJS)\corelib_button.obj &
-	$(OBJS)\corelib_checkbox.obj &
-	$(OBJS)\corelib_checklst.obj &
-	$(OBJS)\corelib_choice.obj &
-	$(OBJS)\corelib_colschem.obj &
-	$(OBJS)\corelib_combobox.obj &
-	$(OBJS)\corelib_control.obj &
-	$(OBJS)\corelib_ctrlrend.obj &
-	$(OBJS)\corelib_dialog.obj &
-	$(OBJS)\corelib_framuniv.obj &
-	$(OBJS)\corelib_gauge.obj &
-	$(OBJS)\corelib_inpcons.obj &
-	$(OBJS)\corelib_inphand.obj &
-	$(OBJS)\corelib_listbox.obj &
-	$(OBJS)\corelib_menu.obj &
-	$(OBJS)\corelib_notebook.obj &
-	$(OBJS)\corelib_radiobox.obj &
-	$(OBJS)\corelib_radiobut.obj &
-	$(OBJS)\corelib_scrarrow.obj &
-	$(OBJS)\corelib_scrolbar.obj &
-	$(OBJS)\corelib_scrthumb.obj &
-	$(OBJS)\corelib_slider.obj &
-	$(OBJS)\corelib_spinbutt.obj &
-	$(OBJS)\corelib_statbmp.obj &
-	$(OBJS)\corelib_statbox.obj &
-	$(OBJS)\corelib_statline.obj &
-	$(OBJS)\corelib_stattext.obj &
-	$(OBJS)\corelib_statusbr.obj &
-	$(OBJS)\corelib_stdrend.obj &
-	$(OBJS)\corelib_textctrl.obj &
-	$(OBJS)\corelib_tglbtn.obj &
-	$(OBJS)\corelib_theme.obj &
-	$(OBJS)\corelib_toolbar.obj &
-	$(OBJS)\corelib_topluniv.obj &
-	$(OBJS)\corelib_winuniv.obj &
-	$(OBJS)\corelib_gtk.obj &
-	$(OBJS)\corelib_metal.obj &
-	$(OBJS)\corelib_mono.obj &
-	$(OBJS)\corelib_win32.obj &
-	$(OBJS)\corelib_accesscmn.obj &
-	$(OBJS)\corelib_anidecod.obj &
-	$(OBJS)\corelib_appcmn.obj &
-	$(OBJS)\corelib_artprov.obj &
-	$(OBJS)\corelib_artstd.obj &
-	$(OBJS)\corelib_bmpbase.obj &
-	$(OBJS)\corelib_bookctrl.obj &
-	$(OBJS)\corelib_choiccmn.obj &
-	$(OBJS)\corelib_clipcmn.obj &
-	$(OBJS)\corelib_clrpickercmn.obj &
-	$(OBJS)\corelib_colourcmn.obj &
-	$(OBJS)\corelib_combocmn.obj &
-	$(OBJS)\corelib_cmdproc.obj &
-	$(OBJS)\corelib_cmndata.obj &
-	$(OBJS)\corelib_containr.obj &
-	$(OBJS)\corelib_cshelp.obj &
-	$(OBJS)\corelib_ctrlcmn.obj &
-	$(OBJS)\corelib_ctrlsub.obj &
-	$(OBJS)\corelib_datacmn.obj &
-	$(OBJS)\corelib_dcbase.obj &
-	$(OBJS)\corelib_dcbufcmn.obj &
-	$(OBJS)\corelib_dcgraph.obj &
-	$(OBJS)\corelib_dlgcmn.obj &
-	$(OBJS)\corelib_dndcmn.obj &
-	$(OBJS)\corelib_dobjcmn.obj &
-	$(OBJS)\corelib_docmdi.obj &
-	$(OBJS)\corelib_docview.obj &
-	$(OBJS)\corelib_dpycmn.obj &
-	$(OBJS)\corelib_dseldlg.obj &
-	$(OBJS)\corelib_effects.obj &
-	$(OBJS)\corelib_evtloopcmn.obj &
-	$(OBJS)\corelib_fddlgcmn.obj &
-	$(OBJS)\corelib_filepickercmn.obj &
-	$(OBJS)\corelib_fontpickercmn.obj &
-	$(OBJS)\corelib_fldlgcmn.obj &
-	$(OBJS)\corelib_fontcmn.obj &
-	$(OBJS)\corelib_fontenumcmn.obj &
-	$(OBJS)\corelib_fontmap.obj &
-	$(OBJS)\corelib_framecmn.obj &
-	$(OBJS)\corelib_gaugecmn.obj &
-	$(OBJS)\corelib_gbsizer.obj &
-	$(OBJS)\corelib_gdicmn.obj &
-	$(OBJS)\corelib_geometry.obj &
-	$(OBJS)\corelib_gifdecod.obj &
-	$(OBJS)\corelib_graphcmn.obj &
-	$(OBJS)\corelib_helpbase.obj &
-	$(OBJS)\corelib_iconbndl.obj &
-	$(OBJS)\corelib_imagall.obj &
-	$(OBJS)\corelib_imagbmp.obj &
-	$(OBJS)\corelib_image.obj &
-	$(OBJS)\corelib_imagfill.obj &
-	$(OBJS)\corelib_imaggif.obj &
-	$(OBJS)\corelib_imagiff.obj &
-	$(OBJS)\corelib_imagjpeg.obj &
-	$(OBJS)\corelib_imagpcx.obj &
-	$(OBJS)\corelib_imagpng.obj &
-	$(OBJS)\corelib_imagpnm.obj &
-	$(OBJS)\corelib_imagtga.obj &
-	$(OBJS)\corelib_imagtiff.obj &
-	$(OBJS)\corelib_imagxpm.obj &
-	$(OBJS)\corelib_layout.obj &
-	$(OBJS)\corelib_lboxcmn.obj &
-	$(OBJS)\corelib_listctrlcmn.obj &
-	$(OBJS)\corelib_matrix.obj &
-	$(OBJS)\corelib_menucmn.obj &
-	$(OBJS)\corelib_nbkbase.obj &
-	$(OBJS)\corelib_overlaycmn.obj &
-	$(OBJS)\corelib_paper.obj &
-	$(OBJS)\corelib_pickerbase.obj &
-	$(OBJS)\corelib_popupcmn.obj &
-	$(OBJS)\corelib_prntbase.obj &
-	$(OBJS)\corelib_quantize.obj &
-	$(OBJS)\corelib_radiocmn.obj &
-	$(OBJS)\corelib_rendcmn.obj &
-	$(OBJS)\corelib_rgncmn.obj &
-	$(OBJS)\corelib_settcmn.obj &
-	$(OBJS)\corelib_sizer.obj &
-	$(OBJS)\corelib_statbar.obj &
-	$(OBJS)\corelib_stockitem.obj &
-	$(OBJS)\corelib_tbarbase.obj &
-	$(OBJS)\corelib_textcmn.obj &
-	$(OBJS)\corelib_timercmn.obj &
-	$(OBJS)\corelib_toplvcmn.obj &
-	$(OBJS)\corelib_treebase.obj &
-	$(OBJS)\corelib_valgen.obj &
-	$(OBJS)\corelib_validate.obj &
-	$(OBJS)\corelib_valtext.obj &
-	$(OBJS)\corelib_wincmn.obj &
-	$(OBJS)\corelib_xpmdecod.obj &
-	$(OBJS)\corelib_busyinfo.obj &
-	$(OBJS)\corelib_buttonbar.obj &
-	$(OBJS)\corelib_choicdgg.obj &
-	$(OBJS)\corelib_choicbkg.obj &
-	$(OBJS)\corelib_clrpickerg.obj &
-	$(OBJS)\corelib_collpaneg.obj &
-	$(OBJS)\corelib_combog.obj &
-	$(OBJS)\corelib_dcpsg.obj &
-	$(OBJS)\corelib_dirctrlg.obj &
-	$(OBJS)\corelib_dragimgg.obj &
-	$(OBJS)\corelib_filepickerg.obj &
-	$(OBJS)\corelib_fontpickerg.obj &
-	$(OBJS)\corelib_listbkg.obj &
-	$(OBJS)\corelib_logg.obj &
-	$(OBJS)\corelib_numdlgg.obj &
-	$(OBJS)\corelib_panelg.obj &
-	$(OBJS)\corelib_progdlgg.obj &
-	$(OBJS)\corelib_printps.obj &
-	$(OBJS)\corelib_renderg.obj &
-	$(OBJS)\corelib_scrlwing.obj &
-	$(OBJS)\corelib_selstore.obj &
-	$(OBJS)\corelib_spinctlg.obj &
-	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_textdlgg.obj &
-	$(OBJS)\corelib_tipwin.obj &
-	$(OBJS)\corelib_toolbkg.obj &
-	$(OBJS)\corelib_treectlg.obj &
-	$(OBJS)\corelib_treebkg.obj &
-	$(OBJS)\corelib_vlbox.obj &
-	$(OBJS)\corelib_vscroll.obj
-!endif
-__advdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-__advdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll
-!endif
-!endif
-!endif
-__advlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-__advlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!endif
-!endif
-__mediadll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_MEDIA 1
-__mediadll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
-!endif
-!endif
-!endif
-!endif
-__medialib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_MEDIA 1
-__medialib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-!endif
-!endif
-!endif
-!endif
-__htmldll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_HTML 1
-__htmldll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll
-!endif
-!endif
-!endif
-!endif
-__htmllib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_HTML 1
-__htmllib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!endif
-!endif
-!endif
-__qadll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_QA 1
-__qadll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll
-!endif
-!endif
-!endif
-!endif
-__qalib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_QA 1
-__qalib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
-!endif
-!endif
-!endif
-!endif
-__xmldll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-__xmldll___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll
-!endif
-!endif
-__xmllib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-__xmllib___depname = &
-	$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!endif
-__xrcdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_XRC 1
-__xrcdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll
-!endif
-!endif
-!endif
-__xrclib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_XRC 1
-__xrclib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-!endif
-!endif
-__auidll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_AUI 1
-__auidll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll
-!endif
-!endif
-!endif
-__auilib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_AUI 1
-__auilib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-!endif
-!endif
-!endif
-__richtextdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_RICHTEXT 1
-__richtextdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll
-!endif
-!endif
-!endif
-__richtextlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_RICHTEXT 1
-__richtextlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
-!endif
-!endif
-__gldll___depname =
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_OPENGL 1
-__gldll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll
-!endif
-!endif
-!endif
-__WXLIBGLDEP_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIBGLDEP_CORE_p = &
-	wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIBGLDEP_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIBGLDEP_BASE_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__gllib___depname =
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_OPENGL 1
-__gllib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
-!endif
-!endif
-!endif
-__DEBUGINFO_3 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_3 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_3 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_3 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_3 = debug all
-!endif
-__MGLPMLIBPATH_FILENAMES =
-!ifeq DOS32 DOS4GW
-__MGLPMLIBPATH_FILENAMES = dos4gw
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-____DOS_CFLAG_p =
-!ifeq DOS32 CAUSEWAY
-____DOS_CFLAG_p = -dDOS4GW
-!endif
-!ifeq DOS32 DOS32A
-____DOS_CFLAG_p = -dDOS4GW
-!endif
-!ifeq DOS32 DOS4GW
-____DOS_CFLAG_p = -dDOS4GW
-!endif
-!ifeq DOS32 PMODEW
-____DOS_CFLAG_p = -dDOS4GW
-!endif
-!ifeq DOS32 X32
-____DOS_CFLAG_p = -dX32VM
-!endif
-!ifeq DOS32 X32VM
-____DOS_CFLAG_p = -dX32VM
-!endif
-__DEBUGINFO =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__BUILD_FILENAMES =
-!ifeq BUILD debug
-__BUILD_FILENAMES = debug
-!endif
-!ifeq BUILD release
-__BUILD_FILENAMES = release
-!endif
-
-### Variables: ###
-
-MAKEARGS = DOS32="$(DOS32)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" &
-	CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" &
-	CPP="$(CPP)" SHARED="$(SHARED)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
-	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
-	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
-	USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
-	USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
-	USE_QA="$(USE_QA)" &
-	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
-	USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
-	VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
-	WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)"
-WX_RELEASE_NODOT = 28
-OBJS = wat_$(PORTNAME)univ$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)univ$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-i=..\..\include -i=$(SETUPHDIR) -d__WXMGL__ -d__WXUNIVERSAL__ &
-	$(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
-WXREGEX_OBJECTS =  &
-	$(OBJS)\wxregex_regcomp.obj &
-	$(OBJS)\wxregex_regexec.obj &
-	$(OBJS)\wxregex_regerror.obj &
-	$(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(CPPFLAGS) &
-	$(CFLAGS)
-WXZLIB_OBJECTS =  &
-	$(OBJS)\wxzlib_adler32.obj &
-	$(OBJS)\wxzlib_compress.obj &
-	$(OBJS)\wxzlib_crc32.obj &
-	$(OBJS)\wxzlib_gzio.obj &
-	$(OBJS)\wxzlib_uncompr.obj &
-	$(OBJS)\wxzlib_deflate.obj &
-	$(OBJS)\wxzlib_trees.obj &
-	$(OBJS)\wxzlib_zutil.obj &
-	$(OBJS)\wxzlib_inflate.obj &
-	$(OBJS)\wxzlib_infback.obj &
-	$(OBJS)\wxzlib_inftrees.obj &
-	$(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-i=..\..\src\zlib -wcd=124 $(CPPFLAGS) $(CFLAGS)
-WXPNG_OBJECTS =  &
-	$(OBJS)\wxpng_png.obj &
-	$(OBJS)\wxpng_pngerror.obj &
-	$(OBJS)\wxpng_pnggccrd.obj &
-	$(OBJS)\wxpng_pngget.obj &
-	$(OBJS)\wxpng_pngmem.obj &
-	$(OBJS)\wxpng_pngpread.obj &
-	$(OBJS)\wxpng_pngread.obj &
-	$(OBJS)\wxpng_pngrio.obj &
-	$(OBJS)\wxpng_pngrtran.obj &
-	$(OBJS)\wxpng_pngrutil.obj &
-	$(OBJS)\wxpng_pngset.obj &
-	$(OBJS)\wxpng_pngtrans.obj &
-	$(OBJS)\wxpng_pngvcrd.obj &
-	$(OBJS)\wxpng_pngwio.obj &
-	$(OBJS)\wxpng_pngwrite.obj &
-	$(OBJS)\wxpng_pngwtran.obj &
-	$(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-i=$(SETUPHDIR) -wcd=136 $(CPPFLAGS) $(CFLAGS)
-WXJPEG_OBJECTS =  &
-	$(OBJS)\wxjpeg_jcomapi.obj &
-	$(OBJS)\wxjpeg_jutils.obj &
-	$(OBJS)\wxjpeg_jerror.obj &
-	$(OBJS)\wxjpeg_jmemmgr.obj &
-	$(OBJS)\wxjpeg_jmemnobs.obj &
-	$(OBJS)\wxjpeg_jcapimin.obj &
-	$(OBJS)\wxjpeg_jcapistd.obj &
-	$(OBJS)\wxjpeg_jctrans.obj &
-	$(OBJS)\wxjpeg_jcparam.obj &
-	$(OBJS)\wxjpeg_jdatadst.obj &
-	$(OBJS)\wxjpeg_jcinit.obj &
-	$(OBJS)\wxjpeg_jcmaster.obj &
-	$(OBJS)\wxjpeg_jcmarker.obj &
-	$(OBJS)\wxjpeg_jcmainct.obj &
-	$(OBJS)\wxjpeg_jcprepct.obj &
-	$(OBJS)\wxjpeg_jccoefct.obj &
-	$(OBJS)\wxjpeg_jccolor.obj &
-	$(OBJS)\wxjpeg_jcsample.obj &
-	$(OBJS)\wxjpeg_jchuff.obj &
-	$(OBJS)\wxjpeg_jcphuff.obj &
-	$(OBJS)\wxjpeg_jcdctmgr.obj &
-	$(OBJS)\wxjpeg_jfdctfst.obj &
-	$(OBJS)\wxjpeg_jfdctflt.obj &
-	$(OBJS)\wxjpeg_jfdctint.obj &
-	$(OBJS)\wxjpeg_jdapimin.obj &
-	$(OBJS)\wxjpeg_jdapistd.obj &
-	$(OBJS)\wxjpeg_jdtrans.obj &
-	$(OBJS)\wxjpeg_jdatasrc.obj &
-	$(OBJS)\wxjpeg_jdmaster.obj &
-	$(OBJS)\wxjpeg_jdinput.obj &
-	$(OBJS)\wxjpeg_jdmarker.obj &
-	$(OBJS)\wxjpeg_jdhuff.obj &
-	$(OBJS)\wxjpeg_jdphuff.obj &
-	$(OBJS)\wxjpeg_jdmainct.obj &
-	$(OBJS)\wxjpeg_jdcoefct.obj &
-	$(OBJS)\wxjpeg_jdpostct.obj &
-	$(OBJS)\wxjpeg_jddctmgr.obj &
-	$(OBJS)\wxjpeg_jidctfst.obj &
-	$(OBJS)\wxjpeg_jidctflt.obj &
-	$(OBJS)\wxjpeg_jidctint.obj &
-	$(OBJS)\wxjpeg_jidctred.obj &
-	$(OBJS)\wxjpeg_jdsample.obj &
-	$(OBJS)\wxjpeg_jdcolor.obj &
-	$(OBJS)\wxjpeg_jquant1.obj &
-	$(OBJS)\wxjpeg_jquant2.obj &
-	$(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-i=..\..\src\zlib -i=..\..\src\jpeg -d__MSDOS__ -wcd=124 $(CPPFLAGS) &
-	$(CFLAGS)
-WXTIFF_OBJECTS =  &
-	$(OBJS)\wxtiff_tif_msdos.obj &
-	$(OBJS)\wxtiff_tif_aux.obj &
-	$(OBJS)\wxtiff_tif_close.obj &
-	$(OBJS)\wxtiff_tif_codec.obj &
-	$(OBJS)\wxtiff_tif_color.obj &
-	$(OBJS)\wxtiff_tif_compress.obj &
-	$(OBJS)\wxtiff_tif_dir.obj &
-	$(OBJS)\wxtiff_tif_dirinfo.obj &
-	$(OBJS)\wxtiff_tif_dirread.obj &
-	$(OBJS)\wxtiff_tif_dirwrite.obj &
-	$(OBJS)\wxtiff_tif_dumpmode.obj &
-	$(OBJS)\wxtiff_tif_error.obj &
-	$(OBJS)\wxtiff_tif_extension.obj &
-	$(OBJS)\wxtiff_tif_fax3.obj &
-	$(OBJS)\wxtiff_tif_fax3sm.obj &
-	$(OBJS)\wxtiff_tif_getimage.obj &
-	$(OBJS)\wxtiff_tif_jpeg.obj &
-	$(OBJS)\wxtiff_tif_flush.obj &
-	$(OBJS)\wxtiff_tif_lzw.obj &
-	$(OBJS)\wxtiff_tif_luv.obj &
-	$(OBJS)\wxtiff_tif_next.obj &
-	$(OBJS)\wxtiff_tif_open.obj &
-	$(OBJS)\wxtiff_tif_packbits.obj &
-	$(OBJS)\wxtiff_tif_pixarlog.obj &
-	$(OBJS)\wxtiff_tif_predict.obj &
-	$(OBJS)\wxtiff_tif_print.obj &
-	$(OBJS)\wxtiff_tif_read.obj &
-	$(OBJS)\wxtiff_tif_swab.obj &
-	$(OBJS)\wxtiff_tif_strip.obj &
-	$(OBJS)\wxtiff_tif_thunder.obj &
-	$(OBJS)\wxtiff_tif_tile.obj &
-	$(OBJS)\wxtiff_tif_version.obj &
-	$(OBJS)\wxtiff_tif_warning.obj &
-	$(OBJS)\wxtiff_tif_write.obj &
-	$(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-i=$(LIBDIRNAME) -d__MSDOS__ $(CPPFLAGS) $(CFLAGS)
-WXEXPAT_OBJECTS =  &
-	$(OBJS)\wxexpat_xmlparse.obj &
-	$(OBJS)\wxexpat_xmlrole.obj &
-	$(OBJS)\wxexpat_xmltok.obj
-MONODLL_CFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL &
-	/fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-MONODLL_OBJECTS =  &
-	$(OBJS)\monodll_dummy.obj &
-	$(OBJS)\monodll_appbase.obj &
-	$(OBJS)\monodll_arcall.obj &
-	$(OBJS)\monodll_arcfind.obj &
-	$(OBJS)\monodll_archive.obj &
-	$(OBJS)\monodll_clntdata.obj &
-	$(OBJS)\monodll_cmdline.obj &
-	$(OBJS)\monodll_config.obj &
-	$(OBJS)\monodll_convauto.obj &
-	$(OBJS)\monodll_datetime.obj &
-	$(OBJS)\monodll_datstrm.obj &
-	$(OBJS)\monodll_dircmn.obj &
-	$(OBJS)\monodll_dynarray.obj &
-	$(OBJS)\monodll_dynlib.obj &
-	$(OBJS)\monodll_dynload.obj &
-	$(OBJS)\monodll_encconv.obj &
-	$(OBJS)\monodll_extended.obj &
-	$(OBJS)\monodll_ffile.obj &
-	$(OBJS)\monodll_file.obj &
-	$(OBJS)\monodll_fileback.obj &
-	$(OBJS)\monodll_fileconf.obj &
-	$(OBJS)\monodll_filefn.obj &
-	$(OBJS)\monodll_filename.obj &
-	$(OBJS)\monodll_filesys.obj &
-	$(OBJS)\monodll_filtall.obj &
-	$(OBJS)\monodll_filtfind.obj &
-	$(OBJS)\monodll_fmapbase.obj &
-	$(OBJS)\monodll_fs_arc.obj &
-	$(OBJS)\monodll_fs_filter.obj &
-	$(OBJS)\monodll_hash.obj &
-	$(OBJS)\monodll_hashmap.obj &
-	$(OBJS)\monodll_init.obj &
-	$(OBJS)\monodll_intl.obj &
-	$(OBJS)\monodll_ipcbase.obj &
-	$(OBJS)\monodll_list.obj &
-	$(OBJS)\monodll_log.obj &
-	$(OBJS)\monodll_longlong.obj &
-	$(OBJS)\monodll_memory.obj &
-	$(OBJS)\monodll_mimecmn.obj &
-	$(OBJS)\monodll_module.obj &
-	$(OBJS)\monodll_mstream.obj &
-	$(OBJS)\monodll_object.obj &
-	$(OBJS)\monodll_platinfo.obj &
-	$(OBJS)\monodll_powercmn.obj &
-	$(OBJS)\monodll_process.obj &
-	$(OBJS)\monodll_regex.obj &
-	$(OBJS)\monodll_stdpbase.obj &
-	$(OBJS)\monodll_sstream.obj &
-	$(OBJS)\monodll_stopwatch.obj &
-	$(OBJS)\monodll_strconv.obj &
-	$(OBJS)\monodll_stream.obj &
-	$(OBJS)\monodll_string.obj &
-	$(OBJS)\monodll_sysopt.obj &
-	$(OBJS)\monodll_tarstrm.obj &
-	$(OBJS)\monodll_textbuf.obj &
-	$(OBJS)\monodll_textfile.obj &
-	$(OBJS)\monodll_tokenzr.obj &
-	$(OBJS)\monodll_txtstrm.obj &
-	$(OBJS)\monodll_uri.obj &
-	$(OBJS)\monodll_variant.obj &
-	$(OBJS)\monodll_wfstream.obj &
-	$(OBJS)\monodll_wxchar.obj &
-	$(OBJS)\monodll_xti.obj &
-	$(OBJS)\monodll_xtistrm.obj &
-	$(OBJS)\monodll_zipstrm.obj &
-	$(OBJS)\monodll_zstream.obj &
-	$(OBJS)\monodll_dir.obj &
-	$(OBJS)\monodll_mimetype.obj &
-	$(OBJS)\monodll_utilsdos.obj &
-	$(OBJS)\monodll_event.obj &
-	$(OBJS)\monodll_fs_mem.obj &
-	$(OBJS)\monodll_msgout.obj &
-	$(OBJS)\monodll_utilscmn.obj &
-	$(OBJS)\monodll_fs_inet.obj &
-	$(OBJS)\monodll_ftp.obj &
-	$(OBJS)\monodll_http.obj &
-	$(OBJS)\monodll_protocol.obj &
-	$(OBJS)\monodll_sckaddr.obj &
-	$(OBJS)\monodll_sckfile.obj &
-	$(OBJS)\monodll_sckipc.obj &
-	$(OBJS)\monodll_sckstrm.obj &
-	$(OBJS)\monodll_socket.obj &
-	$(OBJS)\monodll_url.obj &
-	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) &
-	$(OBJS)\monodll_xml.obj &
-	$(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-MONOLIB_OBJECTS =  &
-	$(OBJS)\monolib_dummy.obj &
-	$(OBJS)\monolib_appbase.obj &
-	$(OBJS)\monolib_arcall.obj &
-	$(OBJS)\monolib_arcfind.obj &
-	$(OBJS)\monolib_archive.obj &
-	$(OBJS)\monolib_clntdata.obj &
-	$(OBJS)\monolib_cmdline.obj &
-	$(OBJS)\monolib_config.obj &
-	$(OBJS)\monolib_convauto.obj &
-	$(OBJS)\monolib_datetime.obj &
-	$(OBJS)\monolib_datstrm.obj &
-	$(OBJS)\monolib_dircmn.obj &
-	$(OBJS)\monolib_dynarray.obj &
-	$(OBJS)\monolib_dynlib.obj &
-	$(OBJS)\monolib_dynload.obj &
-	$(OBJS)\monolib_encconv.obj &
-	$(OBJS)\monolib_extended.obj &
-	$(OBJS)\monolib_ffile.obj &
-	$(OBJS)\monolib_file.obj &
-	$(OBJS)\monolib_fileback.obj &
-	$(OBJS)\monolib_fileconf.obj &
-	$(OBJS)\monolib_filefn.obj &
-	$(OBJS)\monolib_filename.obj &
-	$(OBJS)\monolib_filesys.obj &
-	$(OBJS)\monolib_filtall.obj &
-	$(OBJS)\monolib_filtfind.obj &
-	$(OBJS)\monolib_fmapbase.obj &
-	$(OBJS)\monolib_fs_arc.obj &
-	$(OBJS)\monolib_fs_filter.obj &
-	$(OBJS)\monolib_hash.obj &
-	$(OBJS)\monolib_hashmap.obj &
-	$(OBJS)\monolib_init.obj &
-	$(OBJS)\monolib_intl.obj &
-	$(OBJS)\monolib_ipcbase.obj &
-	$(OBJS)\monolib_list.obj &
-	$(OBJS)\monolib_log.obj &
-	$(OBJS)\monolib_longlong.obj &
-	$(OBJS)\monolib_memory.obj &
-	$(OBJS)\monolib_mimecmn.obj &
-	$(OBJS)\monolib_module.obj &
-	$(OBJS)\monolib_mstream.obj &
-	$(OBJS)\monolib_object.obj &
-	$(OBJS)\monolib_platinfo.obj &
-	$(OBJS)\monolib_powercmn.obj &
-	$(OBJS)\monolib_process.obj &
-	$(OBJS)\monolib_regex.obj &
-	$(OBJS)\monolib_stdpbase.obj &
-	$(OBJS)\monolib_sstream.obj &
-	$(OBJS)\monolib_stopwatch.obj &
-	$(OBJS)\monolib_strconv.obj &
-	$(OBJS)\monolib_stream.obj &
-	$(OBJS)\monolib_string.obj &
-	$(OBJS)\monolib_sysopt.obj &
-	$(OBJS)\monolib_tarstrm.obj &
-	$(OBJS)\monolib_textbuf.obj &
-	$(OBJS)\monolib_textfile.obj &
-	$(OBJS)\monolib_tokenzr.obj &
-	$(OBJS)\monolib_txtstrm.obj &
-	$(OBJS)\monolib_uri.obj &
-	$(OBJS)\monolib_variant.obj &
-	$(OBJS)\monolib_wfstream.obj &
-	$(OBJS)\monolib_wxchar.obj &
-	$(OBJS)\monolib_xti.obj &
-	$(OBJS)\monolib_xtistrm.obj &
-	$(OBJS)\monolib_zipstrm.obj &
-	$(OBJS)\monolib_zstream.obj &
-	$(OBJS)\monolib_dir.obj &
-	$(OBJS)\monolib_mimetype.obj &
-	$(OBJS)\monolib_utilsdos.obj &
-	$(OBJS)\monolib_event.obj &
-	$(OBJS)\monolib_fs_mem.obj &
-	$(OBJS)\monolib_msgout.obj &
-	$(OBJS)\monolib_utilscmn.obj &
-	$(OBJS)\monolib_fs_inet.obj &
-	$(OBJS)\monolib_ftp.obj &
-	$(OBJS)\monolib_http.obj &
-	$(OBJS)\monolib_protocol.obj &
-	$(OBJS)\monolib_sckaddr.obj &
-	$(OBJS)\monolib_sckfile.obj &
-	$(OBJS)\monolib_sckipc.obj &
-	$(OBJS)\monolib_sckstrm.obj &
-	$(OBJS)\monolib_socket.obj &
-	$(OBJS)\monolib_url.obj &
-	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
-	$(OBJS)\monolib_xml.obj &
-	$(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &
-	$(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &
-	/fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-BASEDLL_OBJECTS =  &
-	$(OBJS)\basedll_dummy.obj &
-	$(OBJS)\basedll_appbase.obj &
-	$(OBJS)\basedll_arcall.obj &
-	$(OBJS)\basedll_arcfind.obj &
-	$(OBJS)\basedll_archive.obj &
-	$(OBJS)\basedll_clntdata.obj &
-	$(OBJS)\basedll_cmdline.obj &
-	$(OBJS)\basedll_config.obj &
-	$(OBJS)\basedll_convauto.obj &
-	$(OBJS)\basedll_datetime.obj &
-	$(OBJS)\basedll_datstrm.obj &
-	$(OBJS)\basedll_dircmn.obj &
-	$(OBJS)\basedll_dynarray.obj &
-	$(OBJS)\basedll_dynlib.obj &
-	$(OBJS)\basedll_dynload.obj &
-	$(OBJS)\basedll_encconv.obj &
-	$(OBJS)\basedll_extended.obj &
-	$(OBJS)\basedll_ffile.obj &
-	$(OBJS)\basedll_file.obj &
-	$(OBJS)\basedll_fileback.obj &
-	$(OBJS)\basedll_fileconf.obj &
-	$(OBJS)\basedll_filefn.obj &
-	$(OBJS)\basedll_filename.obj &
-	$(OBJS)\basedll_filesys.obj &
-	$(OBJS)\basedll_filtall.obj &
-	$(OBJS)\basedll_filtfind.obj &
-	$(OBJS)\basedll_fmapbase.obj &
-	$(OBJS)\basedll_fs_arc.obj &
-	$(OBJS)\basedll_fs_filter.obj &
-	$(OBJS)\basedll_hash.obj &
-	$(OBJS)\basedll_hashmap.obj &
-	$(OBJS)\basedll_init.obj &
-	$(OBJS)\basedll_intl.obj &
-	$(OBJS)\basedll_ipcbase.obj &
-	$(OBJS)\basedll_list.obj &
-	$(OBJS)\basedll_log.obj &
-	$(OBJS)\basedll_longlong.obj &
-	$(OBJS)\basedll_memory.obj &
-	$(OBJS)\basedll_mimecmn.obj &
-	$(OBJS)\basedll_module.obj &
-	$(OBJS)\basedll_mstream.obj &
-	$(OBJS)\basedll_object.obj &
-	$(OBJS)\basedll_platinfo.obj &
-	$(OBJS)\basedll_powercmn.obj &
-	$(OBJS)\basedll_process.obj &
-	$(OBJS)\basedll_regex.obj &
-	$(OBJS)\basedll_stdpbase.obj &
-	$(OBJS)\basedll_sstream.obj &
-	$(OBJS)\basedll_stopwatch.obj &
-	$(OBJS)\basedll_strconv.obj &
-	$(OBJS)\basedll_stream.obj &
-	$(OBJS)\basedll_string.obj &
-	$(OBJS)\basedll_sysopt.obj &
-	$(OBJS)\basedll_tarstrm.obj &
-	$(OBJS)\basedll_textbuf.obj &
-	$(OBJS)\basedll_textfile.obj &
-	$(OBJS)\basedll_tokenzr.obj &
-	$(OBJS)\basedll_txtstrm.obj &
-	$(OBJS)\basedll_uri.obj &
-	$(OBJS)\basedll_variant.obj &
-	$(OBJS)\basedll_wfstream.obj &
-	$(OBJS)\basedll_wxchar.obj &
-	$(OBJS)\basedll_xti.obj &
-	$(OBJS)\basedll_xtistrm.obj &
-	$(OBJS)\basedll_zipstrm.obj &
-	$(OBJS)\basedll_zstream.obj &
-	$(OBJS)\basedll_dir.obj &
-	$(OBJS)\basedll_mimetype.obj &
-	$(OBJS)\basedll_utilsdos.obj &
-	$(OBJS)\basedll_event.obj &
-	$(OBJS)\basedll_fs_mem.obj &
-	$(OBJS)\basedll_msgout.obj &
-	$(OBJS)\basedll_utilscmn.obj
-BASELIB_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 &
-	/fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-BASELIB_OBJECTS =  &
-	$(OBJS)\baselib_dummy.obj &
-	$(OBJS)\baselib_appbase.obj &
-	$(OBJS)\baselib_arcall.obj &
-	$(OBJS)\baselib_arcfind.obj &
-	$(OBJS)\baselib_archive.obj &
-	$(OBJS)\baselib_clntdata.obj &
-	$(OBJS)\baselib_cmdline.obj &
-	$(OBJS)\baselib_config.obj &
-	$(OBJS)\baselib_convauto.obj &
-	$(OBJS)\baselib_datetime.obj &
-	$(OBJS)\baselib_datstrm.obj &
-	$(OBJS)\baselib_dircmn.obj &
-	$(OBJS)\baselib_dynarray.obj &
-	$(OBJS)\baselib_dynlib.obj &
-	$(OBJS)\baselib_dynload.obj &
-	$(OBJS)\baselib_encconv.obj &
-	$(OBJS)\baselib_extended.obj &
-	$(OBJS)\baselib_ffile.obj &
-	$(OBJS)\baselib_file.obj &
-	$(OBJS)\baselib_fileback.obj &
-	$(OBJS)\baselib_fileconf.obj &
-	$(OBJS)\baselib_filefn.obj &
-	$(OBJS)\baselib_filename.obj &
-	$(OBJS)\baselib_filesys.obj &
-	$(OBJS)\baselib_filtall.obj &
-	$(OBJS)\baselib_filtfind.obj &
-	$(OBJS)\baselib_fmapbase.obj &
-	$(OBJS)\baselib_fs_arc.obj &
-	$(OBJS)\baselib_fs_filter.obj &
-	$(OBJS)\baselib_hash.obj &
-	$(OBJS)\baselib_hashmap.obj &
-	$(OBJS)\baselib_init.obj &
-	$(OBJS)\baselib_intl.obj &
-	$(OBJS)\baselib_ipcbase.obj &
-	$(OBJS)\baselib_list.obj &
-	$(OBJS)\baselib_log.obj &
-	$(OBJS)\baselib_longlong.obj &
-	$(OBJS)\baselib_memory.obj &
-	$(OBJS)\baselib_mimecmn.obj &
-	$(OBJS)\baselib_module.obj &
-	$(OBJS)\baselib_mstream.obj &
-	$(OBJS)\baselib_object.obj &
-	$(OBJS)\baselib_platinfo.obj &
-	$(OBJS)\baselib_powercmn.obj &
-	$(OBJS)\baselib_process.obj &
-	$(OBJS)\baselib_regex.obj &
-	$(OBJS)\baselib_stdpbase.obj &
-	$(OBJS)\baselib_sstream.obj &
-	$(OBJS)\baselib_stopwatch.obj &
-	$(OBJS)\baselib_strconv.obj &
-	$(OBJS)\baselib_stream.obj &
-	$(OBJS)\baselib_string.obj &
-	$(OBJS)\baselib_sysopt.obj &
-	$(OBJS)\baselib_tarstrm.obj &
-	$(OBJS)\baselib_textbuf.obj &
-	$(OBJS)\baselib_textfile.obj &
-	$(OBJS)\baselib_tokenzr.obj &
-	$(OBJS)\baselib_txtstrm.obj &
-	$(OBJS)\baselib_uri.obj &
-	$(OBJS)\baselib_variant.obj &
-	$(OBJS)\baselib_wfstream.obj &
-	$(OBJS)\baselib_wxchar.obj &
-	$(OBJS)\baselib_xti.obj &
-	$(OBJS)\baselib_xtistrm.obj &
-	$(OBJS)\baselib_zipstrm.obj &
-	$(OBJS)\baselib_zstream.obj &
-	$(OBJS)\baselib_dir.obj &
-	$(OBJS)\baselib_mimetype.obj &
-	$(OBJS)\baselib_utilsdos.obj &
-	$(OBJS)\baselib_event.obj &
-	$(OBJS)\baselib_fs_mem.obj &
-	$(OBJS)\baselib_msgout.obj &
-	$(OBJS)\baselib_utilscmn.obj
-NETDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
-	/fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-NETDLL_OBJECTS =  &
-	$(OBJS)\netdll_dummy.obj &
-	$(OBJS)\netdll_fs_inet.obj &
-	$(OBJS)\netdll_ftp.obj &
-	$(OBJS)\netdll_http.obj &
-	$(OBJS)\netdll_protocol.obj &
-	$(OBJS)\netdll_sckaddr.obj &
-	$(OBJS)\netdll_sckfile.obj &
-	$(OBJS)\netdll_sckipc.obj &
-	$(OBJS)\netdll_sckstrm.obj &
-	$(OBJS)\netdll_socket.obj &
-	$(OBJS)\netdll_url.obj
-NETLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-NETLIB_OBJECTS =  &
-	$(OBJS)\netlib_dummy.obj &
-	$(OBJS)\netlib_fs_inet.obj &
-	$(OBJS)\netlib_ftp.obj &
-	$(OBJS)\netlib_http.obj &
-	$(OBJS)\netlib_protocol.obj &
-	$(OBJS)\netlib_sckaddr.obj &
-	$(OBJS)\netlib_sckfile.obj &
-	$(OBJS)\netlib_sckipc.obj &
-	$(OBJS)\netlib_sckstrm.obj &
-	$(OBJS)\netlib_socket.obj &
-	$(OBJS)\netlib_url.obj
-COREDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 &
-	/fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-COREDLL_OBJECTS =  &
-	$(OBJS)\coredll_dummy.obj &
-	$(OBJS)\coredll_event.obj &
-	$(OBJS)\coredll_fs_mem.obj &
-	$(OBJS)\coredll_msgout.obj &
-	$(OBJS)\coredll_utilscmn.obj &
-	$(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-CORELIB_OBJECTS =  &
-	$(OBJS)\corelib_dummy.obj &
-	$(OBJS)\corelib_event.obj &
-	$(OBJS)\corelib_fs_mem.obj &
-	$(OBJS)\corelib_msgout.obj &
-	$(OBJS)\corelib_utilscmn.obj &
-	$(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV &
-	/fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-ADVDLL_OBJECTS =  &
-	$(OBJS)\advdll_dummy.obj &
-	$(OBJS)\advdll_animatecmn.obj &
-	$(OBJS)\advdll_datavcmn.obj &
-	$(OBJS)\advdll_aboutdlgg.obj &
-	$(OBJS)\advdll_animateg.obj &
-	$(OBJS)\advdll_bmpcboxg.obj &
-	$(OBJS)\advdll_calctrl.obj &
-	$(OBJS)\advdll_datavgen.obj &
-	$(OBJS)\advdll_datectlg.obj &
-	$(OBJS)\advdll_grid.obj &
-	$(OBJS)\advdll_gridctrl.obj &
-	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_hyperlink.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_odcombo.obj &
-	$(OBJS)\advdll_propdlg.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_wizard.obj
-ADVLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-ADVLIB_OBJECTS =  &
-	$(OBJS)\advlib_dummy.obj &
-	$(OBJS)\advlib_animatecmn.obj &
-	$(OBJS)\advlib_datavcmn.obj &
-	$(OBJS)\advlib_aboutdlgg.obj &
-	$(OBJS)\advlib_animateg.obj &
-	$(OBJS)\advlib_bmpcboxg.obj &
-	$(OBJS)\advlib_calctrl.obj &
-	$(OBJS)\advlib_datavgen.obj &
-	$(OBJS)\advlib_datectlg.obj &
-	$(OBJS)\advlib_grid.obj &
-	$(OBJS)\advlib_gridctrl.obj &
-	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_hyperlink.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_odcombo.obj &
-	$(OBJS)\advlib_propdlg.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_wizard.obj
-MEDIADLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA &
-	/fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-MEDIADLL_OBJECTS =  &
-	$(OBJS)\mediadll_dummy.obj &
-	$(OBJS)\mediadll_mediactrlcmn.obj
-MEDIALIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-MEDIALIB_OBJECTS =  &
-	$(OBJS)\medialib_dummy.obj &
-	$(OBJS)\medialib_mediactrlcmn.obj
-HTMLDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML &
-	/fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-HTMLDLL_OBJECTS =  &
-	$(OBJS)\htmldll_dummy.obj &
-	$(OBJS)\htmldll_helpctrl.obj &
-	$(OBJS)\htmldll_helpdata.obj &
-	$(OBJS)\htmldll_helpdlg.obj &
-	$(OBJS)\htmldll_helpfrm.obj &
-	$(OBJS)\htmldll_helpwnd.obj &
-	$(OBJS)\htmldll_htmlcell.obj &
-	$(OBJS)\htmldll_htmlfilt.obj &
-	$(OBJS)\htmldll_htmlpars.obj &
-	$(OBJS)\htmldll_htmltag.obj &
-	$(OBJS)\htmldll_htmlwin.obj &
-	$(OBJS)\htmldll_htmprint.obj &
-	$(OBJS)\htmldll_m_dflist.obj &
-	$(OBJS)\htmldll_m_fonts.obj &
-	$(OBJS)\htmldll_m_hline.obj &
-	$(OBJS)\htmldll_m_image.obj &
-	$(OBJS)\htmldll_m_layout.obj &
-	$(OBJS)\htmldll_m_links.obj &
-	$(OBJS)\htmldll_m_list.obj &
-	$(OBJS)\htmldll_m_pre.obj &
-	$(OBJS)\htmldll_m_style.obj &
-	$(OBJS)\htmldll_m_tables.obj &
-	$(OBJS)\htmldll_winpars.obj &
-	$(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-HTMLLIB_OBJECTS =  &
-	$(OBJS)\htmllib_dummy.obj &
-	$(OBJS)\htmllib_helpctrl.obj &
-	$(OBJS)\htmllib_helpdata.obj &
-	$(OBJS)\htmllib_helpdlg.obj &
-	$(OBJS)\htmllib_helpfrm.obj &
-	$(OBJS)\htmllib_helpwnd.obj &
-	$(OBJS)\htmllib_htmlcell.obj &
-	$(OBJS)\htmllib_htmlfilt.obj &
-	$(OBJS)\htmllib_htmlpars.obj &
-	$(OBJS)\htmllib_htmltag.obj &
-	$(OBJS)\htmllib_htmlwin.obj &
-	$(OBJS)\htmllib_htmprint.obj &
-	$(OBJS)\htmllib_m_dflist.obj &
-	$(OBJS)\htmllib_m_fonts.obj &
-	$(OBJS)\htmllib_m_hline.obj &
-	$(OBJS)\htmllib_m_image.obj &
-	$(OBJS)\htmllib_m_layout.obj &
-	$(OBJS)\htmllib_m_links.obj &
-	$(OBJS)\htmllib_m_list.obj &
-	$(OBJS)\htmllib_m_pre.obj &
-	$(OBJS)\htmllib_m_style.obj &
-	$(OBJS)\htmllib_m_tables.obj &
-	$(OBJS)\htmllib_winpars.obj &
-	$(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA &
-	/fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-QADLL_OBJECTS =  &
-	$(OBJS)\qadll_dummy.obj &
-	$(OBJS)\qadll_debugrpt.obj &
-	$(OBJS)\qadll_dbgrptg.obj
-QALIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-QALIB_OBJECTS =  &
-	$(OBJS)\qalib_dummy.obj &
-	$(OBJS)\qalib_debugrpt.obj &
-	$(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML &
-	/fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-XMLDLL_OBJECTS =  &
-	$(OBJS)\xmldll_dummy.obj &
-	$(OBJS)\xmldll_xml.obj &
-	$(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-XMLLIB_OBJECTS =  &
-	$(OBJS)\xmllib_dummy.obj &
-	$(OBJS)\xmllib_xml.obj &
-	$(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC &
-	/fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-XRCDLL_OBJECTS =  &
-	$(OBJS)\xrcdll_dummy.obj &
-	$(OBJS)\xrcdll_xh_animatctrl.obj &
-	$(OBJS)\xrcdll_xh_bmp.obj &
-	$(OBJS)\xrcdll_xh_bmpcbox.obj &
-	$(OBJS)\xrcdll_xh_bmpbt.obj &
-	$(OBJS)\xrcdll_xh_bttn.obj &
-	$(OBJS)\xrcdll_xh_cald.obj &
-	$(OBJS)\xrcdll_xh_chckb.obj &
-	$(OBJS)\xrcdll_xh_chckl.obj &
-	$(OBJS)\xrcdll_xh_choic.obj &
-	$(OBJS)\xrcdll_xh_choicbk.obj &
-	$(OBJS)\xrcdll_xh_clrpicker.obj &
-	$(OBJS)\xrcdll_xh_collpane.obj &
-	$(OBJS)\xrcdll_xh_combo.obj &
-	$(OBJS)\xrcdll_xh_datectrl.obj &
-	$(OBJS)\xrcdll_xh_dirpicker.obj &
-	$(OBJS)\xrcdll_xh_dlg.obj &
-	$(OBJS)\xrcdll_xh_frame.obj &
-	$(OBJS)\xrcdll_xh_mdi.obj &
-	$(OBJS)\xrcdll_xh_filepicker.obj &
-	$(OBJS)\xrcdll_xh_fontpicker.obj &
-	$(OBJS)\xrcdll_xh_gauge.obj &
-	$(OBJS)\xrcdll_xh_gdctl.obj &
-	$(OBJS)\xrcdll_xh_grid.obj &
-	$(OBJS)\xrcdll_xh_html.obj &
-	$(OBJS)\xrcdll_xh_hyperlink.obj &
-	$(OBJS)\xrcdll_xh_listb.obj &
-	$(OBJS)\xrcdll_xh_listbk.obj &
-	$(OBJS)\xrcdll_xh_listc.obj &
-	$(OBJS)\xrcdll_xh_menu.obj &
-	$(OBJS)\xrcdll_xh_notbk.obj &
-	$(OBJS)\xrcdll_xh_odcombo.obj &
-	$(OBJS)\xrcdll_xh_panel.obj &
-	$(OBJS)\xrcdll_xh_radbt.obj &
-	$(OBJS)\xrcdll_xh_radbx.obj &
-	$(OBJS)\xrcdll_xh_scrol.obj &
-	$(OBJS)\xrcdll_xh_scwin.obj &
-	$(OBJS)\xrcdll_xh_htmllbox.obj &
-	$(OBJS)\xrcdll_xh_sizer.obj &
-	$(OBJS)\xrcdll_xh_slidr.obj &
-	$(OBJS)\xrcdll_xh_spin.obj &
-	$(OBJS)\xrcdll_xh_split.obj &
-	$(OBJS)\xrcdll_xh_statbar.obj &
-	$(OBJS)\xrcdll_xh_stbmp.obj &
-	$(OBJS)\xrcdll_xh_stbox.obj &
-	$(OBJS)\xrcdll_xh_stlin.obj &
-	$(OBJS)\xrcdll_xh_sttxt.obj &
-	$(OBJS)\xrcdll_xh_text.obj &
-	$(OBJS)\xrcdll_xh_tglbtn.obj &
-	$(OBJS)\xrcdll_xh_toolb.obj &
-	$(OBJS)\xrcdll_xh_tree.obj &
-	$(OBJS)\xrcdll_xh_treebk.obj &
-	$(OBJS)\xrcdll_xh_unkwn.obj &
-	$(OBJS)\xrcdll_xh_wizrd.obj &
-	$(OBJS)\xrcdll_xmlres.obj &
-	$(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-XRCLIB_OBJECTS =  &
-	$(OBJS)\xrclib_dummy.obj &
-	$(OBJS)\xrclib_xh_animatctrl.obj &
-	$(OBJS)\xrclib_xh_bmp.obj &
-	$(OBJS)\xrclib_xh_bmpcbox.obj &
-	$(OBJS)\xrclib_xh_bmpbt.obj &
-	$(OBJS)\xrclib_xh_bttn.obj &
-	$(OBJS)\xrclib_xh_cald.obj &
-	$(OBJS)\xrclib_xh_chckb.obj &
-	$(OBJS)\xrclib_xh_chckl.obj &
-	$(OBJS)\xrclib_xh_choic.obj &
-	$(OBJS)\xrclib_xh_choicbk.obj &
-	$(OBJS)\xrclib_xh_clrpicker.obj &
-	$(OBJS)\xrclib_xh_collpane.obj &
-	$(OBJS)\xrclib_xh_combo.obj &
-	$(OBJS)\xrclib_xh_datectrl.obj &
-	$(OBJS)\xrclib_xh_dirpicker.obj &
-	$(OBJS)\xrclib_xh_dlg.obj &
-	$(OBJS)\xrclib_xh_frame.obj &
-	$(OBJS)\xrclib_xh_mdi.obj &
-	$(OBJS)\xrclib_xh_filepicker.obj &
-	$(OBJS)\xrclib_xh_fontpicker.obj &
-	$(OBJS)\xrclib_xh_gauge.obj &
-	$(OBJS)\xrclib_xh_gdctl.obj &
-	$(OBJS)\xrclib_xh_grid.obj &
-	$(OBJS)\xrclib_xh_html.obj &
-	$(OBJS)\xrclib_xh_hyperlink.obj &
-	$(OBJS)\xrclib_xh_listb.obj &
-	$(OBJS)\xrclib_xh_listbk.obj &
-	$(OBJS)\xrclib_xh_listc.obj &
-	$(OBJS)\xrclib_xh_menu.obj &
-	$(OBJS)\xrclib_xh_notbk.obj &
-	$(OBJS)\xrclib_xh_odcombo.obj &
-	$(OBJS)\xrclib_xh_panel.obj &
-	$(OBJS)\xrclib_xh_radbt.obj &
-	$(OBJS)\xrclib_xh_radbx.obj &
-	$(OBJS)\xrclib_xh_scrol.obj &
-	$(OBJS)\xrclib_xh_scwin.obj &
-	$(OBJS)\xrclib_xh_htmllbox.obj &
-	$(OBJS)\xrclib_xh_sizer.obj &
-	$(OBJS)\xrclib_xh_slidr.obj &
-	$(OBJS)\xrclib_xh_spin.obj &
-	$(OBJS)\xrclib_xh_split.obj &
-	$(OBJS)\xrclib_xh_statbar.obj &
-	$(OBJS)\xrclib_xh_stbmp.obj &
-	$(OBJS)\xrclib_xh_stbox.obj &
-	$(OBJS)\xrclib_xh_stlin.obj &
-	$(OBJS)\xrclib_xh_sttxt.obj &
-	$(OBJS)\xrclib_xh_text.obj &
-	$(OBJS)\xrclib_xh_tglbtn.obj &
-	$(OBJS)\xrclib_xh_toolb.obj &
-	$(OBJS)\xrclib_xh_tree.obj &
-	$(OBJS)\xrclib_xh_treebk.obj &
-	$(OBJS)\xrclib_xh_unkwn.obj &
-	$(OBJS)\xrclib_xh_wizrd.obj &
-	$(OBJS)\xrclib_xmlres.obj &
-	$(OBJS)\xrclib_xmlrsall.obj
-AUIDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI &
-	/fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-AUIDLL_OBJECTS =  &
-	$(OBJS)\auidll_dummy.obj &
-	$(OBJS)\auidll_framemanager.obj &
-	$(OBJS)\auidll_dockart.obj &
-	$(OBJS)\auidll_floatpane.obj &
-	$(OBJS)\auidll_auibook.obj &
-	$(OBJS)\auidll_tabmdi.obj
-AUILIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-AUILIB_OBJECTS =  &
-	$(OBJS)\auilib_dummy.obj &
-	$(OBJS)\auilib_framemanager.obj &
-	$(OBJS)\auilib_dockart.obj &
-	$(OBJS)\auilib_floatpane.obj &
-	$(OBJS)\auilib_auibook.obj &
-	$(OBJS)\auilib_tabmdi.obj
-RICHTEXTDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT &
-	/fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-RICHTEXTDLL_OBJECTS =  &
-	$(OBJS)\richtextdll_dummy.obj &
-	$(OBJS)\richtextdll_richtextctrl.obj &
-	$(OBJS)\richtextdll_richtextbuffer.obj &
-	$(OBJS)\richtextdll_richtextstyles.obj &
-	$(OBJS)\richtextdll_richtextxml.obj &
-	$(OBJS)\richtextdll_richtexthtml.obj &
-	$(OBJS)\richtextdll_richtextformatdlg.obj &
-	$(OBJS)\richtextdll_richtextsymboldlg.obj &
-	$(OBJS)\richtextdll_richtextstyledlg.obj &
-	$(OBJS)\richtextdll_richtextprint.obj
-RICHTEXTLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-RICHTEXTLIB_OBJECTS =  &
-	$(OBJS)\richtextlib_dummy.obj &
-	$(OBJS)\richtextlib_richtextctrl.obj &
-	$(OBJS)\richtextlib_richtextbuffer.obj &
-	$(OBJS)\richtextlib_richtextstyles.obj &
-	$(OBJS)\richtextlib_richtextxml.obj &
-	$(OBJS)\richtextlib_richtexthtml.obj &
-	$(OBJS)\richtextlib_richtextformatdlg.obj &
-	$(OBJS)\richtextlib_richtextsymboldlg.obj &
-	$(OBJS)\richtextlib_richtextstyledlg.obj &
-	$(OBJS)\richtextlib_richtextprint.obj
-GLDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL &
-	/fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-GLDLL_OBJECTS =  &
-	$(OBJS)\gldll_dummy.obj
-GLLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-	-d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-	$(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-	$(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-	-i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-GLLIB_OBJECTS =  &
-	$(OBJS)\gllib_dummy.obj
-BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-	-del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
-	-del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
-	cd ..\..\samples
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-	cd $(WATCOM_CWD)
-
-setup_h : .SYMBOLIC $(SETUPHDIR)\wx ..\..\include\wx\univ\setup.h $(SETUPHDIR)\wx\setup.h
-
-$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib :  $(WXREGEX_OBJECTS)
-	@%create $(OBJS)\wxregex.lbc
-	@for %i in ($(WXREGEX_OBJECTS)) do @%append $(OBJS)\wxregex.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxregex.lbc
-
-$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib :  $(WXZLIB_OBJECTS)
-	@%create $(OBJS)\wxzlib.lbc
-	@for %i in ($(WXZLIB_OBJECTS)) do @%append $(OBJS)\wxzlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxzlib.lbc
-
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib :  $(WXPNG_OBJECTS)
-	@%create $(OBJS)\wxpng.lbc
-	@for %i in ($(WXPNG_OBJECTS)) do @%append $(OBJS)\wxpng.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxpng.lbc
-!endif
-
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib :  $(WXJPEG_OBJECTS)
-	@%create $(OBJS)\wxjpeg.lbc
-	@for %i in ($(WXJPEG_OBJECTS)) do @%append $(OBJS)\wxjpeg.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxjpeg.lbc
-!endif
-
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib :  $(WXTIFF_OBJECTS)
-	@%create $(OBJS)\wxtiff.lbc
-	@for %i in ($(WXTIFF_OBJECTS)) do @%append $(OBJS)\wxtiff.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxtiff.lbc
-!endif
-
-$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib :  $(WXEXPAT_OBJECTS)
-	@%create $(OBJS)\wxexpat.lbc
-	@for %i in ($(WXEXPAT_OBJECTS)) do @%append $(OBJS)\wxexpat.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\wxexpat.lbc
-
-!ifeq MONOLITHIC 1
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll :  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	@%create $(OBJS)\monodll.lbc
-	@%append $(OBJS)\monodll.lbc option quiet
-	@%append $(OBJS)\monodll.lbc name $^@
-	@%append $(OBJS)\monodll.lbc option caseexact
-	@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib    ) do @%append $(OBJS)\monodll.lbc library %i
-	@%append $(OBJS)\monodll.lbc
-	@%append $(OBJS)\monodll.lbc system
-	wlink @$(OBJS)\monodll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@
-!endif
-!endif
-
-!ifeq MONOLITHIC 1
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib :  $(MONOLIB_OBJECTS)
-	@%create $(OBJS)\monolib.lbc
-	@for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i
-	wlib -q -p8192 -n -b $^@ @$(OBJS)\monolib.lbc
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll :  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-	@%create $(OBJS)\basedll.lbc
-	@%append $(OBJS)\basedll.lbc option quiet
-	@%append $(OBJS)\basedll.lbc name $^@
-	@%append $(OBJS)\basedll.lbc option caseexact
-	@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
-	@for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib) do @%append $(OBJS)\basedll.lbc library %i
-	@%append $(OBJS)\basedll.lbc
-	@%append $(OBJS)\basedll.lbc system
-	wlink @$(OBJS)\basedll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib :  $(BASELIB_OBJECTS)
-	@%create $(OBJS)\baselib.lbc
-	@for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\baselib.lbc
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll :  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-	@%create $(OBJS)\netdll.lbc
-	@%append $(OBJS)\netdll.lbc option quiet
-	@%append $(OBJS)\netdll.lbc name $^@
-	@%append $(OBJS)\netdll.lbc option caseexact
-	@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
-	@for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i
-	@%append $(OBJS)\netdll.lbc
-	@%append $(OBJS)\netdll.lbc system
-	wlink @$(OBJS)\netdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +$^@
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib :  $(NETLIB_OBJECTS)
-	@%create $(OBJS)\netlib.lbc
-	@for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\netlib.lbc
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll :  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-	@%create $(OBJS)\coredll.lbc
-	@%append $(OBJS)\coredll.lbc option quiet
-	@%append $(OBJS)\coredll.lbc name $^@
-	@%append $(OBJS)\coredll.lbc option caseexact
-	@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i
-	@%append $(OBJS)\coredll.lbc
-	@%append $(OBJS)\coredll.lbc system
-	wlink @$(OBJS)\coredll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib :  $(CORELIB_OBJECTS)
-	@%create $(OBJS)\corelib.lbc
-	@for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\corelib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll :  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-	@%create $(OBJS)\advdll.lbc
-	@%append $(OBJS)\advdll.lbc option quiet
-	@%append $(OBJS)\advdll.lbc name $^@
-	@%append $(OBJS)\advdll.lbc option caseexact
-	@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
-	@%append $(OBJS)\advdll.lbc
-	@%append $(OBJS)\advdll.lbc system
-	wlink @$(OBJS)\advdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib :  $(ADVLIB_OBJECTS)
-	@%create $(OBJS)\advlib.lbc
-	@for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\advlib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_MEDIA 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll :  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-	@%create $(OBJS)\mediadll.lbc
-	@%append $(OBJS)\mediadll.lbc option quiet
-	@%append $(OBJS)\mediadll.lbc name $^@
-	@%append $(OBJS)\mediadll.lbc option caseexact
-	@%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i
-	@%append $(OBJS)\mediadll.lbc
-	@%append $(OBJS)\mediadll.lbc system
-	wlink @$(OBJS)\mediadll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_MEDIA 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib :  $(MEDIALIB_OBJECTS)
-	@%create $(OBJS)\medialib.lbc
-	@for %i in ($(MEDIALIB_OBJECTS)) do @%append $(OBJS)\medialib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\medialib.lbc
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_HTML 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll :  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-	@%create $(OBJS)\htmldll.lbc
-	@%append $(OBJS)\htmldll.lbc option quiet
-	@%append $(OBJS)\htmldll.lbc name $^@
-	@%append $(OBJS)\htmldll.lbc option caseexact
-	@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i
-	@%append $(OBJS)\htmldll.lbc
-	@%append $(OBJS)\htmldll.lbc system
-	wlink @$(OBJS)\htmldll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_HTML 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib :  $(HTMLLIB_OBJECTS)
-	@%create $(OBJS)\htmllib.lbc
-	@for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\htmllib.lbc
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_QA 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll :  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-	@%create $(OBJS)\qadll.lbc
-	@%append $(OBJS)\qadll.lbc option quiet
-	@%append $(OBJS)\qadll.lbc name $^@
-	@%append $(OBJS)\qadll.lbc option caseexact
-	@%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
-	@%append $(OBJS)\qadll.lbc
-	@%append $(OBJS)\qadll.lbc system
-	wlink @$(OBJS)\qadll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_QA 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib :  $(QALIB_OBJECTS)
-	@%create $(OBJS)\qalib.lbc
-	@for %i in ($(QALIB_OBJECTS)) do @%append $(OBJS)\qalib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\qalib.lbc
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll :  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-	@%create $(OBJS)\xmldll.lbc
-	@%append $(OBJS)\xmldll.lbc option quiet
-	@%append $(OBJS)\xmldll.lbc name $^@
-	@%append $(OBJS)\xmldll.lbc option caseexact
-	@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
-	@for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i
-	@%append $(OBJS)\xmldll.lbc
-	@%append $(OBJS)\xmldll.lbc system
-	wlink @$(OBJS)\xmldll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +$^@
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib :  $(XMLLIB_OBJECTS)
-	@%create $(OBJS)\xmllib.lbc
-	@for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\xmllib.lbc
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_XRC 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll :  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-	@%create $(OBJS)\xrcdll.lbc
-	@%append $(OBJS)\xrcdll.lbc option quiet
-	@%append $(OBJS)\xrcdll.lbc name $^@
-	@%append $(OBJS)\xrcdll.lbc option caseexact
-	@%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i
-	@%append $(OBJS)\xrcdll.lbc
-	@%append $(OBJS)\xrcdll.lbc system
-	wlink @$(OBJS)\xrcdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_XRC 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib :  $(XRCLIB_OBJECTS)
-	@%create $(OBJS)\xrclib.lbc
-	@for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_AUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll :  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-	@%create $(OBJS)\auidll.lbc
-	@%append $(OBJS)\auidll.lbc option quiet
-	@%append $(OBJS)\auidll.lbc name $^@
-	@%append $(OBJS)\auidll.lbc option caseexact
-	@%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i
-	@%append $(OBJS)\auidll.lbc
-	@%append $(OBJS)\auidll.lbc system
-	wlink @$(OBJS)\auidll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_AUI 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib :  $(AUILIB_OBJECTS)
-	@%create $(OBJS)\auilib.lbc
-	@for %i in ($(AUILIB_OBJECTS)) do @%append $(OBJS)\auilib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\auilib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_RICHTEXT 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll :  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-	@%create $(OBJS)\richtextdll.lbc
-	@%append $(OBJS)\richtextdll.lbc option quiet
-	@%append $(OBJS)\richtextdll.lbc name $^@
-	@%append $(OBJS)\richtextdll.lbc option caseexact
-	@%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i
-	@%append $(OBJS)\richtextdll.lbc
-	@%append $(OBJS)\richtextdll.lbc system
-	wlink @$(OBJS)\richtextdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_RICHTEXT 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib :  $(RICHTEXTLIB_OBJECTS)
-	@%create $(OBJS)\richtextlib.lbc
-	@for %i in ($(RICHTEXTLIB_OBJECTS)) do @%append $(OBJS)\richtextlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\richtextlib.lbc
-!endif
-!endif
-!endif
-
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_OPENGL 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll :  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
-	@%create $(OBJS)\gldll.lbc
-	@%append $(OBJS)\gldll.lbc option quiet
-	@%append $(OBJS)\gldll.lbc name $^@
-	@%append $(OBJS)\gldll.lbc option caseexact
-	@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-	@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) ) do @%append $(OBJS)\gldll.lbc library %i
-	@%append $(OBJS)\gldll.lbc
-	@%append $(OBJS)\gldll.lbc system
-	wlink @$(OBJS)\gldll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_OPENGL 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib :  $(GLLIB_OBJECTS)
-	@%create $(OBJS)\gllib.lbc
-	@for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\gllib.lbc
-!endif
-!endif
-!endif
-
-samples : .SYMBOLIC 
-	cd ..\..\samples
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-	cd $(WATCOM_CWD)
-
-$(LIBDIRNAME) :  
-	if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
-
-$(SETUPHDIR) :  $(LIBDIRNAME)
-	if not exist $(SETUPHDIR) mkdir $(SETUPHDIR)
-
-$(SETUPHDIR)\wx :  $(SETUPHDIR)
-	if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
-
-..\..\include\wx\univ\setup.h :  
-	if not exist ..\..\include\wx\univ\setup.h copy ..\..\include\wx\univ\setup0.h ..\..\include\wx\univ\setup.h
-
-$(SETUPHDIR)\wx\setup.h :  
-	if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\univ\setup.h $(SETUPHDIR)\wx\setup.h
-
-build_cfg_file : .SYMBOLIC $(SETUPHDIR)
-	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-	@echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
-	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
-	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
-	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
-	@echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
-	@echo WXUNIV=1 >>$(BUILD_CFG_FILE)
-	@echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
-	@echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
-	@echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
-	@echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
-	@echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
-	@echo RUNTIME_LIBS=static >>$(BUILD_CFG_FILE)
-	@echo MSLU=0 >>$(BUILD_CFG_FILE)
-	@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
-	@echo USE_THREADS=0 >>$(BUILD_CFG_FILE)
-	@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
-	@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
-	@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-	@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
-	@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-	@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
-	@echo COMPILER=wat >>$(BUILD_CFG_FILE)
-	@echo CC=$(CC) >>$(BUILD_CFG_FILE)
-	@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
-	@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
-	@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
-	@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
-	@echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
-
-$(OBJS)\wxregex_regcomp.obj :  .AUTODEPEND ..\..\src\regex\regcomp.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXREGEX_CFLAGS) $<
-
-$(OBJS)\wxregex_regexec.obj :  .AUTODEPEND ..\..\src\regex\regexec.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXREGEX_CFLAGS) $<
-
-$(OBJS)\wxregex_regerror.obj :  .AUTODEPEND ..\..\src\regex\regerror.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXREGEX_CFLAGS) $<
-
-$(OBJS)\wxregex_regfree.obj :  .AUTODEPEND ..\..\src\regex\regfree.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXREGEX_CFLAGS) $<
-
-$(OBJS)\wxzlib_adler32.obj :  .AUTODEPEND ..\..\src\zlib\adler32.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_compress.obj :  .AUTODEPEND ..\..\src\zlib\compress.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_crc32.obj :  .AUTODEPEND ..\..\src\zlib\crc32.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_gzio.obj :  .AUTODEPEND ..\..\src\zlib\gzio.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_uncompr.obj :  .AUTODEPEND ..\..\src\zlib\uncompr.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_deflate.obj :  .AUTODEPEND ..\..\src\zlib\deflate.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_trees.obj :  .AUTODEPEND ..\..\src\zlib\trees.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_zutil.obj :  .AUTODEPEND ..\..\src\zlib\zutil.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_inflate.obj :  .AUTODEPEND ..\..\src\zlib\inflate.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_infback.obj :  .AUTODEPEND ..\..\src\zlib\infback.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_inftrees.obj :  .AUTODEPEND ..\..\src\zlib\inftrees.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxzlib_inffast.obj :  .AUTODEPEND ..\..\src\zlib\inffast.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXZLIB_CFLAGS) $<
-
-$(OBJS)\wxpng_png.obj :  .AUTODEPEND ..\..\src\png\png.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngerror.obj :  .AUTODEPEND ..\..\src\png\pngerror.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pnggccrd.obj :  .AUTODEPEND ..\..\src\png\pnggccrd.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngget.obj :  .AUTODEPEND ..\..\src\png\pngget.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngmem.obj :  .AUTODEPEND ..\..\src\png\pngmem.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngpread.obj :  .AUTODEPEND ..\..\src\png\pngpread.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngread.obj :  .AUTODEPEND ..\..\src\png\pngread.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngrio.obj :  .AUTODEPEND ..\..\src\png\pngrio.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngrtran.obj :  .AUTODEPEND ..\..\src\png\pngrtran.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngrutil.obj :  .AUTODEPEND ..\..\src\png\pngrutil.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngset.obj :  .AUTODEPEND ..\..\src\png\pngset.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngtrans.obj :  .AUTODEPEND ..\..\src\png\pngtrans.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngvcrd.obj :  .AUTODEPEND ..\..\src\png\pngvcrd.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngwio.obj :  .AUTODEPEND ..\..\src\png\pngwio.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngwrite.obj :  .AUTODEPEND ..\..\src\png\pngwrite.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngwtran.obj :  .AUTODEPEND ..\..\src\png\pngwtran.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxpng_pngwutil.obj :  .AUTODEPEND ..\..\src\png\pngwutil.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXPNG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcomapi.obj :  .AUTODEPEND ..\..\src\jpeg\jcomapi.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jutils.obj :  .AUTODEPEND ..\..\src\jpeg\jutils.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jerror.obj :  .AUTODEPEND ..\..\src\jpeg\jerror.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jmemmgr.obj :  .AUTODEPEND ..\..\src\jpeg\jmemmgr.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jmemnobs.obj :  .AUTODEPEND ..\..\src\jpeg\jmemnobs.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcapimin.obj :  .AUTODEPEND ..\..\src\jpeg\jcapimin.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcapistd.obj :  .AUTODEPEND ..\..\src\jpeg\jcapistd.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jctrans.obj :  .AUTODEPEND ..\..\src\jpeg\jctrans.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcparam.obj :  .AUTODEPEND ..\..\src\jpeg\jcparam.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdatadst.obj :  .AUTODEPEND ..\..\src\jpeg\jdatadst.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcinit.obj :  .AUTODEPEND ..\..\src\jpeg\jcinit.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcmaster.obj :  .AUTODEPEND ..\..\src\jpeg\jcmaster.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcmarker.obj :  .AUTODEPEND ..\..\src\jpeg\jcmarker.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcmainct.obj :  .AUTODEPEND ..\..\src\jpeg\jcmainct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcprepct.obj :  .AUTODEPEND ..\..\src\jpeg\jcprepct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jccoefct.obj :  .AUTODEPEND ..\..\src\jpeg\jccoefct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jccolor.obj :  .AUTODEPEND ..\..\src\jpeg\jccolor.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcsample.obj :  .AUTODEPEND ..\..\src\jpeg\jcsample.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jchuff.obj :  .AUTODEPEND ..\..\src\jpeg\jchuff.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcphuff.obj :  .AUTODEPEND ..\..\src\jpeg\jcphuff.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jcdctmgr.obj :  .AUTODEPEND ..\..\src\jpeg\jcdctmgr.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jfdctfst.obj :  .AUTODEPEND ..\..\src\jpeg\jfdctfst.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jfdctflt.obj :  .AUTODEPEND ..\..\src\jpeg\jfdctflt.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jfdctint.obj :  .AUTODEPEND ..\..\src\jpeg\jfdctint.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdapimin.obj :  .AUTODEPEND ..\..\src\jpeg\jdapimin.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdapistd.obj :  .AUTODEPEND ..\..\src\jpeg\jdapistd.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdtrans.obj :  .AUTODEPEND ..\..\src\jpeg\jdtrans.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdatasrc.obj :  .AUTODEPEND ..\..\src\jpeg\jdatasrc.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdmaster.obj :  .AUTODEPEND ..\..\src\jpeg\jdmaster.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdinput.obj :  .AUTODEPEND ..\..\src\jpeg\jdinput.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdmarker.obj :  .AUTODEPEND ..\..\src\jpeg\jdmarker.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdhuff.obj :  .AUTODEPEND ..\..\src\jpeg\jdhuff.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdphuff.obj :  .AUTODEPEND ..\..\src\jpeg\jdphuff.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdmainct.obj :  .AUTODEPEND ..\..\src\jpeg\jdmainct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdcoefct.obj :  .AUTODEPEND ..\..\src\jpeg\jdcoefct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdpostct.obj :  .AUTODEPEND ..\..\src\jpeg\jdpostct.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jddctmgr.obj :  .AUTODEPEND ..\..\src\jpeg\jddctmgr.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jidctfst.obj :  .AUTODEPEND ..\..\src\jpeg\jidctfst.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jidctflt.obj :  .AUTODEPEND ..\..\src\jpeg\jidctflt.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jidctint.obj :  .AUTODEPEND ..\..\src\jpeg\jidctint.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jidctred.obj :  .AUTODEPEND ..\..\src\jpeg\jidctred.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdsample.obj :  .AUTODEPEND ..\..\src\jpeg\jdsample.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdcolor.obj :  .AUTODEPEND ..\..\src\jpeg\jdcolor.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jquant1.obj :  .AUTODEPEND ..\..\src\jpeg\jquant1.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jquant2.obj :  .AUTODEPEND ..\..\src\jpeg\jquant2.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxjpeg_jdmerge.obj :  .AUTODEPEND ..\..\src\jpeg\jdmerge.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXJPEG_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_msdos.obj :  .AUTODEPEND ..\..\src\tiff\tif_msdos.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_aux.obj :  .AUTODEPEND ..\..\src\tiff\tif_aux.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_close.obj :  .AUTODEPEND ..\..\src\tiff\tif_close.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_codec.obj :  .AUTODEPEND ..\..\src\tiff\tif_codec.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_color.obj :  .AUTODEPEND ..\..\src\tiff\tif_color.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_compress.obj :  .AUTODEPEND ..\..\src\tiff\tif_compress.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_dir.obj :  .AUTODEPEND ..\..\src\tiff\tif_dir.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_dirinfo.obj :  .AUTODEPEND ..\..\src\tiff\tif_dirinfo.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_dirread.obj :  .AUTODEPEND ..\..\src\tiff\tif_dirread.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_dirwrite.obj :  .AUTODEPEND ..\..\src\tiff\tif_dirwrite.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_dumpmode.obj :  .AUTODEPEND ..\..\src\tiff\tif_dumpmode.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_error.obj :  .AUTODEPEND ..\..\src\tiff\tif_error.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_extension.obj :  .AUTODEPEND ..\..\src\tiff\tif_extension.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_fax3.obj :  .AUTODEPEND ..\..\src\tiff\tif_fax3.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_fax3sm.obj :  .AUTODEPEND ..\..\src\tiff\tif_fax3sm.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_getimage.obj :  .AUTODEPEND ..\..\src\tiff\tif_getimage.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_jpeg.obj :  .AUTODEPEND ..\..\src\tiff\tif_jpeg.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_flush.obj :  .AUTODEPEND ..\..\src\tiff\tif_flush.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_lzw.obj :  .AUTODEPEND ..\..\src\tiff\tif_lzw.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_luv.obj :  .AUTODEPEND ..\..\src\tiff\tif_luv.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_next.obj :  .AUTODEPEND ..\..\src\tiff\tif_next.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_open.obj :  .AUTODEPEND ..\..\src\tiff\tif_open.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_packbits.obj :  .AUTODEPEND ..\..\src\tiff\tif_packbits.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_pixarlog.obj :  .AUTODEPEND ..\..\src\tiff\tif_pixarlog.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_predict.obj :  .AUTODEPEND ..\..\src\tiff\tif_predict.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_print.obj :  .AUTODEPEND ..\..\src\tiff\tif_print.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_read.obj :  .AUTODEPEND ..\..\src\tiff\tif_read.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_swab.obj :  .AUTODEPEND ..\..\src\tiff\tif_swab.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_strip.obj :  .AUTODEPEND ..\..\src\tiff\tif_strip.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_thunder.obj :  .AUTODEPEND ..\..\src\tiff\tif_thunder.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_tile.obj :  .AUTODEPEND ..\..\src\tiff\tif_tile.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_version.obj :  .AUTODEPEND ..\..\src\tiff\tif_version.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_warning.obj :  .AUTODEPEND ..\..\src\tiff\tif_warning.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_write.obj :  .AUTODEPEND ..\..\src\tiff\tif_write.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxtiff_tif_zip.obj :  .AUTODEPEND ..\..\src\tiff\tif_zip.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
-
-$(OBJS)\wxexpat_xmlparse.obj :  .AUTODEPEND ..\..\src\expat\lib\xmlparse.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
-
-$(OBJS)\wxexpat_xmlrole.obj :  .AUTODEPEND ..\..\src\expat\lib\xmlrole.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
-
-$(OBJS)\wxexpat_xmltok.obj :  .AUTODEPEND ..\..\src\expat\lib\xmltok.c
-	$(CC) -bt=dos -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
-
-$(OBJS)\monodll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_config.obj :  .AUTODEPEND ..\..\src\common\config.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dircmn.obj :  .AUTODEPEND ..\..\src\common\dircmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dynarray.obj :  .AUTODEPEND ..\..\src\common\dynarray.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dynlib.obj :  .AUTODEPEND ..\..\src\common\dynlib.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dynload.obj :  .AUTODEPEND ..\..\src\common\dynload.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_encconv.obj :  .AUTODEPEND ..\..\src\common\encconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_extended.obj :  .AUTODEPEND ..\..\src\common\extended.c
-	$(CC) -bt=dos -zq -fo=$^@ $(MONODLL_CFLAGS) $<
-
-$(OBJS)\monodll_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filefn.obj :  .AUTODEPEND ..\..\src\common\filefn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_hashmap.obj :  .AUTODEPEND ..\..\src\common\hashmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_init.obj :  .AUTODEPEND ..\..\src\common\init.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_log.obj :  .AUTODEPEND ..\..\src\common\log.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_longlong.obj :  .AUTODEPEND ..\..\src\common\longlong.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_memory.obj :  .AUTODEPEND ..\..\src\common\memory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mimecmn.obj :  .AUTODEPEND ..\..\src\common\mimecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_module.obj :  .AUTODEPEND ..\..\src\common\module.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_regex.obj :  .AUTODEPEND ..\..\src\common\regex.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_strconv.obj :  .AUTODEPEND ..\..\src\common\strconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stream.obj :  .AUTODEPEND ..\..\src\common\stream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_uri.obj :  .AUTODEPEND ..\..\src\common\uri.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_variant.obj :  .AUTODEPEND ..\..\src\common\variant.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wfstream.obj :  .AUTODEPEND ..\..\src\common\wfstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wxchar.obj :  .AUTODEPEND ..\..\src\common\wxchar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xti.obj :  .AUTODEPEND ..\..\src\common\xti.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xtistrm.obj :  .AUTODEPEND ..\..\src\common\xtistrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_zipstrm.obj :  .AUTODEPEND ..\..\src\common\zipstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_zstream.obj :  .AUTODEPEND ..\..\src\common\zstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dir.obj :  .AUTODEPEND ..\..\src\msdos\dir.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mimetype.obj :  .AUTODEPEND ..\..\src\msdos\mimetype.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_utilsdos.obj :  .AUTODEPEND ..\..\src\msdos\utilsdos.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fs_inet.obj :  .AUTODEPEND ..\..\src\common\fs_inet.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_protocol.obj :  .AUTODEPEND ..\..\src\common\protocol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sckaddr.obj :  .AUTODEPEND ..\..\src\common\sckaddr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sckfile.obj :  .AUTODEPEND ..\..\src\common\sckfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sckipc.obj :  .AUTODEPEND ..\..\src\common\sckipc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sckstrm.obj :  .AUTODEPEND ..\..\src\common\sckstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_colour.obj :  .AUTODEPEND ..\..\src\generic\colour.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_icon.obj :  .AUTODEPEND ..\..\src\generic\icon.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mask.obj :  .AUTODEPEND ..\..\src\generic\mask.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_timer.obj :  .AUTODEPEND ..\..\src\generic\timer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_app.obj :  .AUTODEPEND ..\..\src\mgl\app.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_bitmap.obj :  .AUTODEPEND ..\..\src\mgl\bitmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_brush.obj :  .AUTODEPEND ..\..\src\mgl\brush.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_clipbrd.obj :  .AUTODEPEND ..\..\src\mgl\clipbrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_cursor.obj :  .AUTODEPEND ..\..\src\mgl\cursor.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_data.obj :  .AUTODEPEND ..\..\src\mgl\data.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dc.obj :  .AUTODEPEND ..\..\src\mgl\dc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcclient.obj :  .AUTODEPEND ..\..\src\mgl\dcclient.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcmemory.obj :  .AUTODEPEND ..\..\src\mgl\dcmemory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_font.obj :  .AUTODEPEND ..\..\src\mgl\font.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontenum.obj :  .AUTODEPEND ..\..\src\mgl\fontenum.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontutil.obj :  .AUTODEPEND ..\..\src\mgl\fontutil.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_palette.obj :  .AUTODEPEND ..\..\src\mgl\palette.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_pen.obj :  .AUTODEPEND ..\..\src\mgl\pen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_region.obj :  .AUTODEPEND ..\..\src\mgl\region.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_settings.obj :  .AUTODEPEND ..\..\src\mgl\settings.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_toplevel.obj :  .AUTODEPEND ..\..\src\mgl\toplevel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_utils.obj :  .AUTODEPEND ..\..\src\mgl\utils.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_window.obj :  .AUTODEPEND ..\..\src\mgl\window.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_accel.obj :  .AUTODEPEND ..\..\src\generic\accel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filedlgg.obj :  .AUTODEPEND ..\..\src\generic\filedlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontdlgg.obj :  .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_listctrl.obj :  .AUTODEPEND ..\..\src\generic\listctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mdig.obj :  .AUTODEPEND ..\..\src\generic\mdig.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tabg.obj :  .AUTODEPEND ..\..\src\generic\tabg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_bmpbuttn.obj :  .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_button.obj :  .AUTODEPEND ..\..\src\univ\button.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_checkbox.obj :  .AUTODEPEND ..\..\src\univ\checkbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_checklst.obj :  .AUTODEPEND ..\..\src\univ\checklst.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_choice.obj :  .AUTODEPEND ..\..\src\univ\choice.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_colschem.obj :  .AUTODEPEND ..\..\src\univ\colschem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_combobox.obj :  .AUTODEPEND ..\..\src\univ\combobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_inphand.obj :  .AUTODEPEND ..\..\src\univ\inphand.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_listbox.obj :  .AUTODEPEND ..\..\src\univ\listbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_menu.obj :  .AUTODEPEND ..\..\src\univ\menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_notebook.obj :  .AUTODEPEND ..\..\src\univ\notebook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_radiobox.obj :  .AUTODEPEND ..\..\src\univ\radiobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_radiobut.obj :  .AUTODEPEND ..\..\src\univ\radiobut.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_spinbutt.obj :  .AUTODEPEND ..\..\src\univ\spinbutt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_statbmp.obj :  .AUTODEPEND ..\..\src\univ\statbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_statbox.obj :  .AUTODEPEND ..\..\src\univ\statbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_statline.obj :  .AUTODEPEND ..\..\src\univ\statline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_statusbr.obj :  .AUTODEPEND ..\..\src\univ\statusbr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_winuniv.obj :  .AUTODEPEND ..\..\src\univ\winuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_artprov.obj :  .AUTODEPEND ..\..\src\common\artprov.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_artstd.obj :  .AUTODEPEND ..\..\src\common\artstd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_clrpickercmn.obj :  .AUTODEPEND ..\..\src\common\clrpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_colourcmn.obj :  .AUTODEPEND ..\..\src\common\colourcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_combocmn.obj :  .AUTODEPEND ..\..\src\common\combocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_cmndata.obj :  .AUTODEPEND ..\..\src\common\cmndata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_containr.obj :  .AUTODEPEND ..\..\src\common\containr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_cshelp.obj :  .AUTODEPEND ..\..\src\common\cshelp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_ctrlcmn.obj :  .AUTODEPEND ..\..\src\common\ctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dndcmn.obj :  .AUTODEPEND ..\..\src\common\dndcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dobjcmn.obj :  .AUTODEPEND ..\..\src\common\dobjcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_docmdi.obj :  .AUTODEPEND ..\..\src\common\docmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_docview.obj :  .AUTODEPEND ..\..\src\common\docview.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dpycmn.obj :  .AUTODEPEND ..\..\src\common\dpycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dseldlg.obj :  .AUTODEPEND ..\..\src\common\dseldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_effects.obj :  .AUTODEPEND ..\..\src\common\effects.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_evtloopcmn.obj :  .AUTODEPEND ..\..\src\common\evtloopcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fddlgcmn.obj :  .AUTODEPEND ..\..\src\common\fddlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filepickercmn.obj :  .AUTODEPEND ..\..\src\common\filepickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontpickercmn.obj :  .AUTODEPEND ..\..\src\common\fontpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fldlgcmn.obj :  .AUTODEPEND ..\..\src\common\fldlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontcmn.obj :  .AUTODEPEND ..\..\src\common\fontcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontenumcmn.obj :  .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gaugecmn.obj :  .AUTODEPEND ..\..\src\common\gaugecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gbsizer.obj :  .AUTODEPEND ..\..\src\common\gbsizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gdicmn.obj :  .AUTODEPEND ..\..\src\common\gdicmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_geometry.obj :  .AUTODEPEND ..\..\src\common\geometry.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_iconbndl.obj :  .AUTODEPEND ..\..\src\common\iconbndl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagall.obj :  .AUTODEPEND ..\..\src\common\imagall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagbmp.obj :  .AUTODEPEND ..\..\src\common\imagbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_image.obj :  .AUTODEPEND ..\..\src\common\image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagfill.obj :  .AUTODEPEND ..\..\src\common\imagfill.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imaggif.obj :  .AUTODEPEND ..\..\src\common\imaggif.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagiff.obj :  .AUTODEPEND ..\..\src\common\imagiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagjpeg.obj :  .AUTODEPEND ..\..\src\common\imagjpeg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagpcx.obj :  .AUTODEPEND ..\..\src\common\imagpcx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagpng.obj :  .AUTODEPEND ..\..\src\common\imagpng.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_imagxpm.obj :  .AUTODEPEND ..\..\src\common\imagxpm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_layout.obj :  .AUTODEPEND ..\..\src\common\layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_pickerbase.obj :  .AUTODEPEND ..\..\src\common\pickerbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_rendcmn.obj :  .AUTODEPEND ..\..\src\common\rendcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_stockitem.obj :  .AUTODEPEND ..\..\src\common\stockitem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tbarbase.obj :  .AUTODEPEND ..\..\src\common\tbarbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_textcmn.obj :  .AUTODEPEND ..\..\src\common\textcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_toplvcmn.obj :  .AUTODEPEND ..\..\src\common\toplvcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_treebase.obj :  .AUTODEPEND ..\..\src\common\treebase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_valgen.obj :  .AUTODEPEND ..\..\src\common\valgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_validate.obj :  .AUTODEPEND ..\..\src\common\validate.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_valtext.obj :  .AUTODEPEND ..\..\src\common\valtext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_choicbkg.obj :  .AUTODEPEND ..\..\src\generic\choicbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dcpsg.obj :  .AUTODEPEND ..\..\src\generic\dcpsg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dirctrlg.obj :  .AUTODEPEND ..\..\src\generic\dirctrlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dragimgg.obj :  .AUTODEPEND ..\..\src\generic\dragimgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_filepickerg.obj :  .AUTODEPEND ..\..\src\generic\filepickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_fontpickerg.obj :  .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_renderg.obj :  .AUTODEPEND ..\..\src\generic\renderg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_scrlwing.obj :  .AUTODEPEND ..\..\src\generic\scrlwing.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_selstore.obj :  .AUTODEPEND ..\..\src\generic\selstore.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_spinctlg.obj :  .AUTODEPEND ..\..\src\generic\spinctlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_treebkg.obj :  .AUTODEPEND ..\..\src\generic\treebkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datectlg.obj :  .AUTODEPEND ..\..\src\generic\datectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\generic\hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpctrl.obj :  .AUTODEPEND ..\..\src\html\helpctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpdata.obj :  .AUTODEPEND ..\..\src\html\helpdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpdlg.obj :  .AUTODEPEND ..\..\src\html\helpdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpfrm.obj :  .AUTODEPEND ..\..\src\html\helpfrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_helpwnd.obj :  .AUTODEPEND ..\..\src\html\helpwnd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmlcell.obj :  .AUTODEPEND ..\..\src\html\htmlcell.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmlfilt.obj :  .AUTODEPEND ..\..\src\html\htmlfilt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmlpars.obj :  .AUTODEPEND ..\..\src\html\htmlpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmltag.obj :  .AUTODEPEND ..\..\src\html\htmltag.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmlwin.obj :  .AUTODEPEND ..\..\src\html\htmlwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmprint.obj :  .AUTODEPEND ..\..\src\html\htmprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_dflist.obj :  .AUTODEPEND ..\..\src\html\m_dflist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_fonts.obj :  .AUTODEPEND ..\..\src\html\m_fonts.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_hline.obj :  .AUTODEPEND ..\..\src\html\m_hline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_image.obj :  .AUTODEPEND ..\..\src\html\m_image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_layout.obj :  .AUTODEPEND ..\..\src\html\m_layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_links.obj :  .AUTODEPEND ..\..\src\html\m_links.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_cald.obj :  .AUTODEPEND ..\..\src\xrc\xh_cald.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_chckb.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_chckl.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_choic.obj :  .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_dirpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_fontpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_gdctl.obj :  .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_grid.obj :  .AUTODEPEND ..\..\src\xrc\xh_grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_html.obj :  .AUTODEPEND ..\..\src\xrc\xh_html.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_hyperlink.obj :  .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_listb.obj :  .AUTODEPEND ..\..\src\xrc\xh_listb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_listbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_listc.obj :  .AUTODEPEND ..\..\src\xrc\xh_listc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_menu.obj :  .AUTODEPEND ..\..\src\xrc\xh_menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_notbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_odcombo.obj :  .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_panel.obj :  .AUTODEPEND ..\..\src\xrc\xh_panel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_radbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_radbx.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_slidr.obj :  .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_spin.obj :  .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_split.obj :  .AUTODEPEND ..\..\src\xrc\xh_split.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_statbar.obj :  .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_stbmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_stbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_treebk.obj :  .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_unkwn.obj :  .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_wizrd.obj :  .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xmlres.obj :  .AUTODEPEND ..\..\src\xrc\xmlres.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_framemanager.obj :  .AUTODEPEND ..\..\src\aui\framemanager.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_config.obj :  .AUTODEPEND ..\..\src\common\config.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dircmn.obj :  .AUTODEPEND ..\..\src\common\dircmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dynarray.obj :  .AUTODEPEND ..\..\src\common\dynarray.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dynlib.obj :  .AUTODEPEND ..\..\src\common\dynlib.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dynload.obj :  .AUTODEPEND ..\..\src\common\dynload.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_encconv.obj :  .AUTODEPEND ..\..\src\common\encconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_extended.obj :  .AUTODEPEND ..\..\src\common\extended.c
-	$(CC) -bt=dos -zq -fo=$^@ $(MONOLIB_CFLAGS) $<
-
-$(OBJS)\monolib_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filefn.obj :  .AUTODEPEND ..\..\src\common\filefn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_hashmap.obj :  .AUTODEPEND ..\..\src\common\hashmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_init.obj :  .AUTODEPEND ..\..\src\common\init.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_log.obj :  .AUTODEPEND ..\..\src\common\log.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_longlong.obj :  .AUTODEPEND ..\..\src\common\longlong.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_memory.obj :  .AUTODEPEND ..\..\src\common\memory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mimecmn.obj :  .AUTODEPEND ..\..\src\common\mimecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_module.obj :  .AUTODEPEND ..\..\src\common\module.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_regex.obj :  .AUTODEPEND ..\..\src\common\regex.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_strconv.obj :  .AUTODEPEND ..\..\src\common\strconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stream.obj :  .AUTODEPEND ..\..\src\common\stream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_uri.obj :  .AUTODEPEND ..\..\src\common\uri.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_variant.obj :  .AUTODEPEND ..\..\src\common\variant.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wfstream.obj :  .AUTODEPEND ..\..\src\common\wfstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wxchar.obj :  .AUTODEPEND ..\..\src\common\wxchar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xti.obj :  .AUTODEPEND ..\..\src\common\xti.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xtistrm.obj :  .AUTODEPEND ..\..\src\common\xtistrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_zipstrm.obj :  .AUTODEPEND ..\..\src\common\zipstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_zstream.obj :  .AUTODEPEND ..\..\src\common\zstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dir.obj :  .AUTODEPEND ..\..\src\msdos\dir.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mimetype.obj :  .AUTODEPEND ..\..\src\msdos\mimetype.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_utilsdos.obj :  .AUTODEPEND ..\..\src\msdos\utilsdos.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fs_inet.obj :  .AUTODEPEND ..\..\src\common\fs_inet.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_protocol.obj :  .AUTODEPEND ..\..\src\common\protocol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sckaddr.obj :  .AUTODEPEND ..\..\src\common\sckaddr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sckfile.obj :  .AUTODEPEND ..\..\src\common\sckfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sckipc.obj :  .AUTODEPEND ..\..\src\common\sckipc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sckstrm.obj :  .AUTODEPEND ..\..\src\common\sckstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_colour.obj :  .AUTODEPEND ..\..\src\generic\colour.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_icon.obj :  .AUTODEPEND ..\..\src\generic\icon.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mask.obj :  .AUTODEPEND ..\..\src\generic\mask.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_timer.obj :  .AUTODEPEND ..\..\src\generic\timer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_app.obj :  .AUTODEPEND ..\..\src\mgl\app.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_bitmap.obj :  .AUTODEPEND ..\..\src\mgl\bitmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_brush.obj :  .AUTODEPEND ..\..\src\mgl\brush.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_clipbrd.obj :  .AUTODEPEND ..\..\src\mgl\clipbrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_cursor.obj :  .AUTODEPEND ..\..\src\mgl\cursor.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_data.obj :  .AUTODEPEND ..\..\src\mgl\data.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dc.obj :  .AUTODEPEND ..\..\src\mgl\dc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcclient.obj :  .AUTODEPEND ..\..\src\mgl\dcclient.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcmemory.obj :  .AUTODEPEND ..\..\src\mgl\dcmemory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_font.obj :  .AUTODEPEND ..\..\src\mgl\font.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontenum.obj :  .AUTODEPEND ..\..\src\mgl\fontenum.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontutil.obj :  .AUTODEPEND ..\..\src\mgl\fontutil.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_palette.obj :  .AUTODEPEND ..\..\src\mgl\palette.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_pen.obj :  .AUTODEPEND ..\..\src\mgl\pen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_region.obj :  .AUTODEPEND ..\..\src\mgl\region.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_settings.obj :  .AUTODEPEND ..\..\src\mgl\settings.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_toplevel.obj :  .AUTODEPEND ..\..\src\mgl\toplevel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_utils.obj :  .AUTODEPEND ..\..\src\mgl\utils.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_window.obj :  .AUTODEPEND ..\..\src\mgl\window.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_accel.obj :  .AUTODEPEND ..\..\src\generic\accel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filedlgg.obj :  .AUTODEPEND ..\..\src\generic\filedlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontdlgg.obj :  .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_listctrl.obj :  .AUTODEPEND ..\..\src\generic\listctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mdig.obj :  .AUTODEPEND ..\..\src\generic\mdig.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tabg.obj :  .AUTODEPEND ..\..\src\generic\tabg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_bmpbuttn.obj :  .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_button.obj :  .AUTODEPEND ..\..\src\univ\button.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_checkbox.obj :  .AUTODEPEND ..\..\src\univ\checkbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_checklst.obj :  .AUTODEPEND ..\..\src\univ\checklst.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_choice.obj :  .AUTODEPEND ..\..\src\univ\choice.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_colschem.obj :  .AUTODEPEND ..\..\src\univ\colschem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_combobox.obj :  .AUTODEPEND ..\..\src\univ\combobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_inphand.obj :  .AUTODEPEND ..\..\src\univ\inphand.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_listbox.obj :  .AUTODEPEND ..\..\src\univ\listbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_menu.obj :  .AUTODEPEND ..\..\src\univ\menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_notebook.obj :  .AUTODEPEND ..\..\src\univ\notebook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_radiobox.obj :  .AUTODEPEND ..\..\src\univ\radiobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_radiobut.obj :  .AUTODEPEND ..\..\src\univ\radiobut.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_spinbutt.obj :  .AUTODEPEND ..\..\src\univ\spinbutt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_statbmp.obj :  .AUTODEPEND ..\..\src\univ\statbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_statbox.obj :  .AUTODEPEND ..\..\src\univ\statbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_statline.obj :  .AUTODEPEND ..\..\src\univ\statline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_statusbr.obj :  .AUTODEPEND ..\..\src\univ\statusbr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_winuniv.obj :  .AUTODEPEND ..\..\src\univ\winuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_artprov.obj :  .AUTODEPEND ..\..\src\common\artprov.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_artstd.obj :  .AUTODEPEND ..\..\src\common\artstd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_clrpickercmn.obj :  .AUTODEPEND ..\..\src\common\clrpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_colourcmn.obj :  .AUTODEPEND ..\..\src\common\colourcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_combocmn.obj :  .AUTODEPEND ..\..\src\common\combocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_cmndata.obj :  .AUTODEPEND ..\..\src\common\cmndata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_containr.obj :  .AUTODEPEND ..\..\src\common\containr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_cshelp.obj :  .AUTODEPEND ..\..\src\common\cshelp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_ctrlcmn.obj :  .AUTODEPEND ..\..\src\common\ctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dndcmn.obj :  .AUTODEPEND ..\..\src\common\dndcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dobjcmn.obj :  .AUTODEPEND ..\..\src\common\dobjcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_docmdi.obj :  .AUTODEPEND ..\..\src\common\docmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_docview.obj :  .AUTODEPEND ..\..\src\common\docview.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dpycmn.obj :  .AUTODEPEND ..\..\src\common\dpycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dseldlg.obj :  .AUTODEPEND ..\..\src\common\dseldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_effects.obj :  .AUTODEPEND ..\..\src\common\effects.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_evtloopcmn.obj :  .AUTODEPEND ..\..\src\common\evtloopcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fddlgcmn.obj :  .AUTODEPEND ..\..\src\common\fddlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filepickercmn.obj :  .AUTODEPEND ..\..\src\common\filepickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontpickercmn.obj :  .AUTODEPEND ..\..\src\common\fontpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fldlgcmn.obj :  .AUTODEPEND ..\..\src\common\fldlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontcmn.obj :  .AUTODEPEND ..\..\src\common\fontcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontenumcmn.obj :  .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gaugecmn.obj :  .AUTODEPEND ..\..\src\common\gaugecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gbsizer.obj :  .AUTODEPEND ..\..\src\common\gbsizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gdicmn.obj :  .AUTODEPEND ..\..\src\common\gdicmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_geometry.obj :  .AUTODEPEND ..\..\src\common\geometry.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_iconbndl.obj :  .AUTODEPEND ..\..\src\common\iconbndl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagall.obj :  .AUTODEPEND ..\..\src\common\imagall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagbmp.obj :  .AUTODEPEND ..\..\src\common\imagbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_image.obj :  .AUTODEPEND ..\..\src\common\image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagfill.obj :  .AUTODEPEND ..\..\src\common\imagfill.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imaggif.obj :  .AUTODEPEND ..\..\src\common\imaggif.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagiff.obj :  .AUTODEPEND ..\..\src\common\imagiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagjpeg.obj :  .AUTODEPEND ..\..\src\common\imagjpeg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagpcx.obj :  .AUTODEPEND ..\..\src\common\imagpcx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagpng.obj :  .AUTODEPEND ..\..\src\common\imagpng.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_imagxpm.obj :  .AUTODEPEND ..\..\src\common\imagxpm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_layout.obj :  .AUTODEPEND ..\..\src\common\layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_pickerbase.obj :  .AUTODEPEND ..\..\src\common\pickerbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_rendcmn.obj :  .AUTODEPEND ..\..\src\common\rendcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_stockitem.obj :  .AUTODEPEND ..\..\src\common\stockitem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tbarbase.obj :  .AUTODEPEND ..\..\src\common\tbarbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_textcmn.obj :  .AUTODEPEND ..\..\src\common\textcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_toplvcmn.obj :  .AUTODEPEND ..\..\src\common\toplvcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_treebase.obj :  .AUTODEPEND ..\..\src\common\treebase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_valgen.obj :  .AUTODEPEND ..\..\src\common\valgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_validate.obj :  .AUTODEPEND ..\..\src\common\validate.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_valtext.obj :  .AUTODEPEND ..\..\src\common\valtext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_choicbkg.obj :  .AUTODEPEND ..\..\src\generic\choicbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dcpsg.obj :  .AUTODEPEND ..\..\src\generic\dcpsg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dirctrlg.obj :  .AUTODEPEND ..\..\src\generic\dirctrlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dragimgg.obj :  .AUTODEPEND ..\..\src\generic\dragimgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_filepickerg.obj :  .AUTODEPEND ..\..\src\generic\filepickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_fontpickerg.obj :  .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_renderg.obj :  .AUTODEPEND ..\..\src\generic\renderg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_scrlwing.obj :  .AUTODEPEND ..\..\src\generic\scrlwing.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_selstore.obj :  .AUTODEPEND ..\..\src\generic\selstore.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_spinctlg.obj :  .AUTODEPEND ..\..\src\generic\spinctlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_treebkg.obj :  .AUTODEPEND ..\..\src\generic\treebkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datectlg.obj :  .AUTODEPEND ..\..\src\generic\datectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\generic\hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpctrl.obj :  .AUTODEPEND ..\..\src\html\helpctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpdata.obj :  .AUTODEPEND ..\..\src\html\helpdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpdlg.obj :  .AUTODEPEND ..\..\src\html\helpdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpfrm.obj :  .AUTODEPEND ..\..\src\html\helpfrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_helpwnd.obj :  .AUTODEPEND ..\..\src\html\helpwnd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmlcell.obj :  .AUTODEPEND ..\..\src\html\htmlcell.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmlfilt.obj :  .AUTODEPEND ..\..\src\html\htmlfilt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmlpars.obj :  .AUTODEPEND ..\..\src\html\htmlpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmltag.obj :  .AUTODEPEND ..\..\src\html\htmltag.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmlwin.obj :  .AUTODEPEND ..\..\src\html\htmlwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmprint.obj :  .AUTODEPEND ..\..\src\html\htmprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_dflist.obj :  .AUTODEPEND ..\..\src\html\m_dflist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_fonts.obj :  .AUTODEPEND ..\..\src\html\m_fonts.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_hline.obj :  .AUTODEPEND ..\..\src\html\m_hline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_image.obj :  .AUTODEPEND ..\..\src\html\m_image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_layout.obj :  .AUTODEPEND ..\..\src\html\m_layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_links.obj :  .AUTODEPEND ..\..\src\html\m_links.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_cald.obj :  .AUTODEPEND ..\..\src\xrc\xh_cald.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_chckb.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_chckl.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_choic.obj :  .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_dirpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_fontpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_gdctl.obj :  .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_grid.obj :  .AUTODEPEND ..\..\src\xrc\xh_grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_html.obj :  .AUTODEPEND ..\..\src\xrc\xh_html.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_hyperlink.obj :  .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_listb.obj :  .AUTODEPEND ..\..\src\xrc\xh_listb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_listbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_listc.obj :  .AUTODEPEND ..\..\src\xrc\xh_listc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_menu.obj :  .AUTODEPEND ..\..\src\xrc\xh_menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_notbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_odcombo.obj :  .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_panel.obj :  .AUTODEPEND ..\..\src\xrc\xh_panel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_radbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_radbx.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_slidr.obj :  .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_spin.obj :  .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_split.obj :  .AUTODEPEND ..\..\src\xrc\xh_split.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_statbar.obj :  .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_stbmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_stbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_treebk.obj :  .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_unkwn.obj :  .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_wizrd.obj :  .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xmlres.obj :  .AUTODEPEND ..\..\src\xrc\xmlres.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_framemanager.obj :  .AUTODEPEND ..\..\src\aui\framemanager.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_config.obj :  .AUTODEPEND ..\..\src\common\config.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dircmn.obj :  .AUTODEPEND ..\..\src\common\dircmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dynarray.obj :  .AUTODEPEND ..\..\src\common\dynarray.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dynlib.obj :  .AUTODEPEND ..\..\src\common\dynlib.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dynload.obj :  .AUTODEPEND ..\..\src\common\dynload.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_encconv.obj :  .AUTODEPEND ..\..\src\common\encconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_extended.obj :  .AUTODEPEND ..\..\src\common\extended.c
-	$(CC) -bt=dos -zq -fo=$^@ $(BASEDLL_CFLAGS) $<
-
-$(OBJS)\basedll_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_filefn.obj :  .AUTODEPEND ..\..\src\common\filefn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_hashmap.obj :  .AUTODEPEND ..\..\src\common\hashmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_init.obj :  .AUTODEPEND ..\..\src\common\init.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_log.obj :  .AUTODEPEND ..\..\src\common\log.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_longlong.obj :  .AUTODEPEND ..\..\src\common\longlong.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_memory.obj :  .AUTODEPEND ..\..\src\common\memory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_mimecmn.obj :  .AUTODEPEND ..\..\src\common\mimecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_module.obj :  .AUTODEPEND ..\..\src\common\module.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_regex.obj :  .AUTODEPEND ..\..\src\common\regex.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_strconv.obj :  .AUTODEPEND ..\..\src\common\strconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_stream.obj :  .AUTODEPEND ..\..\src\common\stream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_uri.obj :  .AUTODEPEND ..\..\src\common\uri.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_variant.obj :  .AUTODEPEND ..\..\src\common\variant.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_wfstream.obj :  .AUTODEPEND ..\..\src\common\wfstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_wxchar.obj :  .AUTODEPEND ..\..\src\common\wxchar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_xti.obj :  .AUTODEPEND ..\..\src\common\xti.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_xtistrm.obj :  .AUTODEPEND ..\..\src\common\xtistrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_zipstrm.obj :  .AUTODEPEND ..\..\src\common\zipstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_zstream.obj :  .AUTODEPEND ..\..\src\common\zstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dir.obj :  .AUTODEPEND ..\..\src\msdos\dir.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_mimetype.obj :  .AUTODEPEND ..\..\src\msdos\mimetype.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_utilsdos.obj :  .AUTODEPEND ..\..\src\msdos\utilsdos.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\baselib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_config.obj :  .AUTODEPEND ..\..\src\common\config.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dircmn.obj :  .AUTODEPEND ..\..\src\common\dircmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dynarray.obj :  .AUTODEPEND ..\..\src\common\dynarray.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dynlib.obj :  .AUTODEPEND ..\..\src\common\dynlib.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dynload.obj :  .AUTODEPEND ..\..\src\common\dynload.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_encconv.obj :  .AUTODEPEND ..\..\src\common\encconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_extended.obj :  .AUTODEPEND ..\..\src\common\extended.c
-	$(CC) -bt=dos -zq -fo=$^@ $(BASELIB_CFLAGS) $<
-
-$(OBJS)\baselib_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_filefn.obj :  .AUTODEPEND ..\..\src\common\filefn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_hashmap.obj :  .AUTODEPEND ..\..\src\common\hashmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_init.obj :  .AUTODEPEND ..\..\src\common\init.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_log.obj :  .AUTODEPEND ..\..\src\common\log.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_longlong.obj :  .AUTODEPEND ..\..\src\common\longlong.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_memory.obj :  .AUTODEPEND ..\..\src\common\memory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_mimecmn.obj :  .AUTODEPEND ..\..\src\common\mimecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_module.obj :  .AUTODEPEND ..\..\src\common\module.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_regex.obj :  .AUTODEPEND ..\..\src\common\regex.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_stdpbase.obj :  .AUTODEPEND ..\..\src\common\stdpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_sstream.obj :  .AUTODEPEND ..\..\src\common\sstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_stopwatch.obj :  .AUTODEPEND ..\..\src\common\stopwatch.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_strconv.obj :  .AUTODEPEND ..\..\src\common\strconv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_stream.obj :  .AUTODEPEND ..\..\src\common\stream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_uri.obj :  .AUTODEPEND ..\..\src\common\uri.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_variant.obj :  .AUTODEPEND ..\..\src\common\variant.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_wfstream.obj :  .AUTODEPEND ..\..\src\common\wfstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_wxchar.obj :  .AUTODEPEND ..\..\src\common\wxchar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_xti.obj :  .AUTODEPEND ..\..\src\common\xti.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_xtistrm.obj :  .AUTODEPEND ..\..\src\common\xtistrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_zipstrm.obj :  .AUTODEPEND ..\..\src\common\zipstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_zstream.obj :  .AUTODEPEND ..\..\src\common\zstream.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dir.obj :  .AUTODEPEND ..\..\src\msdos\dir.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_mimetype.obj :  .AUTODEPEND ..\..\src\msdos\mimetype.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_utilsdos.obj :  .AUTODEPEND ..\..\src\msdos\utilsdos.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\netdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_fs_inet.obj :  .AUTODEPEND ..\..\src\common\fs_inet.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_protocol.obj :  .AUTODEPEND ..\..\src\common\protocol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_sckaddr.obj :  .AUTODEPEND ..\..\src\common\sckaddr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_sckfile.obj :  .AUTODEPEND ..\..\src\common\sckfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_sckipc.obj :  .AUTODEPEND ..\..\src\common\sckipc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_sckstrm.obj :  .AUTODEPEND ..\..\src\common\sckstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netdll_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
-
-$(OBJS)\netlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_fs_inet.obj :  .AUTODEPEND ..\..\src\common\fs_inet.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_ftp.obj :  .AUTODEPEND ..\..\src\common\ftp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_http.obj :  .AUTODEPEND ..\..\src\common\http.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_protocol.obj :  .AUTODEPEND ..\..\src\common\protocol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_sckaddr.obj :  .AUTODEPEND ..\..\src\common\sckaddr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_sckfile.obj :  .AUTODEPEND ..\..\src\common\sckfile.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_sckipc.obj :  .AUTODEPEND ..\..\src\common\sckipc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_sckstrm.obj :  .AUTODEPEND ..\..\src\common\sckstrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\netlib_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
-
-$(OBJS)\coredll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_colour.obj :  .AUTODEPEND ..\..\src\generic\colour.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_icon.obj :  .AUTODEPEND ..\..\src\generic\icon.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_mask.obj :  .AUTODEPEND ..\..\src\generic\mask.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_timer.obj :  .AUTODEPEND ..\..\src\generic\timer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_app.obj :  .AUTODEPEND ..\..\src\mgl\app.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_bitmap.obj :  .AUTODEPEND ..\..\src\mgl\bitmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_brush.obj :  .AUTODEPEND ..\..\src\mgl\brush.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_clipbrd.obj :  .AUTODEPEND ..\..\src\mgl\clipbrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_cursor.obj :  .AUTODEPEND ..\..\src\mgl\cursor.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_data.obj :  .AUTODEPEND ..\..\src\mgl\data.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dc.obj :  .AUTODEPEND ..\..\src\mgl\dc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcclient.obj :  .AUTODEPEND ..\..\src\mgl\dcclient.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcmemory.obj :  .AUTODEPEND ..\..\src\mgl\dcmemory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_font.obj :  .AUTODEPEND ..\..\src\mgl\font.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontenum.obj :  .AUTODEPEND ..\..\src\mgl\fontenum.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontutil.obj :  .AUTODEPEND ..\..\src\mgl\fontutil.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_palette.obj :  .AUTODEPEND ..\..\src\mgl\palette.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_pen.obj :  .AUTODEPEND ..\..\src\mgl\pen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_region.obj :  .AUTODEPEND ..\..\src\mgl\region.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_settings.obj :  .AUTODEPEND ..\..\src\mgl\settings.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_toplevel.obj :  .AUTODEPEND ..\..\src\mgl\toplevel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_utils.obj :  .AUTODEPEND ..\..\src\mgl\utils.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_window.obj :  .AUTODEPEND ..\..\src\mgl\window.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_accel.obj :  .AUTODEPEND ..\..\src\generic\accel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_filedlgg.obj :  .AUTODEPEND ..\..\src\generic\filedlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontdlgg.obj :  .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_listctrl.obj :  .AUTODEPEND ..\..\src\generic\listctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_mdig.obj :  .AUTODEPEND ..\..\src\generic\mdig.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_tabg.obj :  .AUTODEPEND ..\..\src\generic\tabg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_bmpbuttn.obj :  .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_button.obj :  .AUTODEPEND ..\..\src\univ\button.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_checkbox.obj :  .AUTODEPEND ..\..\src\univ\checkbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_checklst.obj :  .AUTODEPEND ..\..\src\univ\checklst.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_choice.obj :  .AUTODEPEND ..\..\src\univ\choice.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_colschem.obj :  .AUTODEPEND ..\..\src\univ\colschem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_combobox.obj :  .AUTODEPEND ..\..\src\univ\combobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_inphand.obj :  .AUTODEPEND ..\..\src\univ\inphand.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_listbox.obj :  .AUTODEPEND ..\..\src\univ\listbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_menu.obj :  .AUTODEPEND ..\..\src\univ\menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_notebook.obj :  .AUTODEPEND ..\..\src\univ\notebook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_radiobox.obj :  .AUTODEPEND ..\..\src\univ\radiobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_radiobut.obj :  .AUTODEPEND ..\..\src\univ\radiobut.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_spinbutt.obj :  .AUTODEPEND ..\..\src\univ\spinbutt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_statbmp.obj :  .AUTODEPEND ..\..\src\univ\statbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_statbox.obj :  .AUTODEPEND ..\..\src\univ\statbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_statline.obj :  .AUTODEPEND ..\..\src\univ\statline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_statusbr.obj :  .AUTODEPEND ..\..\src\univ\statusbr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_winuniv.obj :  .AUTODEPEND ..\..\src\univ\winuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_artprov.obj :  .AUTODEPEND ..\..\src\common\artprov.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_artstd.obj :  .AUTODEPEND ..\..\src\common\artstd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_clrpickercmn.obj :  .AUTODEPEND ..\..\src\common\clrpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_colourcmn.obj :  .AUTODEPEND ..\..\src\common\colourcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_combocmn.obj :  .AUTODEPEND ..\..\src\common\combocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_cmndata.obj :  .AUTODEPEND ..\..\src\common\cmndata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_containr.obj :  .AUTODEPEND ..\..\src\common\containr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_cshelp.obj :  .AUTODEPEND ..\..\src\common\cshelp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_ctrlcmn.obj :  .AUTODEPEND ..\..\src\common\ctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dndcmn.obj :  .AUTODEPEND ..\..\src\common\dndcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dobjcmn.obj :  .AUTODEPEND ..\..\src\common\dobjcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_docmdi.obj :  .AUTODEPEND ..\..\src\common\docmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_docview.obj :  .AUTODEPEND ..\..\src\common\docview.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dpycmn.obj :  .AUTODEPEND ..\..\src\common\dpycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dseldlg.obj :  .AUTODEPEND ..\..\src\common\dseldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_effects.obj :  .AUTODEPEND ..\..\src\common\effects.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_evtloopcmn.obj :  .AUTODEPEND ..\..\src\common\evtloopcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fddlgcmn.obj :  .AUTODEPEND ..\..\src\common\fddlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_filepickercmn.obj :  .AUTODEPEND ..\..\src\common\filepickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontpickercmn.obj :  .AUTODEPEND ..\..\src\common\fontpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fldlgcmn.obj :  .AUTODEPEND ..\..\src\common\fldlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontcmn.obj :  .AUTODEPEND ..\..\src\common\fontcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontenumcmn.obj :  .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gaugecmn.obj :  .AUTODEPEND ..\..\src\common\gaugecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gbsizer.obj :  .AUTODEPEND ..\..\src\common\gbsizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gdicmn.obj :  .AUTODEPEND ..\..\src\common\gdicmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_geometry.obj :  .AUTODEPEND ..\..\src\common\geometry.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_iconbndl.obj :  .AUTODEPEND ..\..\src\common\iconbndl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagall.obj :  .AUTODEPEND ..\..\src\common\imagall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagbmp.obj :  .AUTODEPEND ..\..\src\common\imagbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_image.obj :  .AUTODEPEND ..\..\src\common\image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagfill.obj :  .AUTODEPEND ..\..\src\common\imagfill.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imaggif.obj :  .AUTODEPEND ..\..\src\common\imaggif.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagiff.obj :  .AUTODEPEND ..\..\src\common\imagiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagjpeg.obj :  .AUTODEPEND ..\..\src\common\imagjpeg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagpcx.obj :  .AUTODEPEND ..\..\src\common\imagpcx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagpng.obj :  .AUTODEPEND ..\..\src\common\imagpng.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_imagxpm.obj :  .AUTODEPEND ..\..\src\common\imagxpm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_layout.obj :  .AUTODEPEND ..\..\src\common\layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_pickerbase.obj :  .AUTODEPEND ..\..\src\common\pickerbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_rendcmn.obj :  .AUTODEPEND ..\..\src\common\rendcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_stockitem.obj :  .AUTODEPEND ..\..\src\common\stockitem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_tbarbase.obj :  .AUTODEPEND ..\..\src\common\tbarbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_textcmn.obj :  .AUTODEPEND ..\..\src\common\textcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_toplvcmn.obj :  .AUTODEPEND ..\..\src\common\toplvcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_treebase.obj :  .AUTODEPEND ..\..\src\common\treebase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_valgen.obj :  .AUTODEPEND ..\..\src\common\valgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_validate.obj :  .AUTODEPEND ..\..\src\common\validate.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_valtext.obj :  .AUTODEPEND ..\..\src\common\valtext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_choicbkg.obj :  .AUTODEPEND ..\..\src\generic\choicbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dcpsg.obj :  .AUTODEPEND ..\..\src\generic\dcpsg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dirctrlg.obj :  .AUTODEPEND ..\..\src\generic\dirctrlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_dragimgg.obj :  .AUTODEPEND ..\..\src\generic\dragimgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_filepickerg.obj :  .AUTODEPEND ..\..\src\generic\filepickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_fontpickerg.obj :  .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_renderg.obj :  .AUTODEPEND ..\..\src\generic\renderg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_scrlwing.obj :  .AUTODEPEND ..\..\src\generic\scrlwing.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_selstore.obj :  .AUTODEPEND ..\..\src\generic\selstore.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_spinctlg.obj :  .AUTODEPEND ..\..\src\generic\spinctlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_treebkg.obj :  .AUTODEPEND ..\..\src\generic\treebkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\coredll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
-$(OBJS)\corelib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fs_mem.obj :  .AUTODEPEND ..\..\src\common\fs_mem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_msgout.obj :  .AUTODEPEND ..\..\src\common\msgout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_colour.obj :  .AUTODEPEND ..\..\src\generic\colour.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_icon.obj :  .AUTODEPEND ..\..\src\generic\icon.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_mask.obj :  .AUTODEPEND ..\..\src\generic\mask.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_timer.obj :  .AUTODEPEND ..\..\src\generic\timer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_app.obj :  .AUTODEPEND ..\..\src\mgl\app.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_bitmap.obj :  .AUTODEPEND ..\..\src\mgl\bitmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_brush.obj :  .AUTODEPEND ..\..\src\mgl\brush.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_clipbrd.obj :  .AUTODEPEND ..\..\src\mgl\clipbrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_cursor.obj :  .AUTODEPEND ..\..\src\mgl\cursor.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_data.obj :  .AUTODEPEND ..\..\src\mgl\data.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dc.obj :  .AUTODEPEND ..\..\src\mgl\dc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcclient.obj :  .AUTODEPEND ..\..\src\mgl\dcclient.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcmemory.obj :  .AUTODEPEND ..\..\src\mgl\dcmemory.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_font.obj :  .AUTODEPEND ..\..\src\mgl\font.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontenum.obj :  .AUTODEPEND ..\..\src\mgl\fontenum.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontutil.obj :  .AUTODEPEND ..\..\src\mgl\fontutil.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_palette.obj :  .AUTODEPEND ..\..\src\mgl\palette.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_pen.obj :  .AUTODEPEND ..\..\src\mgl\pen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_region.obj :  .AUTODEPEND ..\..\src\mgl\region.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_settings.obj :  .AUTODEPEND ..\..\src\mgl\settings.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_toplevel.obj :  .AUTODEPEND ..\..\src\mgl\toplevel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_utils.obj :  .AUTODEPEND ..\..\src\mgl\utils.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_window.obj :  .AUTODEPEND ..\..\src\mgl\window.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_accel.obj :  .AUTODEPEND ..\..\src\generic\accel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_filedlgg.obj :  .AUTODEPEND ..\..\src\generic\filedlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontdlgg.obj :  .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_listctrl.obj :  .AUTODEPEND ..\..\src\generic\listctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_mdig.obj :  .AUTODEPEND ..\..\src\generic\mdig.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_tabg.obj :  .AUTODEPEND ..\..\src\generic\tabg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_bmpbuttn.obj :  .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_button.obj :  .AUTODEPEND ..\..\src\univ\button.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_checkbox.obj :  .AUTODEPEND ..\..\src\univ\checkbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_checklst.obj :  .AUTODEPEND ..\..\src\univ\checklst.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_choice.obj :  .AUTODEPEND ..\..\src\univ\choice.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_colschem.obj :  .AUTODEPEND ..\..\src\univ\colschem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_combobox.obj :  .AUTODEPEND ..\..\src\univ\combobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_inphand.obj :  .AUTODEPEND ..\..\src\univ\inphand.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_listbox.obj :  .AUTODEPEND ..\..\src\univ\listbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_menu.obj :  .AUTODEPEND ..\..\src\univ\menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_notebook.obj :  .AUTODEPEND ..\..\src\univ\notebook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_radiobox.obj :  .AUTODEPEND ..\..\src\univ\radiobox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_radiobut.obj :  .AUTODEPEND ..\..\src\univ\radiobut.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_spinbutt.obj :  .AUTODEPEND ..\..\src\univ\spinbutt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_statbmp.obj :  .AUTODEPEND ..\..\src\univ\statbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_statbox.obj :  .AUTODEPEND ..\..\src\univ\statbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_statline.obj :  .AUTODEPEND ..\..\src\univ\statline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_statusbr.obj :  .AUTODEPEND ..\..\src\univ\statusbr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_winuniv.obj :  .AUTODEPEND ..\..\src\univ\winuniv.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_artprov.obj :  .AUTODEPEND ..\..\src\common\artprov.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_artstd.obj :  .AUTODEPEND ..\..\src\common\artstd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_clrpickercmn.obj :  .AUTODEPEND ..\..\src\common\clrpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_colourcmn.obj :  .AUTODEPEND ..\..\src\common\colourcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_combocmn.obj :  .AUTODEPEND ..\..\src\common\combocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_cmndata.obj :  .AUTODEPEND ..\..\src\common\cmndata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_containr.obj :  .AUTODEPEND ..\..\src\common\containr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_cshelp.obj :  .AUTODEPEND ..\..\src\common\cshelp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_ctrlcmn.obj :  .AUTODEPEND ..\..\src\common\ctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_ctrlsub.obj :  .AUTODEPEND ..\..\src\common\ctrlsub.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_datacmn.obj :  .AUTODEPEND ..\..\src\common\datacmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dndcmn.obj :  .AUTODEPEND ..\..\src\common\dndcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dobjcmn.obj :  .AUTODEPEND ..\..\src\common\dobjcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_docmdi.obj :  .AUTODEPEND ..\..\src\common\docmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_docview.obj :  .AUTODEPEND ..\..\src\common\docview.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dpycmn.obj :  .AUTODEPEND ..\..\src\common\dpycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dseldlg.obj :  .AUTODEPEND ..\..\src\common\dseldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_effects.obj :  .AUTODEPEND ..\..\src\common\effects.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_evtloopcmn.obj :  .AUTODEPEND ..\..\src\common\evtloopcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fddlgcmn.obj :  .AUTODEPEND ..\..\src\common\fddlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_filepickercmn.obj :  .AUTODEPEND ..\..\src\common\filepickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontpickercmn.obj :  .AUTODEPEND ..\..\src\common\fontpickercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fldlgcmn.obj :  .AUTODEPEND ..\..\src\common\fldlgcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontcmn.obj :  .AUTODEPEND ..\..\src\common\fontcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontenumcmn.obj :  .AUTODEPEND ..\..\src\common\fontenumcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gaugecmn.obj :  .AUTODEPEND ..\..\src\common\gaugecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gbsizer.obj :  .AUTODEPEND ..\..\src\common\gbsizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gdicmn.obj :  .AUTODEPEND ..\..\src\common\gdicmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_geometry.obj :  .AUTODEPEND ..\..\src\common\geometry.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_iconbndl.obj :  .AUTODEPEND ..\..\src\common\iconbndl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagall.obj :  .AUTODEPEND ..\..\src\common\imagall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagbmp.obj :  .AUTODEPEND ..\..\src\common\imagbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_image.obj :  .AUTODEPEND ..\..\src\common\image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagfill.obj :  .AUTODEPEND ..\..\src\common\imagfill.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imaggif.obj :  .AUTODEPEND ..\..\src\common\imaggif.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagiff.obj :  .AUTODEPEND ..\..\src\common\imagiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagjpeg.obj :  .AUTODEPEND ..\..\src\common\imagjpeg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagpcx.obj :  .AUTODEPEND ..\..\src\common\imagpcx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagpng.obj :  .AUTODEPEND ..\..\src\common\imagpng.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_imagxpm.obj :  .AUTODEPEND ..\..\src\common\imagxpm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_layout.obj :  .AUTODEPEND ..\..\src\common\layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_menucmn.obj :  .AUTODEPEND ..\..\src\common\menucmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_pickerbase.obj :  .AUTODEPEND ..\..\src\common\pickerbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_rendcmn.obj :  .AUTODEPEND ..\..\src\common\rendcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_stockitem.obj :  .AUTODEPEND ..\..\src\common\stockitem.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_tbarbase.obj :  .AUTODEPEND ..\..\src\common\tbarbase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_textcmn.obj :  .AUTODEPEND ..\..\src\common\textcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_toplvcmn.obj :  .AUTODEPEND ..\..\src\common\toplvcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_treebase.obj :  .AUTODEPEND ..\..\src\common\treebase.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_valgen.obj :  .AUTODEPEND ..\..\src\common\valgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_validate.obj :  .AUTODEPEND ..\..\src\common\validate.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_valtext.obj :  .AUTODEPEND ..\..\src\common\valtext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_choicbkg.obj :  .AUTODEPEND ..\..\src\generic\choicbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dcpsg.obj :  .AUTODEPEND ..\..\src\generic\dcpsg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dirctrlg.obj :  .AUTODEPEND ..\..\src\generic\dirctrlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_dragimgg.obj :  .AUTODEPEND ..\..\src\generic\dragimgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_filepickerg.obj :  .AUTODEPEND ..\..\src\generic\filepickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_fontpickerg.obj :  .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_renderg.obj :  .AUTODEPEND ..\..\src\generic\renderg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_scrlwing.obj :  .AUTODEPEND ..\..\src\generic\scrlwing.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_selstore.obj :  .AUTODEPEND ..\..\src\generic\selstore.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_spinctlg.obj :  .AUTODEPEND ..\..\src\generic\spinctlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_treebkg.obj :  .AUTODEPEND ..\..\src\generic\treebkg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
-$(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datectlg.obj :  .AUTODEPEND ..\..\src\generic\datectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\generic\hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datectlg.obj :  .AUTODEPEND ..\..\src\generic\datectlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_grid.obj :  .AUTODEPEND ..\..\src\generic\grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_gridctrl.obj :  .AUTODEPEND ..\..\src\generic\gridctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_gridsel.obj :  .AUTODEPEND ..\..\src\generic\gridsel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\generic\hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\mediadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mediadll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\medialib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\medialib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\htmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_helpctrl.obj :  .AUTODEPEND ..\..\src\html\helpctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_helpdata.obj :  .AUTODEPEND ..\..\src\html\helpdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_helpdlg.obj :  .AUTODEPEND ..\..\src\html\helpdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_helpfrm.obj :  .AUTODEPEND ..\..\src\html\helpfrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_helpwnd.obj :  .AUTODEPEND ..\..\src\html\helpwnd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmlcell.obj :  .AUTODEPEND ..\..\src\html\htmlcell.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmlfilt.obj :  .AUTODEPEND ..\..\src\html\htmlfilt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmlpars.obj :  .AUTODEPEND ..\..\src\html\htmlpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmltag.obj :  .AUTODEPEND ..\..\src\html\htmltag.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmlwin.obj :  .AUTODEPEND ..\..\src\html\htmlwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmprint.obj :  .AUTODEPEND ..\..\src\html\htmprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_dflist.obj :  .AUTODEPEND ..\..\src\html\m_dflist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_fonts.obj :  .AUTODEPEND ..\..\src\html\m_fonts.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_hline.obj :  .AUTODEPEND ..\..\src\html\m_hline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_image.obj :  .AUTODEPEND ..\..\src\html\m_image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_layout.obj :  .AUTODEPEND ..\..\src\html\m_layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_links.obj :  .AUTODEPEND ..\..\src\html\m_links.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmldll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
-$(OBJS)\htmllib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_helpctrl.obj :  .AUTODEPEND ..\..\src\html\helpctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_helpdata.obj :  .AUTODEPEND ..\..\src\html\helpdata.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_helpdlg.obj :  .AUTODEPEND ..\..\src\html\helpdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_helpfrm.obj :  .AUTODEPEND ..\..\src\html\helpfrm.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_helpwnd.obj :  .AUTODEPEND ..\..\src\html\helpwnd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmlcell.obj :  .AUTODEPEND ..\..\src\html\htmlcell.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmlfilt.obj :  .AUTODEPEND ..\..\src\html\htmlfilt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmlpars.obj :  .AUTODEPEND ..\..\src\html\htmlpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmltag.obj :  .AUTODEPEND ..\..\src\html\htmltag.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmlwin.obj :  .AUTODEPEND ..\..\src\html\htmlwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmprint.obj :  .AUTODEPEND ..\..\src\html\htmprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_dflist.obj :  .AUTODEPEND ..\..\src\html\m_dflist.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_fonts.obj :  .AUTODEPEND ..\..\src\html\m_fonts.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_hline.obj :  .AUTODEPEND ..\..\src\html\m_hline.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_image.obj :  .AUTODEPEND ..\..\src\html\m_image.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_layout.obj :  .AUTODEPEND ..\..\src\html\m_layout.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_links.obj :  .AUTODEPEND ..\..\src\html\m_links.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\htmllib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
-$(OBJS)\qadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
-
-$(OBJS)\qadll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
-
-$(OBJS)\qadll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
-
-$(OBJS)\qalib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QALIB_CXXFLAGS) $<
-
-$(OBJS)\qalib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QALIB_CXXFLAGS) $<
-
-$(OBJS)\qalib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(QALIB_CXXFLAGS) $<
-
-$(OBJS)\xmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
-
-$(OBJS)\xmldll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
-
-$(OBJS)\xmldll_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
-
-$(OBJS)\xmllib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
-
-$(OBJS)\xmllib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
-
-$(OBJS)\xmllib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_cald.obj :  .AUTODEPEND ..\..\src\xrc\xh_cald.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_chckb.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_chckl.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_choic.obj :  .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_dirpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_fontpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_gdctl.obj :  .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_grid.obj :  .AUTODEPEND ..\..\src\xrc\xh_grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_html.obj :  .AUTODEPEND ..\..\src\xrc\xh_html.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_hyperlink.obj :  .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_listb.obj :  .AUTODEPEND ..\..\src\xrc\xh_listb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_listbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_listc.obj :  .AUTODEPEND ..\..\src\xrc\xh_listc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_menu.obj :  .AUTODEPEND ..\..\src\xrc\xh_menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_notbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_odcombo.obj :  .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_panel.obj :  .AUTODEPEND ..\..\src\xrc\xh_panel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_radbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_radbx.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_slidr.obj :  .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_spin.obj :  .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_split.obj :  .AUTODEPEND ..\..\src\xrc\xh_split.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_statbar.obj :  .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_stbmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_stbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_treebk.obj :  .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_unkwn.obj :  .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_wizrd.obj :  .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xmlres.obj :  .AUTODEPEND ..\..\src\xrc\xmlres.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_cald.obj :  .AUTODEPEND ..\..\src\xrc\xh_cald.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_chckb.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_chckl.obj :  .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_choic.obj :  .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_dirpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_fontpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_gdctl.obj :  .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_grid.obj :  .AUTODEPEND ..\..\src\xrc\xh_grid.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_html.obj :  .AUTODEPEND ..\..\src\xrc\xh_html.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_hyperlink.obj :  .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_listb.obj :  .AUTODEPEND ..\..\src\xrc\xh_listb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_listbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_listc.obj :  .AUTODEPEND ..\..\src\xrc\xh_listc.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_menu.obj :  .AUTODEPEND ..\..\src\xrc\xh_menu.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_notbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_odcombo.obj :  .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_panel.obj :  .AUTODEPEND ..\..\src\xrc\xh_panel.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_radbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_radbx.obj :  .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_slidr.obj :  .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_spin.obj :  .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_split.obj :  .AUTODEPEND ..\..\src\xrc\xh_split.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_statbar.obj :  .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_stbmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_stbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_treebk.obj :  .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_unkwn.obj :  .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_wizrd.obj :  .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmlres.obj :  .AUTODEPEND ..\..\src\xrc\xmlres.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\auidll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auidll_framemanager.obj :  .AUTODEPEND ..\..\src\aui\framemanager.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auidll_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auidll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auidll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auidll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
-
-$(OBJS)\auilib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\auilib_framemanager.obj :  .AUTODEPEND ..\..\src\aui\framemanager.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\auilib_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\auilib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\auilib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\auilib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextdll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\richtextlib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
-
-$(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
-
-$(OBJS)\gllib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(GLLIB_CXXFLAGS) $<
-
diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index ee7c88c0d6..b07fcd5784 100644
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -38,7 +38,7 @@ SolidCompression=yes
 
 [Files]
 ; source files
-Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,wxWindows.xcod*,x11,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,motif,msdos,os2,wxWindows.xcod*,x11,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; docs and helpfile
 Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
diff --git a/configure b/configure
index 596bcf2519..0b304e68e4 100755
--- a/configure
+++ b/configure
@@ -918,8 +918,6 @@ COND_PLATFORM_MSDOS_1
 COND_PLATFORM_OS2_1
 COND_PLATFORM_UNIX_0
 COND_PLATFORM_UNIX_1
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1
 COND_PLATFORM_UNIX_1_USE_GUI_1
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_WIN32_0
@@ -954,8 +952,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_USE_GUI_1
 COND_TOOLKIT_MAC
-COND_TOOLKIT_MGL
-COND_TOOLKIT_MGL_USE_GUI_1
 COND_TOOLKIT_MOTIF
 COND_TOOLKIT_MOTIF_USE_GUI_1
 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
@@ -1980,7 +1976,6 @@ Optional Packages:
   --with-wine             use Wine
   --with-msw              use MS-Windows
   --with-pm               use OS/2 Presentation Manager
-  --with-mgl              use SciTech MGL
   --with-directfb         use DirectFB
   --with-microwin         use MicroWindows
   --with-x11              use X11
@@ -2679,14 +2674,13 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
 
 DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
@@ -2699,7 +2693,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
@@ -2936,7 +2929,6 @@ _ACEOF
 _ACEOF
 
     PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_MGL=1
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
@@ -3488,12 +3480,6 @@ if test "${with_pm+set}" = set; then
 fi
 
 
-# Check whether --with-mgl was given.
-if test "${with_mgl+set}" = set; then
-  withval=$with_mgl; wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1
-fi
-
-
 # Check whether --with-directfb was given.
 if test "${with_directfb+set}" = set; then
   withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1
@@ -3653,7 +3639,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
     fi
 
             NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
                   + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
         case "${host}" in
@@ -28373,27 +28359,20 @@ if test "$wxUSE_LIBPNG" != "no" ; then
 _ACEOF
 
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
-        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&5
-echo "$as_me: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&2;}
-        wxUSE_LIBPNG=sys
-    fi
-
-                if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+            if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
         { echo "$as_me:$LINENO: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5
 echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;}
         wxUSE_LIBPNG=builtin
     fi
 
-    if test "$wxUSE_MGL" != 1 ; then
-                if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-                                    { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+                        { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
 echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6; }
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-                      unset ac_cv_header_png_h
+                  unset ac_cv_header_png_h
 
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -28403,17 +28382,17 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                        #include <png.h>
-                        #include <stdio.h>
+                    #include <png.h>
+                    #include <stdio.h>
 
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
+                    int main()
+                    {
+                        FILE *f=fopen("conftestval", "w");
+                        if (!f) exit(1);
+                        fprintf(f, "%s",
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                        exit(0);
+                    }
 
 _ACEOF
 rm -f conftest$ac_exeext
@@ -28453,7 +28432,7 @@ fi
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
 echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-            { echo "$as_me:$LINENO: checking for png.h" >&5
+        { echo "$as_me:$LINENO: checking for png.h" >&5
 echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28500,8 +28479,8 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
 
 
 
-            if test "$ac_cv_header_png_h" = "yes"; then
-                { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
+        if test "$ac_cv_header_png_h" = "yes"; then
+            { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
 echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28566,21 +28545,20 @@ if test $ac_cv_lib_png_png_sig_cmp = yes; then
   PNG_LINK=" -lpng -lz"
 fi
 
-            fi
+        fi
 
-            if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5
 echo "$as_me: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&2;}
    { (exit 1); exit 1; }; }
-                else
-                    { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5
-echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
-                    wxUSE_LIBPNG=builtin
-                fi
             else
-                                wxUSE_LIBPNG=sys
+                { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5
+echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
+                wxUSE_LIBPNG=builtin
             fi
+        else
+                        wxUSE_LIBPNG=sys
         fi
     fi
 fi
@@ -28593,17 +28571,10 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
 _ACEOF
 
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
-        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5
-echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;}
-        wxUSE_LIBJPEG=sys
-    fi
-
-    if test "$wxUSE_MGL" != 1 ; then
-                if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-                                                { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+                                { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
 echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
-            if test "${ac_cv_header_jpeglib_h+set}" = set; then
+        if test "${ac_cv_header_jpeglib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -28613,9 +28584,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                        #undef HAVE_STDLIB_H
-                        #include <stdio.h>
-                        #include <jpeglib.h>
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
 
 int
 main ()
@@ -28656,11 +28627,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-            { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+        { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
 echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
 
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
 echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; }
 if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28725,23 +28696,23 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
   JPEG_LINK=" -ljpeg"
 fi
 
-            fi
+        fi
 
-            if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5
 echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;}
    { (exit 1); exit 1; }; }
-                else
-                    { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
-                    wxUSE_LIBJPEG=builtin
-                fi
             else
-                                wxUSE_LIBJPEG=sys
+                { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5
+echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+                        wxUSE_LIBJPEG=sys
 
-                if test "$wxUSE_MSW" = 1; then
-                                                                                                    { echo "$as_me:$LINENO: checking for boolean" >&5
+            if test "$wxUSE_MSW" = 1; then
+                                                                                { echo "$as_me:$LINENO: checking for boolean" >&5
 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28802,7 +28773,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-                            { echo "$as_me:$LINENO: checking for boolean" >&5
+                        { echo "$as_me:$LINENO: checking for boolean" >&5
 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28814,9 +28785,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
 typedef boolean ac__type_new_;
@@ -28879,9 +28850,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -28921,9 +28892,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -28980,9 +28951,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -29022,9 +28993,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -29091,9 +29062,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -29154,9 +29125,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
 
 
    typedef boolean ac__type_sizeof_;
@@ -29242,14 +29213,13 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-                            cat >>confdefs.h <<_ACEOF
+                        cat >>confdefs.h <<_ACEOF
 #define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean`
 _ACEOF
 
 
 fi
 
-                fi
             fi
         fi
     fi
@@ -31414,81 +31384,6 @@ echo "${ECHO_T}not found" >&6; }
                                                                                                                     fi
     fi
 
-    if test "$wxUSE_MGL" = 1; then
-       { echo "$as_me:$LINENO: checking for SciTech MGL library" >&5
-echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6; }
-        if test "x$MGL_ROOT" = x ; then
-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-            { { echo "$as_me:$LINENO: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&5
-echo "$as_me: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&2;}
-   { (exit 1); exit 1; }; }
-        else
-            { echo "$as_me:$LINENO: result: $MGL_ROOT" >&5
-echo "${ECHO_T}$MGL_ROOT" >&6; }
-        fi
-
-        { echo "$as_me:$LINENO: checking for libmgl location" >&5
-echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6; }
-                                case "${host}" in
-            *-*-linux* )
-                                          if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
-              fi
-              ;;
-            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
-              ;;
-            *)
-              { { echo "$as_me:$LINENO: error: This system type ${host} is not yet supported by wxMGL." >&5
-echo "$as_me: error: This system type ${host} is not yet supported by wxMGL." >&2;}
-   { (exit 1); exit 1; }; }
-        esac
-
-        mgl_lib_type=""
-        mgl_os=""
-
-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-            fi
-        done
-
-        if test "x$mgl_os" = x ; then
-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-            { { echo "$as_me:$LINENO: error: Cannot find MGL libraries, make sure they are compiled." >&5
-echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-        { echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5
-echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6; }
-
-        wxUSE_UNIVERSAL="yes"
-
-        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
-
-        AFMINSTALL=afminstall
-        TOOLKIT=MGL
-        GUIDIST=MGL_DIST
-    fi
-
     if test "$wxUSE_DFB" = 1; then
 
 
@@ -46358,28 +46253,27 @@ _ACEOF
 fi
 
 if test "$USE_UNIX" = 1 ; then
-        if test "$wxUSE_MGL" != 1; then
-                                { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
+                { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_soundcard+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-            cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                    #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
+                #include <sys/ioctl.h>
+                #include <sys/soundcard.h>
 
 int
 main ()
 {
 
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
 
   ;
   return 0;
@@ -46409,23 +46303,23 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-                    saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
-                    cat >conftest.$ac_ext <<_ACEOF
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                            #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
+                        #include <sys/ioctl.h>
+                        #include <sys/soundcard.h>
 
 int
 main ()
 {
 
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
 
   ;
   return 0;
@@ -46455,8 +46349,8 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-                            LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
+                        LIBS="$saveLibs"
+                        ac_cv_header_sys_soundcard=no
 
 
 fi
@@ -46473,7 +46367,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
 echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; }
-    fi
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
@@ -46805,12 +46698,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
         WITH_PLUGIN_SDL=1
       fi
     fi
-  else
-        if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5
-echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;}
-        wxUSE_SOUND="no"
-    fi
   fi
 fi
 
@@ -48485,14 +48372,6 @@ _ACEOF
 fi
 
 
-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
-        wxUSE_SOCKETS="no"
-    fi
-fi
-
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then
                 { echo "$as_me:$LINENO: checking for socket" >&5
@@ -49247,7 +49126,6 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
         fi
 
         else
-                if test "$wxUSE_MGL" != 1; then
 
 for ac_header in linux/joystick.h
 do
@@ -49306,7 +49184,6 @@ fi
 
 done
 
-        fi
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -49705,16 +49582,10 @@ _ACEOF
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
-        wxUSE_DATAOBJ=no
-    else
-        cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DATAOBJ 1
 _ACEOF
 
-    fi
 else
     { echo "$as_me:$LINENO: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
 echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}
@@ -49723,7 +49594,7 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_DFB" = 1; then
         { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_CLIPBOARD=no
@@ -49738,8 +49609,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
         { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_DRAG_AND_DROP=no
@@ -49976,7 +49846,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_DFB" = 1; then
         { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_DISPLAY=no
@@ -50402,7 +50272,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
         { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5
 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
     else
@@ -54838,16 +54708,6 @@ EOF
         COND_PLATFORM_UNIX_1=""
     fi
 
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
-    fi
-
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_UNIX_1_USE_GUI_1=""
@@ -55018,16 +54878,6 @@ EOF
         COND_TOOLKIT_MAC=""
     fi
 
-    COND_TOOLKIT_MGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=""
-    fi
-
-    COND_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-
     COND_TOOLKIT_MOTIF="#"
     if test "x$TOOLKIT" = "xMOTIF" ; then
         COND_TOOLKIT_MOTIF=""
@@ -56926,8 +56776,6 @@ COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
 COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
 COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
 COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$ac_delim
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
@@ -56962,8 +56810,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__U
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
 COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
-COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
-COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
 COND_TOOLKIT_MOTIF_USE_GUI_1!$COND_TOOLKIT_MOTIF_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0$ac_delim
@@ -57012,6 +56858,10 @@ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$a
 COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
 COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
 COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim
+COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
+COND_USE_STC_1!$COND_USE_STC_1$ac_delim
+COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
+COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -57053,10 +56903,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
-COND_USE_STC_1!$COND_USE_STC_1$ac_delim
-COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
-COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim
 COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim
 COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim
 COND_WITH_PLUGIN_SDL_1!$COND_WITH_PLUGIN_SDL_1$ac_delim
@@ -57121,7 +56967,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 8c16e20472..98e0a463dd 100644
--- a/configure.in
+++ b/configure.in
@@ -103,7 +103,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 dnl the list of all available toolkits
 dnl
 dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
 
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
@@ -112,7 +112,6 @@ DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
@@ -128,7 +127,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
@@ -286,7 +284,6 @@ case "${host}" in
     USE_DOS=1
     AC_DEFINE(__DOS__)
     PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_MGL=1
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
@@ -487,7 +484,6 @@ AC_ARG_WITH(old_cocoa,     [  --with-old_cocoa        use old, deprecated, Cocoa
 AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
 AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
@@ -546,7 +542,7 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl we suppose that expr is available (maybe there is a better way to do
     dnl this? what about using ALL_TOOLKITS? TODO)
     NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
                   + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
     dnl Allow wxUSE_PM only for OS/2 with EMX.
@@ -2592,63 +2588,54 @@ PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
     AC_DEFINE(wxUSE_LIBPNG)
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
-        wxUSE_LIBPNG=sys
-    fi
-
     dnl for the check below to have a chance to succeed, we must already have
-    dnl libz somewhere (don't do this when bulding wxMGL since its libpng
-    dnl doesn't depend on zlib)
-    if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+    dnl libz somewhere
+    if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
         AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
         wxUSE_LIBPNG=builtin
     fi
 
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libpng when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-            dnl libpng version 0.9 is known to not work, if an even newer
-            dnl version is required, just bump it up in the test below
-            AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                [AC_TRY_RUN(
-                    dnl png.h defines PNG_LIBPNG_VER=number
-                    [
-                        #include <png.h>
-                        #include <stdio.h>
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        dnl libpng version 0.9 is known to not work, if an even newer
+        dnl version is required, just bump it up in the test below
+        AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
+            [AC_TRY_RUN(
+                dnl png.h defines PNG_LIBPNG_VER=number
+                [
+                    #include <png.h>
+                    #include <stdio.h>
 
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
-                    ],
-                    ac_cv_header_png_h=`cat conftestval`,
-                    ac_cv_header_png_h=no,
-                    dnl cross-compiling: test (later) if we have any png.h
-                    unset ac_cv_header_png_h
-                )]
-            )
-            AC_CHECK_HEADER(png.h,,, [ ])
+                    int main()
+                    {
+                        FILE *f=fopen("conftestval", "w");
+                        if (!f) exit(1);
+                        fprintf(f, "%s",
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                        exit(0);
+                    }
+                ],
+                ac_cv_header_png_h=`cat conftestval`,
+                ac_cv_header_png_h=no,
+                dnl cross-compiling: test (later) if we have any png.h
+                unset ac_cv_header_png_h
+            )]
+        )
+        AC_CHECK_HEADER(png.h,,, [ ])
 
-            if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
-            fi
+        if test "$ac_cv_header_png_h" = "yes"; then
+            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
+        fi
 
-            if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system png library not found or too old, will use built-in instead])
-                    wxUSE_LIBPNG=builtin
-                fi
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
             else
-                dnl we are using the system library
-                wxUSE_LIBPNG=sys
+                AC_MSG_WARN([system png library not found or too old, will use built-in instead])
+                wxUSE_LIBPNG=builtin
             fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBPNG=sys
         fi
     fi
 fi
@@ -2663,71 +2650,63 @@ JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
     AC_DEFINE(wxUSE_LIBJPEG)
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
-        wxUSE_LIBJPEG=sys
-    fi
-
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libjpeg when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-            dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
-            dnl HAVE_STDLIB_H which are already defined and this provokes
-            dnl a compiler warning which configure considers as an error...
-            AC_MSG_CHECKING(for jpeglib.h)
-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-                AC_TRY_COMPILE(
-                    [
-                        #undef HAVE_STDLIB_H
-                        #include <stdio.h>
-                        #include <jpeglib.h>
-                    ],
-                    [
-                    ],
-                    ac_cv_header_jpeglib_h=yes,
-                    ac_cv_header_jpeglib_h=no
-                )
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+        dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+        dnl HAVE_STDLIB_H which are already defined and this provokes
+        dnl a compiler warning which configure considers as an error...
+        AC_MSG_CHECKING(for jpeglib.h)
+        AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+            AC_TRY_COMPILE(
+                [
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
+                ],
+                [
+                ],
+                ac_cv_header_jpeglib_h=yes,
+                ac_cv_header_jpeglib_h=no
             )
-            AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+        )
+        AC_MSG_RESULT($ac_cv_header_jpeglib_h)
 
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
-            fi
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+        fi
 
-            if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system jpeg library not found, will use built-in instead])
-                    wxUSE_LIBJPEG=builtin
-                fi
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
             else
-                dnl we are using the system library
-                wxUSE_LIBJPEG=sys
+                AC_MSG_WARN([system jpeg library not found, will use built-in instead])
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBJPEG=sys
 
-                if test "$wxUSE_MSW" = 1; then
-                    dnl boolean is defined by the jpeg headers and also by the
-                    dnl Windows headers of some compilers. This type has been
-                    dnl renamed in the builtin, so it is only an issue when
-                    dnl using an external jpeg lib on Windows.
-                    AC_CHECK_TYPES(
-                        [boolean],
-                        [
-                            AC_CHECK_SIZEOF(
-                                [boolean],
-                                [],
-                                [
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-                                ])
-                            AC_DEFINE_UNQUOTED(
-                                [wxHACK_BOOLEAN],
-                                [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
-                        ],
-                        [],
-                        [#include <windows.h>])
-                fi
+            if test "$wxUSE_MSW" = 1; then
+                dnl boolean is defined by the jpeg headers and also by the
+                dnl Windows headers of some compilers. This type has been
+                dnl renamed in the builtin, so it is only an issue when
+                dnl using an external jpeg lib on Windows.
+                AC_CHECK_TYPES(
+                    [boolean],
+                    [
+                        AC_CHECK_SIZEOF(
+                            [boolean],
+                            [],
+                            [
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
+                            ])
+                        AC_DEFINE_UNQUOTED(
+                            [wxHACK_BOOLEAN],
+                            [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
+                    ],
+                    [],
+                    [#include <windows.h>])
             fi
         fi
     fi
@@ -3153,74 +3132,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         fi
     fi
 
-    if test "$wxUSE_MGL" = 1; then
-       AC_MSG_CHECKING(for SciTech MGL library)
-        if test "x$MGL_ROOT" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL library. Make sure MGL_ROOT is set.])
-        else
-            AC_MSG_RESULT($MGL_ROOT)
-        fi
-
-        AC_MSG_CHECKING(for libmgl location)
-        dnl Find MGL library that we want
-        dnl FIXME_MGL - test for MGL variants for freebsd etc.;
-        dnl             and for non-x86 versions
-        case "${host}" in
-            *-*-linux* )
-              dnl glibc.so, glibc are for older versions of MGL,
-              dnl x86/a, x86/so are used by >= 5.0 R11
-              if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
-              fi
-              ;;
-            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
-              ;;
-            *)
-              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
-        esac
-
-        mgl_lib_type=""
-        mgl_os=""
-
-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-            fi
-        done
-
-        if test "x$mgl_os" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
-        fi
-        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
-
-        wxUSE_UNIVERSAL="yes"
-
-        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
-
-        AFMINSTALL=afminstall
-        TOOLKIT=MGL
-        GUIDIST=MGL_DIST
-    fi
-
     if test "$wxUSE_DFB" = 1; then
        PKG_PROG_PKG_CONFIG()
 
@@ -5710,40 +5621,37 @@ fi
 dnl Unix implementation needs additional checks because audio support
 dnl comes in many favours:
 if test "$USE_UNIX" = 1 ; then
-    dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
-    if test "$wxUSE_MGL" != 1; then
-        dnl it's not enough to check for just the header because OSS under NetBSD
-        dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
-        dnl whether we need -lossaudio at link-time
-        AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
-            AC_TRY_LINK([
-                    #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
-                ],
-                [
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
-                ],
-                ac_cv_header_sys_soundcard=yes,
-                [
-                    saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
-                    AC_TRY_LINK([
-                            #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
-                        ],
-                        [
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
-                        ],
-                        ac_cv_header_sys_soundcard=yes,
-                        [
-                            LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
-                        ]
-                    )
-                ]
-            )
-        ])
-    fi
+    dnl it's not enough to check for just the header because OSS under NetBSD
+    dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+    dnl whether we need -lossaudio at link-time
+    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+        AC_TRY_LINK([
+                #include <sys/ioctl.h>
+                #include <sys/soundcard.h>
+            ],
+            [
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
+            ],
+            ac_cv_header_sys_soundcard=yes,
+            [
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                AC_TRY_LINK([
+                        #include <sys/ioctl.h>
+                        #include <sys/soundcard.h>
+                    ],
+                    [
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
+                    ],
+                    ac_cv_header_sys_soundcard=yes,
+                    [
+                        LIBS="$saveLibs"
+                        ac_cv_header_sys_soundcard=no
+                    ]
+                )
+            ]
+        )
+    ])
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
         AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
@@ -5766,12 +5674,6 @@ if test "$wxUSE_SOUND" = "yes"; then
         WITH_PLUGIN_SDL=1
       fi
     fi
-  else
-    dnl wxMGL doesn't support sound under DOS, only under Unix
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxSound not supported in MGL under DOS... disabled])
-        wxUSE_SOUND="no"
-    fi
   fi
 fi
 
@@ -6264,14 +6166,6 @@ dnl ------------------------------------------------------------------------
 dnl wxSocket
 dnl ------------------------------------------------------------------------
 
-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
-        wxUSE_SOCKETS="no"
-    fi
-fi
-
 if test "$wxUSE_SOCKETS" = "yes"; then
     dnl under MSW we always have sockets
     if test "$TOOLKIT" != "MSW"; then
@@ -6526,16 +6420,13 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
 
     dnl joystick support is only for Linux 2.1.x or greater
     else
-        dnl wxJoystick not supported by wxMGL at all
-        if test "$wxUSE_MGL" != 1; then
-            dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
-            dnl checks only whether the header can be preprocessed, not that it
-            dnl can be compiled and in Linux 2.6.16 joystick.h is present but
-            dnl can't be compiled because of an error and with the default
-            dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
-            dnl build would fail later
-            AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
-        fi
+        dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
+        dnl checks only whether the header can be preprocessed, not that it
+        dnl can be compiled and in Linux 2.6.16 joystick.h is present but
+        dnl can't be compiled because of an error and with the default
+        dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
+        dnl build would fail later
+        AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -6725,12 +6616,7 @@ if test "$wxUSE_IPC" = "yes"; then
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
-        wxUSE_DATAOBJ=no
-    else
-        AC_DEFINE(wxUSE_DATAOBJ)
-    fi
+    AC_DEFINE(wxUSE_DATAOBJ)
 else
     AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
     wxUSE_CLIPBOARD=no
@@ -6738,7 +6624,7 @@ else
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_DFB" = 1; then
         AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
         wxUSE_CLIPBOARD=no
     fi
@@ -6749,8 +6635,7 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
         AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
         wxUSE_DRAG_AND_DROP=no
     fi
@@ -6908,7 +6793,7 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_DFB" = 1; then
         AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
         wxUSE_DISPLAY=no
     else
@@ -7185,7 +7070,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
         AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
     else
         AC_DEFINE(wxUSE_DIALUP_MANAGER)
diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 83e4652fca..387941b0e4 100644
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__) || defined(__WXMGL__)
+    || defined(__WXMAC__)
 #   include "bombs.xpm"
 #endif
 
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 8366b49890..3a256a67f2 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -38,7 +38,7 @@
 // resources
 // --------------------------------------------------------------------------
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     // application icon
     #include "mondrian.xpm"
 
diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index d2b2d24d9e..4fef5e61c6 100644
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@@ -48,7 +48,6 @@ always tested using @ifdef_ and not @if_.
 @itemdef{__WXMAC__, old define for Mac OS X}
 @itemdef{__WXMOTIF__, Motif}
 @itemdef{__WXMOTIF20__, Motif 2.0 or higher}
-@itemdef{__WXMGL__, SciTech Soft MGL (__WXUNIVERSAL__ will be also defined)}
 @itemdef{__WXMSW__, Any Windows}
 @itemdef{__WXOSX__, any OS X}
 @itemdef{__WXOSX_IPHONE__, OS X iPhone}
@@ -95,7 +94,6 @@ symbols, although this has not always been followed.
 @itemdef{__DARWIN__, Mac OS X using the BSD Unix C library
                     (as opposed to using the Metrowerks MSL C/C++ library)}
 @itemdef{__DATA_GENERAL__, DG-UX}
-@itemdef{__DOS_GENERAL__, DOS (used with wxMGL only)}
 @itemdef{__FREEBSD__, FreeBSD}
 @itemdef{__HPUX__, HP-UX (Unix)}
 @itemdef{__GNU__, GNU Hurd}
diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h
index 9eb787eb69..593eb18e40 100644
--- a/docs/doxygen/mainpages/platdetails.h
+++ b/docs/doxygen/mainpages/platdetails.h
@@ -21,7 +21,6 @@ and ports.
 @li @ref page_port_wxgtk
 @li @ref page_port_wxosx
 @li @ref page_port_wxos2
-@li @ref page_port_wxmgl
 @li @ref page_port_wxx11
 @li @ref page_port_wxmotif
 @li @ref page_port_wxmsw
@@ -122,32 +121,6 @@ developed, docs for it are available in @c docs/cocoa in the distribution.
 
 
 
-@section page_port_wxmgl wxMGL
-
-wxMGL is a port of wxWidgets using the MGL library available
-from SciTech as the underlying graphics backend. wxMGL draws
-its widgets using the wxUniversal widget set which is part
-of wxWidgets. MGL itself runs on a variety of platforms
-including DOS, Linux hardware (similar to the Linux framebuffer)
-and various graphics systems such as Win32, X11 and OS/2.
-Note that currently MGL for Linux runs only on x86-based systems.
-
-You will MGL 5.0 or higher which is available from
-
-http://www.scitechsoft.com/products/product_download.html
-
-In order to configure wxWidgets to compile wxMGL you will
-need to type:
-
-@verbatim configure --with-mgl --with-universal @endverbatim
-
-Under DOS, wxMGL uses a dmake based make system.
-
-For further information, please see the files in @c docs/mgl
-in the distribution.
-
-
-
 @section page_port_wxos2 wxOS2
 
 wxOS2 is a port of wxWidgets for the IBM OS/2 Warp3 and Warp4 platforms.
diff --git a/docs/doxygen/overviews/envvars.h b/docs/doxygen/overviews/envvars.h
index f0d1e575d9..c4fd739e5e 100644
--- a/docs/doxygen/overviews/envvars.h
+++ b/docs/doxygen/overviews/envvars.h
@@ -27,13 +27,5 @@ wxWidgets programs.
         @c /usr/local or @c /usr). You can set WXPREFIX if you are for example
         distributing a binary version of an application and you don't know in advance
         where it will be installed.}
-@itemdef{WXMODE,
-        (wxMGL only.)
-        Sets MGL video mode. The value must be in form
-        @e widthx@e height-@e depth. The default is @c 640x480-16.}
-@itemdef{WXSTDERR,
-        (wxMGL only.)
-        Redirects stderr output to a file.}
-
 */
 
diff --git a/docs/index.htm b/docs/index.htm
index 726517f9bf..2ae6f61f72 100644
--- a/docs/index.htm
+++ b/docs/index.htm
@@ -47,7 +47,6 @@
       <a href="gtk/readme.txt">wxGTK</a>,
       <a href="mac/readme.txt">wxMac</a>,
       <a href="cocoa/readme.txt">wxCocoa</a>,
-      <a href="mgl/readme.txt">wxMGL</a>,
       <a href="motif/readme.txt">wxMotif</a>,
       <a href="x11/readme.txt">wxX11</a>,
       <a href="univ/readme.txt">Univ</a>
@@ -59,7 +58,6 @@
       <a href="x11/install.txt">wxX11</a>,
       <a href="mac/install.txt">wxMac</a>,
       <a href="cocoa/install.txt">wxCocoa</a>,
-      <a href="mgl/install.txt">wxMGL</a>,
       <a href="os2/install.txt">wxOS2</a>
     </li>
     <li><a href="changes.txt"><b>General change log</b></a></li>
diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
deleted file mode 100644
index 8afa4e38b6..0000000000
--- a/docs/mgl/install.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-wxWidgets for MGL installation
-------------------------------
-
-IMPORTANT NOTE:
-
-  wxMGL is currently in need of some work to bring it up to the
-  standard of some of the other wxWidgets ports.
-
-  If you experience problems installing, please re-read these
-  instructions and other related files (todo.txt, bugs.txt and
-  osname.txt for your platform if it exists) carefully before
-  mailing wxwin-users or the author. Preferably, try to fix the
-  problem first and then send a patch to the author.
-
-  When sending bug reports tell us what version of wxWidgets you are
-  using (including the beta) and what compiler on what system. One
-  example: wxMGL 2.8.0, gcc 2.95.3, Redhat 7.0
-
-First steps
------------
-
-- Download SciTech MGL library from http://www.scitechsoft.com. The
-  downloads page is here (you need MGL version 5.0beta7 or newer):
-  http://scitechsoft.com/products/dev/mgl_download/mgl_down.html
-
-  Install MGL according to provided instructions. In particular, make sure that
-  MGL_ROOT and NUCLEUS_PATH environment variables are set before attempting to
-  build wxMGL.
-
-  Make sure you installed all MGL components, including the "fonts" package
-  (it's called mgl_<ver>-font.tar.gz in Linux version). It is important to have
-  SciTech's basic fonts in $(MGL_ROOT)/fonts directory (you may want to add
-  Arial TrueType font for better output quality) and basic cursors in
-  $(MGL_ROOT)/cursors. wxMGL depends on their presence.
-
-- Download wxMGL-x.y.z.tgz, where x.y.z is the version number.
-  Download documentation in a preferred format, such as
-  wxWidgets-HTML.zip or wxWidgets-PDF.zip.
-
-- Make a directory such as ~/wx and unarchive the files into this
-  directory.
-
-- You can now use configure or makefiles to build wxWidgets and the samples.
-  In case of problems, please use GNU make.
-
-
-COMPILING
-=========
-
-Following systems are supported by wxMGL so far:
- - Unix (Linux etc.)
- - MS-DOS (DJGPP and Watcom compilers)
-
-
-* Compiling using configure
-----------------------------
-
-These instructions apply to installation on a Unix system (such as Linux). Please
-see below for information on using configure on non-Unix platforms.
-
-If you compile wxWidgets on Linux for the first time and don't like to read
-install instructions just do (in the base dir):
-
-> ./configure --with-mgl
-> make
-> su <type root password>
-> make install
-> ldconfig
-> exit
-
-Afterwards you can continue with
-
-> make
-> su <type root password>
-> make install
-> ldconfig
-> exit
-
-If you want to remove wxWidgets on Unix you can do this:
-
-> su <type root password>
-> make uninstall
-> ldconfig
-> exit
-
-You can set many options to configure. Type
-
-> ./configure --help
-
-and you will get a list of supported options.
-
-
-* Using wxMGL library built with configure
--------------------------------------------
-
-'make install' will install wx-config script that can (and should) be used
-to get compiler flags that are needed to build your program. wx-config --cxxflags
-will output necessary C++ compiler flags and wx-config --libs will list all
-needed libraries. See an example of wxWidgets application makefile:
-
-minimal: minimal.o
-	$(CXX) -o minimal minimal.o `wx-config --libs`
-
-minimal.o: minimal.cpp
-	$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
-
-
-* Using configure to build MS-DOS version
-------------------------------------------
-
-Even though configure is a Unix script, you can use it to build MS-DOS version
-of the wxMGL library. There are two possible ways to achieve this: you can
-either cross-compile from Unix or compile natively. Either way you will needed
-the DJGPP port of GCC compiler freely available from:
-    http://www.delorie.com/djgpp/getting.html
-
-Scitech MGL must be compiled natively, and to do this you will need to download
-the following files (from the current/v2 and current/v2gnu directories). You
-should get the latest versions available rather than the exact versions shown
-below, they are just an example of what to look for:
-
-djdev203.zip B   1,530,778 020811 DJGPP development kit 2.03
-bnu2161b.zip B   3,483,132 050708 GNU Binutils 2.16.1 for DJGPP V2
-gcc344b.zip  B   3,772,211 050527 GNU GCC 3.4.4 for DJGPP V2
-gpp344b.zip  B   4,026,725 050527 GNU C++ Compiler 3.4.4 for DJGPP V2
-
-If you want to build wxMGL natively using the DJGPP compiler, you will have to
-install a couple of Unix utilities. I think the following is the minimum that
-will work:
-
-bsh204b.zip  B     454,308 020106 GNU Bash shell 2.04 for DJGPP V2
-fil41b.zip   B   1,738,170 030830 GNU fileutils 4.1 for DJGPP V2
-find41b.zip  B     306,826 010505 GNU findutils 4.1 for DJGPP V2
-grep24b.zip  B     254,997 000116 GNU Grep 2.4 for DJGPP V2
-mak3791b.zip B     272,798 020106 GNU Make 3.79.1 for DJGPP V2
-sed414b.zip  B     159,920 050331 GNU Sed 4.1.4 for DJGPP V2
-shl2011b.zip B   1,195,021 020419 GNU sh-utils 2.01 for DJGPP V2
-
-You'll probably also want a debugger:
-gdb611b.zip  B   1,585,648 040629 GNU GDB Debugger 6.1.1 for DJGPP V2
-
-And maybe some of these:
-faq230b.zip  B     679,865 000203 FAQ 2.30 for DJGPP v2.03
-dif281b.zip  B     402,859 040911 GNU Diffutils 2.8.1 for DJGPP V2
-gwk314b.zip  B     968,667 050321 GNU Awk 3.1.4 for DJGPP V2
-gzip135b.zip B     146,138 041215 GNU gzip 1.3.5 for DJGPP V2
-lss374b.zip  B     199,805 020405 GNU Less 374 for DJGPP V2
-pat254b.zip  B     114,250 040326 GNU Patch 2.5.4 for DJGPP V2
-tar112ab.zip B     236,427 000305 GNU Tar 1.12a for DJGPP V2
-whic211b.zip B      86,296 000911 GNU which 2.11 for DJGPP V2
-
-The system you compile on must support long file names. You can use Windows 9x
-or an x86 version of Windows 2000/XP or later. For example:
-
-C:\>set MGL_ROOT=c:/scitech
-C:\>set DJGPP=c:/djgpp/djgpp.env
-C:\>PATH=c:\djgpp\bin
-C:\>set PS1=\w\$
-C:\>bash
-c:/$ mkdir build
-c:/$ cd build
-c:/build$ ../wxWidgets/configure
-c:/build$ make
-c:/build$ cd samples/minimal
-c:/build/samples/minimal$ make
-
-Cross-compilation is very easy. It works like ordinary compilation with
-configure, you only have to specify the target:
-
-> ./configure --with-mgl --build=i586-linux --host=i586-pc-msdosdjgpp
-> make
-
-For this to work, you must have installed a cross compiler on your system.
-
-Linux rpms are available here:
-    http://ap1.pp.fi/djgpp/gcc/cross-compiler/index.html
-
-NetBSD has a binary package which can be installed with:
-    # pkg_add cross-i386-msdosdjgpp
-
-For other systems you will need to obtain the djgpp sources and compile them
-yourself.
-
-
-* Building wxMGL for MS-DOS using Watcom C/C++
------------------------------------------------
-
-<Note: this section is currently out of date>
-
-You will need Watcom C/C++ compiler version 11 or newer (Watcom is going to be
-OpenSourced by SciTech, check out http://www.openwatcom.org).
-
-1. Edit $(WXDIR)\include\wx\univ\setup.h to suit your needs (in same way as you
-   do when compiling wxMSW).
-
-2. Go to $(WXDIR)\src\mgl and run
-   > wmake -f makefile.wat all
-
-3. You can compile the samples by typing 'wmake -f makefile.mgl all' in sample
-   directory if this file is available. If it is not, copy makefile.wat to
-   makefile.mgl and replace the line that says
-
-       !include $(WXDIR)\src\makeprog.wat
-
-   with
-
-       !include $(WXDIR)\src\mgl\makeprog.wat
-
-
-Compilation notes for MGL with gcc
-----------------------------------
-
-The mvis library doesn't compile with current versions of gcc. However wxMGL
-does not use this part of MGL, so it can be taken out of the compile, e.g.:
-
---- scitech/src/makefile.orig	2004-04-15 20:36:32.000000000 +0100
-+++ scitech/src/makefile	2005-04-26 01:50:12.000000000 +0100
-@@ -88,7 +88,7 @@
-
- # Target to build libraries for one compiler for SciTech MGL Graphics Library
-
--all_mgl:    $(T_PM) $(T_GCONSOLE) $(T_SNAP) $(T_TECH) $(T_MVIS) $(T_FIXED) \
-+all_mgl:    $(T_PM) $(T_GCONSOLE) $(T_SNAP) $(T_TECH) $(T_FIXED) \
-             $(T_GM) $(T_GLUT) $(T_MGL)
-     @$(ECHO) =============================================================================
-     @$(ECHO) DONE: Single compiler MGL build completed successfully!
-
-The following small change is also required to include/tcl/hashmap.hpp:
-
---- scitech/include/tcl/hashtab.hpp.orig        2006-01-20 19:51:12.000000000 +0000
-+++ scitech/include/tcl/hashtab.hpp     2006-01-22 14:12:12.000000000 +0000
-@@ -60,7 +60,7 @@
-     TCHashTableNode **prev;
-
-     friend class TCGenHashTable;
--    friend  ostream& operator << (ostream& o,TCGenHashTable& h);
-+    friend  ostream& operator << (ostream& o, class TCGenHashTable& h);
- public:
-             // Constructor to satisfy some compilers :-(
-             TCHashTableNode() {};
-
-
-Bug reports
------------
-
-Please send bug reports with a description of your environment,
-compiler and the error message(s) to the wxwin-developers mailing list at:
-
-    wx-dev@lists.wxwidgets.org
-
-Vaclav Slavik, Julian Smart, Robert Roebling and Vadim Zeitlin, February 2002.
-Mike Wetherell 2005/2006
diff --git a/docs/mgl/readme.txt b/docs/mgl/readme.txt
deleted file mode 100644
index e802a43f14..0000000000
--- a/docs/mgl/readme.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-  Welcome to wxWidgets/MGL
-
-You have downloaded the MGL port of the wxWidgets GUI library.
-This runs on top of SciTech MGL library (http://www.scitechsoft.com/)
-that is available for variety of operating systems and comes with support
-for embedded devices.
-
-More information about the wxWidgets project as a whole
-can be found at:
-
-  http://www.wxwidgets.org/
-  
-Information on how to install can be found in the file 
-install.txt
-
-
-  Regards,
-
-  The wxWidgets team
-
diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt
index a01ea6134c..6a8ac79909 100644
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -15,7 +15,6 @@ The following platforms are supported:
 - Mac OS X using Carbon
 - Mac OS X using Cocoa (beta)
 - OS/2 (beta)
-- MGL for Linux and DOS
 
 To get wxWidgets, please go to the Download page at:
 
diff --git a/docs/tech/tn0012.txt b/docs/tech/tn0012.txt
index 3dd34d030e..95657bf4db 100644
--- a/docs/tech/tn0012.txt
+++ b/docs/tech/tn0012.txt
@@ -45,7 +45,6 @@ $toolkit must currently be one of the following:
 	mac
 	os2
 	pm
-	mgl
 	motif
 
 --------------------------------------------------------------------
diff --git a/include/wx/app.h b/include/wx/app.h
index 1805be171b..3787654e9e 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -592,10 +592,10 @@ public:
     // ------------------------------------------------------------------------
 
         // Get display mode that is used use. This is only used in framebuffer
-        // wxWin ports (such as wxMGL or wxDFB).
+        // wxWin ports such as wxDFB.
     virtual wxVideoMode GetDisplayMode() const;
         // Set display mode to use. This is only used in framebuffer wxWin
-        // ports (such as wxMGL or wxDFB). This method should be called from
+        // ports such as wxDFB. This method should be called from
         // wxApp::OnInitGui
     virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; }
 
@@ -685,8 +685,6 @@ protected:
     #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/app.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/app.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/app.h"
 #elif defined(__WXGTK20__)
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 79a392abbf..ea2322597f 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -68,8 +68,7 @@ protected:
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0;
 };
 
-#if defined(__WXMGL__) || \
-    defined(__WXDFB__) || \
+#if defined(__WXDFB__) || \
     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
     defined(__WXCOCOA__) || \
@@ -252,9 +251,6 @@ protected:
 #elif defined(__WXX11__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
     #include "wx/x11/bitmap.h"
-#elif defined(__WXMGL__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
-    #include "wx/mgl/bitmap.h"
 #elif defined(__WXDFB__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
     #include "wx/dfb/bitmap.h"
@@ -284,7 +280,7 @@ ConvertToDisabled(unsigned char brightness) const
 #endif // wxUSE_IMAGE
 
 // we must include generic mask.h after wxBitmap definition
-#if defined(__WXMGL__) || defined(__WXDFB__)
+#if defined(__WXDFB__)
     #define wxUSE_GENERIC_MASK 1
 #else
     #define wxUSE_GENERIC_MASK 0
diff --git a/include/wx/brush.h b/include/wx/brush.h
index 044255dd24..40171d30b1 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -78,8 +78,6 @@ public:
     #include "wx/gtk/brush.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/brush.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/brush.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 12d8f96ec8..398206ebd4 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1213,8 +1213,6 @@
 #  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
-#elif defined(__WXMGL__)
-#  include "wx/mgl/chkconf.h"
 #elif defined(__WXDFB__)
 #  include "wx/dfb/chkconf.h"
 #elif defined(__WXMOTIF__)
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 06dd74d194..3adcf06d01 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -160,8 +160,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
diff --git a/include/wx/colour.h b/include/wx/colour.h
index 1cc5fd8b20..eac59a6bd7 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -221,8 +221,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
     #include "wx/gtk/colour.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/colour.h"
-#elif defined(__WXMGL__)
-    #include "wx/generic/colour.h"
 #elif defined(__WXDFB__)
     #include "wx/generic/colour.h"
 #elif defined(__WXX11__)
diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index 2319c7e490..55b4043cf8 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -49,9 +49,6 @@ public:
 #elif defined(__WXX11__)
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
     #include "wx/x11/cursor.h"
-#elif defined(__WXMGL__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
-    #include "wx/mgl/cursor.h"
 #elif defined(__WXDFB__)
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
     #include "wx/dfb/cursor.h"
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 04c68b0026..49440aef7f 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -40,7 +40,6 @@
          !defined(__WXOSX_IPHONE__)   && \
          !defined(__WXCOCOA__) && \
          !defined(__X__)       && \
-         !defined(__WXMGL__)   && \
          !defined(__WXDFB__)   && \
          !defined(__WXX11__)   && \
           wxUSE_GUI
@@ -3277,10 +3276,6 @@ typedef struct _PangoLayout          PangoLayout;
 typedef struct _PangoFontDescription PangoFontDescription;
 #endif
 
-#ifdef __WXMGL__
-typedef struct window_t *WXWidget;
-#endif /*  MGL */
-
 #ifdef __WXDFB__
 /* DirectFB doesn't have the concept of non-TLW window, so use
    something arbitrary */
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index a26e3747f9..d02325f8f1 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -116,7 +116,6 @@ protected:
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
-      defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
       defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index 6a563bdbcd..0980174c83 100644
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -54,8 +54,6 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
              xencoding;
 #elif defined(wxHAS_UTF8_FONTS)
     // ports using UTF-8 for text don't need encoding information for fonts
-#elif defined(__WXMGL__)
-    int      mglEncoding;
 #else
     #error "Unsupported toolkit"
 #endif
diff --git a/include/wx/font.h b/include/wx/font.h
index e727652362..0d70d3f41a 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -351,8 +351,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
     #include "wx/gtk1/font.h"
 #elif defined(__WXX11__)
     #include "wx/x11/font.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/font.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index bf7fa60792..cf94737437 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -176,9 +176,6 @@ enum wxStockCursor
 #elif defined(__WXPM__)
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
-#elif defined(__WXMGL__)
-    // Initialize from an included XPM
-    #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXDFB__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
@@ -209,7 +206,6 @@ enum wxStockCursor
       defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMAC__)   || \
-      defined(__WXMGL__)   || \
       defined(__WXDFB__)   || \
       defined(__WXCOCOA__)
     // Initialize from an included XPM
diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4153b7f9f7..3b7b9b20a5 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -38,9 +38,6 @@
 #elif defined(__WXX11__)
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/generic/icon.h"
-#elif defined(__WXMGL__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
-  #include "wx/generic/icon.h"
 #elif defined(__WXDFB__)
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/generic/icon.h"
diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
deleted file mode 100644
index 40b6e0bf68..0000000000
--- a/include/wx/mgl/app.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/app.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_APP_H__
-#define __WX_APP_H__
-
-#include "wx/frame.h"
-#include "wx/icon.h"
-#include "wx/vidmode.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
-
-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxApp: public wxAppBase
-{
-public:
-    wxApp();
-    virtual ~wxApp();
-
-    /* override for altering the way wxGTK intializes the GUI
-     * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
-     * default. when overriding this method, the code in it is likely to be
-     * platform dependent, otherwise use OnInit(). */
-    virtual bool OnInitGui();
-
-    // override base class (pure) virtuals
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-
-    virtual void Exit();
-    virtual void WakeUpIdle();
-
-    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
-    virtual bool SetDisplayMode(const wxVideoMode& mode);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-    wxVideoMode m_displayMode;
-};
-
-#endif // __WX_APP_H__
diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
deleted file mode 100644
index 8e9d550ac2..0000000000
--- a/include/wx/mgl/bitmap.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/bitmap.h
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_BITMAP_H__
-#define __WX_BITMAP_H__
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
-
-class MGLDevCtx;
-struct bitmap_t;
-
-//-----------------------------------------------------------------------------
-// wxBitmap
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
-{
-public:
-    wxBitmap() {}
-    wxBitmap(int width, int height, int depth = -1)
-        { Create(width, height, depth); }
-    wxBitmap(const wxSize& sz, int depth = -1)
-        { Create(sz, depth); }
-    wxBitmap(const char bits[], int width, int height, int depth = 1);
-    wxBitmap(const char* const* bits);
-    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    wxBitmap(const wxImage& image, int depth = -1);
-    virtual ~wxBitmap() {}
-
-    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-
-    virtual int GetHeight() const;
-    virtual int GetWidth() const;
-    virtual int GetDepth() const;
-
-    virtual wxImage ConvertToImage() const;
-
-    virtual wxMask *GetMask() const;
-    virtual void SetMask(wxMask *mask);
-
-    virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
-
-    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const;
-    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-
-    virtual wxPalette *GetPalette() const;
-    virtual void SetPalette(const wxPalette& palette);
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
-
-    static void InitStandardHandlers();
-
-    // implementation:
-    virtual void SetHeight(int height);
-    virtual void SetWidth(int width);
-    virtual void SetDepth(int depth);
-
-    virtual wxColour QuantizeColour(const wxColour& colour) const;
-
-    // get underlying native representation:
-    bitmap_t *GetMGLbitmap_t() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    // creates temporary DC for access to bitmap's data:
-    MGLDevCtx *CreateTmpDC() const;
-    // sets fg & bg colours for 1bit bitmaps:
-    void SetMonoPalette(const wxColour& fg, const wxColour& bg);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-    friend class wxDC;
-    friend class wxMemoryDC;
-};
-
-#endif // __WX_BITMAP_H__
diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
deleted file mode 100644
index ec06a3821e..0000000000
--- a/include/wx/mgl/brush.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/brush.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_BRUSH_H__
-#define __WX_BRUSH_H__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxBrush;
-
-//-----------------------------------------------------------------------------
-// wxBrush
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
-{
-public:
-    wxBrush() {}
-    wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
-    wxBrush(const wxBitmap &stippleBitmap);
-
-    bool operator==(const wxBrush& brush) const;
-    bool operator!=(const wxBrush& brush) const;
-
-    wxBrushStyle GetStyle() const;
-    wxColour GetColour() const;
-    wxBitmap *GetStipple() const;
-
-    void SetColour(const wxColour& col);
-    void SetColour(unsigned char r, unsigned char g, unsigned char b);
-    void SetStyle(wxBrushStyle style);
-    void SetStipple(const wxBitmap& stipple);
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
-
-    // implementation:
-
-    void* GetMaskPattern() const;
-    void* GetPixPattern() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-};
-
-#endif // __WX_BRUSH_H__
diff --git a/include/wx/mgl/chkconf.h b/include/wx/mgl/chkconf.h
deleted file mode 100644
index 12ebd70cde..0000000000
--- a/include/wx/mgl/chkconf.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Name:        wx/mgl/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Julian Smart
- * Modified by:
- * Created:     01/02/97
- * RCS-ID:      $Id$
- * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_MGL_CHKCONF_H_
-#define _WX_MGL_CHKCONF_H_
-
-#ifndef __WXUNIVERSAL__
-#   error "wxMGL cannot be built without wxUniversal"
-#endif
-
-/* wxPalette is always needed */
-#if !wxUSE_PALETTE
-#   error "wxMGL requires wxUSE_PALETTE=1"
-#endif
-
-/*
-   wxDisplay is not implemented for OS/2, use stub common version instead.
- */
-#if wxUSE_DISPLAY
-#   undef wxUSE_DISPLAY
-#   define wxUSE_DISPLAY 0
-#endif /* wxUSE_DISPLAY */
-
-#ifdef __WATCOMC__
-
-/* Watcom builds for MGL port are setup.h driven and setup.h is
-   automatically generated from include/wx/setup_inc.h so we have
-   to disable here features not supported currently or enable
-   features required */
-
-#if wxUSE_STACKWALKER
-#   undef wxUSE_STACKWALKER
-#   define wxUSE_STACKWALKER 0
-#endif /* wxUSE_STACKWALKER */
-
-#if wxUSE_ACCEL
-#   undef wxUSE_ACCEL
-#   define wxUSE_ACCEL 0
-#endif /* wxUSE_ACCEL */
-
-#if wxUSE_DYNLIB_CLASS
-#   undef wxUSE_DYNLIB_CLASS
-#   define wxUSE_DYNLIB_CLASS 0
-#endif /* wxUSE_DYNLIB_CLASS */
-
-#if wxUSE_DYNAMIC_LOADER
-#   undef wxUSE_DYNAMIC_LOADER
-#   define wxUSE_DYNAMIC_LOADER 0
-#endif /* wxUSE_DYNAMIC_LOADER */
-
-#if wxUSE_DATAOBJ
-#   undef wxUSE_DATAOBJ
-#   define wxUSE_DATAOBJ 0
-#endif
-
-#if wxUSE_CLIPBOARD
-#   undef wxUSE_CLIPBOARD
-#   define wxUSE_CLIPBOARD 0
-#endif /* wxUSE_CLIPBOARD */
-
-#if wxUSE_SOCKETS
-#   undef wxUSE_SOCKETS
-#   define wxUSE_SOCKETS 0
-#endif /* wxUSE_SOCKETS */
-
-#if wxUSE_THREADS
-#   undef wxUSE_THREADS
-#   define wxUSE_THREADS 0
-#endif /* wxUSE_SOCKETS */
-
-#if wxUSE_PROTOCOL
-#   undef wxUSE_PROTOCOL
-#   define wxUSE_PROTOCOL 0
-#endif /* wxUSE_PROTOCOL */
-
-#if wxUSE_URL
-#   undef wxUSE_URL
-#   define wxUSE_URL 0
-#endif /* wxUSE_URL */
-
-#if wxUSE_FS_INET
-#   undef wxUSE_FS_INET
-#   define wxUSE_FS_INET 0
-#endif /* wxUSE_FS_INET */
-
-#if wxUSE_MS_HTML_HELP
-#   undef wxUSE_MS_HTML_HELP
-#   define wxUSE_MS_HTML_HELP 0
-#endif
-
-#endif /* __WATCOM__ */
-
-#endif /* _WX_MGL_CHKCONF_H_ */
diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h
deleted file mode 100644
index d0693667a4..0000000000
--- a/include/wx/mgl/clipbrd.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/clipbrd.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_CLIPBOARD_H__
-#define __WX_CLIPBOARD_H__
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/dataobj.h"
-#include "wx/control.h"
-#include "wx/module.h"
-
-// ----------------------------------------------------------------------------
-// wxClipboard
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
-{
-public:
-    wxClipboard() {}
-    virtual ~wxClipboard() {}
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open() {}
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close() {}
-
-    // query whether the clipboard is opened
-    virtual bool IsOpened() const {}
-
-    // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data ) {}
-
-    // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data ) {}
-
-    // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format ) {}
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data ) {}
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear() {}
-
-    // implementation from now on
-    bool              m_open;
-    bool              m_ownsClipboard;
-    bool              m_ownsPrimarySelection;
-    wxDataObject     *m_data;
-
-    GtkWidget        *m_clipboardWidget;  /* for getting and offering data */
-    GtkWidget        *m_targetsWidget;    /* for getting list of supported formats */
-    bool              m_waiting;          /* querying data or formats is asynchronous */
-
-    bool              m_formatSupported;
-    GdkAtom           m_targetRequested;
-    wxDataObject     *m_receivedData;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-};
-
-#endif
-   // wxUSE_CLIPBOARD
-
-#endif
-    // __WX_CLIPBOARD_H__
diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
deleted file mode 100644
index bba7e590f2..0000000000
--- a/include/wx/mgl/cursor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/cursor.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_CURSOR_H__
-#define __WX_CURSOR_H__
-
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-class MGLCursor;
-
-//-----------------------------------------------------------------------------
-// wxCursor
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
-{
-public:
-
-    wxCursor();
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-    wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-    virtual ~wxCursor();
-
-    // implementation
-    MGLCursor *GetMGLCursor() const;
-
-private:
-    void InitFromStock(wxStockCursor);
-
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-};
-
-#endif // __WX_CURSOR_H__
diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
deleted file mode 100644
index a0deefd7fc..0000000000
--- a/include/wx/mgl/dc.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/dc.h
-// Purpose:     wxDC class
-// Author:      Vaclav Slavik
-// Created:     2001/03/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DC_H_
-#define _WX_DC_H_
-
-#include "wx/defs.h"
-#include "wx/region.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#ifndef MM_TEXT
-#define MM_TEXT         0
-#define MM_ISOTROPIC    1
-#define MM_ANISOTROPIC  2
-#define MM_LOMETRIC     3
-#define MM_HIMETRIC     4
-#define MM_TWIPS        5
-#define MM_POINTS       6
-#define MM_METRIC       7
-#endif
-
-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
-
-
-// MGL fwd declarations:
-class MGLDevCtx;
-class MGLRegion;
-struct font_t;
-
-class WXDLLIMPEXP_CORE wxDC : public wxDCBase
-{
-    DECLARE_DYNAMIC_CLASS(wxDC)
-
-public:
-    wxDC();
-    virtual ~wxDC();
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void Clear();
-
-    virtual bool StartDoc(const wxString& message);
-    virtual void EndDoc();
-
-    virtual void StartPage();
-    virtual void EndPage();
-
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
-    virtual void SetPalette(const wxPalette& palette);
-
-    virtual void DestroyClippingRegion();
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-    virtual void DoGetTextExtent(const wxString& string,
-                                 wxCoord *x, wxCoord *y,
-                                 wxCoord *descent = NULL,
-                                 wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const;
-
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
-
-    virtual void SetLogicalFunction(wxRasterOperationMode function);
-
-    // implementation from now on
-    // --------------------------
-
-    virtual void ComputeScaleAndOrigin();
-
-    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
-    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
-    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
-    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
-    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
-    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
-    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
-    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
-
-    MGLDevCtx *GetMGLDC() const { return m_MGLDC; }
-    void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = false);
-
-protected:
-    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
-
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
-
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-                           wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc);
-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea);
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                        wxCoord width, wxCoord height,
-                                        double radius);
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
-
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
-    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false);
-
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-                                   double angle);
-
-    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height);
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
-
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
-
-    virtual void DoDrawLines(int n, wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-
-    // implementation from now on:
-
-protected:
-    // setup newly attached MGLDevCtx for wxDC's use
-    // (does things like setting RGB blending mode for antialiased texts):
-    void InitializeMGLDC();
-
-    // common part of DoDrawText() and DoDrawRotatedText()
-    void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
-
-    // MGL uses pens as both wxPens and wxBrushes, so we have to
-    // switch them as needed:
-    void SelectPen();
-    void SelectBrush();
-    void SelectMGLStipplePen(int style);
-    void SelectMGLFatPen(int style, int flag);
-
-    // Select m_font into m_MGLDC:
-    bool SelectMGLFont();
-
-    // Convert wxWin logical function to MGL rop:
-    int LogicalFunctionToMGLRop(int logFunc) const;
-
-    // Unified implementation of DrawIcon, DrawBitmap and Blit:
-    void DoDrawSubBitmap(const wxBitmap &bmp,
-                         wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                         wxCoord destx, wxCoord desty, int rop, bool useMask);
-
-    // MGL DC class we use:
-    MGLDevCtx        *m_MGLDC;
-    bool              m_OwnsMGLDC:1;
-
-    // helper variables for SelectXXXX():
-    bool              m_penSelected;
-    bool              m_brushSelected;
-    bool              m_downloadedPatterns[2];
-
-    // MGL does not render lines with width>1 with endings centered
-    // at given coords but with top left corner of the pen at them,
-    // these offsets are used to correct it. They are computed by
-    // SelectPen.
-    int               m_penOfsX, m_penOfsY;
-
-    double            m_mm_to_pix_x, m_mm_to_pix_y;
-
-    wxPalette         m_oldPalette;
-
-    wxRegion          m_currentClippingRegion;
-    wxRegion          m_globalClippingRegion;
-
-    // wxDC::Blit handles memoryDCs as special cases :(
-    bool              m_isMemDC;
-
-    font_t            *m_mglFont;
-};
-
-#endif
-    // _WX_DC_H_
diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
deleted file mode 100644
index fafaa01448..0000000000
--- a/include/wx/mgl/dcclient.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/dcclient.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_DCCLIENT_H__
-#define __WX_DCCLIENT_H__
-
-#include "wx/dc.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxWindowDC;
-class WXDLLIMPEXP_FWD_CORE wxPaintDC;
-class WXDLLIMPEXP_FWD_CORE wxClientDC;
-class WXDLLIMPEXP_FWD_CORE wxWindowMGL;
-
-//-----------------------------------------------------------------------------
-// wxWindowDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
-{
-public:
-    wxWindowDC() {}
-    virtual ~wxWindowDC();
-    wxWindowDC(wxWindow *win);
-
-protected:
-    wxWindow *m_wnd;
-    bool      m_inPaintHandler;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-};
-
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
-{
-public:
-    wxClientDC() : wxWindowDC() {}
-    wxClientDC(wxWindow *win);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-};
-
-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
-{
-public:
-    wxPaintDC() : wxClientDC() {}
-    wxPaintDC(wxWindow *win) : wxClientDC(win) {}
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-};
-
-#endif // __WX_DCCLIENT_H__
diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
deleted file mode 100644
index 1cf307b991..0000000000
--- a/include/wx/mgl/dcmemory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/dcmemory.h
-// Purpose:
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_DCMEMORY_H__
-#define __WX_DCMEMORY_H__
-
-#include "wx/defs.h"
-#include "wx/dcclient.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
-
-//-----------------------------------------------------------------------------
-// wxMemoryDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC, public wxMemoryDCBase
-{
-public:
-    wxMemoryDC() { Init(); }
-    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
-    wxMemoryDC(wxDC *dc); // Create compatible DC
-    virtual ~wxMemoryDC();
-
-    // these get reimplemented for mono-bitmaps to behave
-    // more like their Win32 couterparts. They now interpret
-    // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
-    // and everything else as drawing 1.
-    virtual void SetPen(const wxPen &pen);
-    virtual void SetBrush(const wxBrush &brush);
-    virtual void SetTextForeground(const wxColour &col);
-    virtual void SetTextBackground(const wxColour &col);
-
-    // implementation
-    wxBitmap  m_selected;
-
-    wxBitmap GetSelectedObject() const { return m_selected; }
-
-protected:
-    virtual void DoSelect(const wxBitmap& bitmap);
-
-private:
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-};
-
-#endif
-    // __WX_DCMEMORY_H__
-
diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
deleted file mode 100644
index 6b5fd171cd..0000000000
--- a/include/wx/mgl/dcscreen.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/dcscreen.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_DCSCREEN_H__
-#define __WX_DCSCREEN_H__
-
-#include "wx/dcclient.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxScreenDC;
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScreenDC: public wxDC
-{
-public:
-    wxScreenDC();
-    virtual ~wxScreenDC();
-
-    static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
-    static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
-    static bool EndDrawingOnTop() { return TRUE; }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
-};
-
-#endif
-
-    // __WX_DCSCREEN_H__
-
diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
deleted file mode 100644
index 291b1d9a30..0000000000
--- a/include/wx/mgl/font.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/font.h
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_FONT_H__
-#define __WX_FONT_H__
-
-#include "wx/hash.h"
-
-// ----------------------------------------------------------------------------
-// classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxPaintDC;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxFont;
-
-struct font_t;
-
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { }
-
-    wxFont(const wxNativeFontInfo& info)
-    {
-        (void)Create(info);
-    }
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(10, family, style, weight, underlined, face, encoding);
-        SetPixelSize(pixelSize);
-    }
-
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    bool Create(const wxNativeFontInfo& fontinfo);
-
-    virtual ~wxFont() {}
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
-    virtual wxString GetFaceName() const;
-    virtual bool GetUnderlined() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual bool IsFixedWidth() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
-    virtual bool SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    wxDECLARE_COMMON_FONT_METHODS();
-
-    struct font_t *GetMGLfont_t(float scale, bool antialiased);
-
-protected:
-    // ref counting code
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    virtual wxFontFamily DoGetFamily() const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
-};
-
-#endif // __WX_FONT_H__
diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
deleted file mode 100644
index 31fde89c04..0000000000
--- a/include/wx/mgl/palette.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/palette.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Created:     2001/03/11
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_PALETTE_H__
-#define __WX_PALETTE_H__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxPalette;
-struct palette_t;
-
-//-----------------------------------------------------------------------------
-// wxPalette
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
-{
-public:
-    wxPalette();
-    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    virtual ~wxPalette();
-
-    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
-    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
-
-    // implementation
-    virtual int GetColoursCount() const;
-
-    palette_t *GetMGLpalette_t() const;
-
-    DECLARE_DYNAMIC_CLASS(wxPalette)
-};
-
-#endif // __WX_PALETTE_H__
diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
deleted file mode 100644
index 6454bee1b2..0000000000
--- a/include/wx/mgl/pen.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/pen.h
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_PEN_H__
-#define __WX_PEN_H__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxPen;
-
-//-----------------------------------------------------------------------------
-// wxPen
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen : public wxPenBase
-{
-public:
-    wxPen() {}
-    wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
-#endif
-
-    wxPen(const wxBitmap& stipple, int width);
-    virtual ~wxPen() {}
-    bool operator == (const wxPen& pen) const;
-    bool operator != (const wxPen& pen) const;
-
-    void SetColour(const wxColour &colour);
-    void SetColour(unsigned char red, unsigned char green, unsigned char blue);
-    void SetCap(wxPenCap capStyle);
-    void SetJoin(wxPenJoin joinStyle);
-    void SetStyle(wxPenStyle style);
-    void SetWidth(int width);
-    void SetDashes(int number_of_dashes, const wxDash *dash);
-    void SetStipple(const wxBitmap& stipple);
-
-    wxColour GetColour() const;
-    wxPenCap GetCap() const;
-    wxPenJoin GetJoin() const;
-    wxPenStyle GetStyle() const;
-    int GetWidth() const;
-    int GetDashes(wxDash **ptr) const;
-    int GetDashCount() const;
-    wxDash* GetDash() const;
-    wxBitmap *GetStipple() const;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
-
-    // implementation:
-    void* GetPixPattern() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPen)
-};
-
-#endif // __WX_PEN_H__
diff --git a/include/wx/mgl/popupwin.h b/include/wx/mgl/popupwin.h
deleted file mode 100644
index dea9211249..0000000000
--- a/include/wx/mgl/popupwin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/popupwin.h
-// Purpose:     wxPopupWindow class for wxMGL
-// Author:      Vadim Zeitlin
-// Created:     06.01.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_POPUPWIN_H_
-#define _WX_POPUPWIN_H_
-
-// ----------------------------------------------------------------------------
-// wxPopupWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
-{
-public:
-    wxPopupWindow() { }
-
-    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
-        { (void)Create(parent, flags); }
-
-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
-    {
-        return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
-                                wxDefaultPosition, wxDefaultSize,
-                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
-    }
-
-protected:
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
-};
-
-#endif // _WX_POPUPWIN_H_
-
diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h
deleted file mode 100644
index 7b8c86a31c..0000000000
--- a/include/wx/mgl/private.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Vaclav Slavik
-// Created:     2001/04/07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MGL_PRIVATE_H_
-#define _WX_MGL_PRIVATE_H_
-
-#include "wx/ioswrap.h"
-#include <mgraph.hpp>
-#include "pmapi.h"
-
-// the scitech headers define true and false
-#undef true
-#undef false
-
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-
-
-// ---------------------------------------------------------------------------
-// private variables
-// ---------------------------------------------------------------------------
-
-extern MGLDevCtx *g_displayDC;
-extern winmng_t  *g_winMng;
-
-// ---------------------------------------------------------------------------
-// helper functions
-// ---------------------------------------------------------------------------
-
-
-// This function converts wxBitmap into pixpattern24_t representation
-// (used by wxBrush and wxPen)
-
-extern void wxBitmapToPixPattern(const wxBitmap& bitmap,
-                                 pixpattern24_t *pix, pattern_t *mask);
-
-
-// Sets current DC and restores previous one upon destruction:
-class wxCurrentDCSwitcher
-{
-public:
-    wxCurrentDCSwitcher(MGLDevCtx *dc)
-            { m_old = dc->makeCurrent(); }
-    ~wxCurrentDCSwitcher()
-            { MGL_makeCurrentDC(m_old); }
-    MGLDC *m_old;
-};
-
-
-#endif // _WX_MGL_PRIVATE_H_
diff --git a/include/wx/mgl/private/fontmgr.h b/include/wx/mgl/private/fontmgr.h
deleted file mode 100644
index 19f88cef0b..0000000000
--- a/include/wx/mgl/private/fontmgr.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/private/fontmgr.h
-// Purpose:     font management for MGL
-// Author:      Vaclav Slavik
-// Created:     2006-11-18
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MGL_PRIVATE_FONTMGR_H_
-#define _WX_MGL_PRIVATE_FONTMGR_H_
-
-struct font_info_t;
-struct font_lib_t;
-struct font_t;
-
-class wxFontInstance : public wxFontInstanceBase
-{
-public:
-    wxFontInstance(float ptSize, bool aa, font_lib_t *fontLib);
-    virtual ~wxFontInstance();
-
-    struct font_t *GetMGLfont_t() const { return m_font; }
-
-private:
-    font_t *m_font;
-};
-
-class wxFontFace : public wxFontFaceBase
-{
-public:
-    wxFontFace(const wxString& filename)
-        : m_fontLib(NULL), m_fileName(filename) {}
-
-    virtual void Acquire();
-    virtual void Release();
-
-    virtual wxFontInstance *GetFontInstance(float ptSize, bool aa);
-
-protected:
-    wxFontInstance *CreateFontInstance(float ptSize, bool aa);
-
-private:
-    font_lib_t *m_fontLib;
-    wxString m_fileName;
-};
-
-class wxFontBundle : public wxFontBundleBase
-{
-public:
-    wxFontBundle(const font_info_t *fontInfo);
-
-    virtual wxString GetName() const;
-    virtual bool IsFixed() const;
-
-    const font_info_t *GetInfo() const { return m_fontInfo; }
-
-private:
-    const font_info_t *m_fontInfo;
-};
-
-class wxFontsManager : public wxFontsManagerBase
-{
-public:
-    wxFontsManager() { AddAllFonts(); }
-
-    virtual wxString GetDefaultFacename(wxFontFamily family) const;
-
-private:
-    // adds all fonts using AddBundle()
-    void AddAllFonts();
-};
-
-#endif // _WX_MGL_PRIVATE_FONTMGR_H_
diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
deleted file mode 100644
index 052f33b40b..0000000000
--- a/include/wx/mgl/region.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/region.h
-// Purpose:     wxRegion class
-// Author:      Vaclav Slavik
-// Created:     2001/03/12
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MGL_REGION_H_
-#define _WX_MGL_REGION_H_
-
-#include "wx/list.h"
-
-class MGLRegion;
-
-class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
-{
-public:
-    wxRegion();
-    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
-    wxRegion(const wxRect& rect);
-    wxRegion(const MGLRegion& region);
-    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-    wxRegion(const wxBitmap& bmp)
-    {
-        Union(bmp);
-    }
-    wxRegion(const wxBitmap& bmp,
-             const wxColour& transColour, int tolerance = 0)
-    {
-        Union(bmp, transColour, tolerance);
-    }
-
-    virtual ~wxRegion();
-
-    // wxRegionBase methods
-    virtual void Clear();
-    virtual bool IsEmpty() const;
-
-    // implementation from now on:
-    const MGLRegion& GetMGLRegion() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    // wxRegionBase pure virtuals
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
-
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoUnionWithRect(const wxRect& rect);
-    virtual bool DoUnionWithRegion(const wxRegion& region);
-    virtual bool DoIntersect(const wxRegion& region);
-    virtual bool DoSubtract(const wxRegion& region);
-    virtual bool DoXor(const wxRegion& region);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegion);
-    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
-};
-
-
-WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList);
-
-class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
-{
-public:
-    wxRegionIterator(void);
-    wxRegionIterator(const wxRegion& region);
-    virtual ~wxRegionIterator(void);
-
-    void Reset(void) { m_currentNode = NULL; }
-    void Reset(const wxRegion& region);
-
-    operator bool (void) const { return (m_currentNode != NULL); }
-
-    bool HaveRects(void) const { return (m_currentNode != NULL); }
-
-    void operator ++ (void);
-    void operator ++ (int);
-
-    wxCoord GetX(void) const;
-    wxCoord GetY(void) const;
-    wxCoord GetW(void) const;
-    wxCoord GetWidth(void) const { return GetW(); }
-    wxCoord GetH(void) const;
-    wxCoord GetHeight(void) const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-
-private:
-    wxRegionRectList         m_rects;
-    wxRegionRectList::Node  *m_currentNode;
-
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-};
-
-#endif // _WX_MGL_REGION_H_
diff --git a/include/wx/mgl/toplevel.h b/include/wx/mgl/toplevel.h
deleted file mode 100644
index cefcd0a4f5..0000000000
--- a/include/wx/mgl/toplevel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/toplevel.h
-// Purpose:     Top level window, abstraction of wxFrame and wxDialog
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_TOPLEVEL_H__
-#define __WX_TOPLEVEL_H__
-
-//-----------------------------------------------------------------------------
-// wxTopLevelWindowMGL
-//-----------------------------------------------------------------------------
-
-class wxTopLevelWindowMGL : public wxTopLevelWindowBase
-{
-public:
-    // construction
-    wxTopLevelWindowMGL() { Init(); }
-    wxTopLevelWindowMGL(wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    // implement base class pure virtuals
-    virtual void Maximize(bool maximize = true);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsIconized() const;
-    virtual void Restore();
-
-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; }
-
-    virtual bool Show(bool show = true);
-
-    virtual void SetTitle(const wxString &title) { m_title = title; }
-    virtual wxString GetTitle() const { return m_title; }
-
-    // implementation from now on
-    // --------------------------
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    wxString      m_title;
-    bool          m_fsIsShowing:1;         /* full screen */
-    long          m_fsSaveStyle;
-    long          m_fsSaveFlag;
-    wxRect        m_fsSaveFrame;
-
-    // is the frame currently iconized?
-    bool          m_isIconized:1;
-    // and maximized?
-    bool          m_isMaximized:1;
-    wxRect        m_savedFrame;
-
-    // did we sent wxSizeEvent at least once?
-    bool          m_sizeSet:1;
-};
-
-#endif // __WX_TOPLEVEL_H__
diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
deleted file mode 100644
index 8f72a27476..0000000000
--- a/include/wx/mgl/window.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mgl/window.h
-// Purpose:     wxWindow class
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOW_H_
-#define _WX_WINDOW_H_
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-#include "wx/font.h"
-
-struct window_t;
-class MGLDevCtx;
-
-// ---------------------------------------------------------------------------
-// wxWindow declaration for MGL
-// ---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase
-{
-public:
-    wxWindowMGL() { Init(); }
-
-    wxWindowMGL(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
-
-    virtual ~wxWindowMGL();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-
-    virtual void SetLabel( const wxString &WXUNUSED(label) ) {}
-    virtual wxString GetLabel() const { return wxEmptyString; }
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show(bool show = true);
-
-    virtual void SetFocus();
-
-    virtual bool Reparent(wxWindowBase *newParent);
-
-    virtual void WarpPointer(int x, int y);
-
-    virtual void Refresh(bool eraseBackground = true,
-                         const wxRect *rect = (const wxRect *) NULL);
-    virtual void Update();
-
-    virtual bool SetCursor(const wxCursor &cursor);
-    virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget(wxDropTarget *dropTarget);
-#endif // wxUSE_DRAG_AND_DROP
-
-    // Accept files for dragging
-    virtual void DragAcceptFiles(bool accept);
-
-    virtual WXWidget GetHandle() const { return m_wnd; }
-
-    void SetMGLwindow_t(struct window_t *wnd);
-
-    // implementation from now on
-    // --------------------------
-
-protected:
-    virtual void DoFreeze();
-    virtual void DoThaw();
-
-
-    // the window handle
-    struct window_t      *m_wnd;
-    // whether there should be wxEraseEvent before wxPaintEvent or not
-    // (see wxWindow::Refresh)
-    bool                  m_refreshAfterThaw:1;
-    int                   m_eraseBackground;
-
-    // implement the base class pure virtuals
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *font = NULL) const;
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize() and would usually just call
-    // ::MoveWindow() except for composite controls which will want to arrange
-    // themselves inside the given rectangle
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-private:
-    // common part of all ctors
-    void Init();
-    // counterpart to SetFocus
-    void KillFocus();
-
-    MGLDevCtx *m_paintMGLDC;
-    friend class wxPaintDC;
-
-    DECLARE_DYNAMIC_CLASS(wxWindowMGL)
-    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);
-    DECLARE_EVENT_TABLE()
-
-public:
-    void HandlePaint(MGLDevCtx *dc);
-    // needed by wxWindowPainter
-    MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; }
-};
-
-
-#endif // _WX_WINDOW_H_
diff --git a/include/wx/palette.h b/include/wx/palette.h
index bf759267b9..61013d53fb 100644
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -34,8 +34,6 @@ public:
     #include "wx/x11/palette.h"
 #elif defined(__WXGTK__) || defined(__WXCOCOA__)
     #include "wx/generic/paletteg.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/palette.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 8e64727813..e97559b305 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -107,8 +107,6 @@ public:
     #include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/pen.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/pen.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index d479cee8d9..39a5099be0 100644
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -72,15 +72,14 @@ enum wxPortId
     wxPORT_MSW      = 1 << 1,       // wxMSW, native toolkit is Windows API
     wxPORT_MOTIF    = 1 << 2,       // wxMotif, using [Open]Motif or Lesstif
     wxPORT_GTK      = 1 << 3,       // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_MGL      = 1 << 4,       // wxMGL, using wxUniversal
+    wxPORT_DFB      = 1 << 4,       // wxDFB, using wxUniversal
     wxPORT_X11      = 1 << 5,       // wxX11, using wxUniversal
     wxPORT_PM       = 1 << 6,       // wxOS2, using OS/2 Presentation Manager
     wxPORT_OS2      = wxPORT_PM,    // wxOS2, using OS/2 Presentation Manager
     wxPORT_MAC      = 1 << 7,       // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API
     wxPORT_OSX      = wxPORT_MAC,   // wxOSX, using Cocoa, Carbon or iPhone API
     wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
-    wxPORT_DFB      = 1 << 10       // wxDFB, using wxUniversal
+    wxPORT_WINCE    = 1 << 9        // wxWinCE, toolkit is WinCE SDK API
 };
 
 // architecture of the operating system
@@ -362,7 +361,6 @@ protected:
     #define wxWIN32S                wxOS_WINDOWS_9X
 
     #define wxOS2                   wxPORT_OS2
-    #define wxMGL                   wxPORT_MGL
     #define wxCocoa                 wxPORT_MAC
     #define wxMac                   wxPORT_MAC
     #define wxMotif                 wxPORT_MOTIF
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 9276cd7e02..84474fa8eb 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -66,8 +66,6 @@ public:
     #include "wx/motif/popupwin.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/popupwin.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/popupwin.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/popupwin.h"
 #else
diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index 389e4d5abc..f24388718a 100644
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -192,9 +192,7 @@ protected:
 
 
 
-#if defined(__WXMGL__)
-    #include "wx/mgl/private/fontmgr.h"
-#elif defined(__WXDFB__)
+#if defined(__WXDFB__)
     #include "wx/dfb/private/fontmgr.h"
 #endif
 
diff --git a/include/wx/region.h b/include/wx/region.h
index 592c23712a..c81d1cddaf 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -220,8 +220,6 @@ protected:
     #include "wx/gtk1/region.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
     #include "wx/x11/region.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/region.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 334c482756..0e46dfc3e4 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -367,9 +367,6 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowX11
-#elif defined(__WXMGL__)
-    #include "wx/mgl/toplevel.h"
-    #define wxTopLevelWindowNative wxTopLevelWindowMGL
 #elif defined(__WXDFB__)
     #include "wx/dfb/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowDFB
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 1d21f3b716..c8b8444d8a 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -44,8 +44,6 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer;
 #define wxWindowNative wxWindowMSW
 #elif defined(__WXGTK__)
 #define wxWindowNative wxWindowGTK
-#elif defined(__WXMGL__)
-#define wxWindowNative wxWindowMGL
 #elif defined(__WXX11__)
 #define wxWindowNative wxWindowX11
 #elif defined(__WXMAC__)
diff --git a/include/wx/window.h b/include/wx/window.h
index b69e06f276..b644b17f55 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1842,9 +1842,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
         #define wxWindowX11 wxWindow
     #endif // wxUniv
     #include "wx/x11/window.h"
-#elif defined(__WXMGL__)
-    #define wxWindowNative wxWindowMGL
-    #include "wx/mgl/window.h"
 #elif defined(__WXDFB__)
     #define wxWindowNative wxWindowDFB
     #include "wx/dfb/window.h"
diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 19f7839435..c283d10181 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -54,11 +54,6 @@
 #   include "wx/os2/private.h"
 #endif
 
-// include mgl headers
-#ifdef __WXMGL__
-#   include "wx/mgl/private.h"
-#endif
-
 // include the most common wx headers
 #include "wx/wx.h"
 
diff --git a/interface/wx/app.h b/interface/wx/app.h
index 82bffae0a3..ac102dd5ae 100644
--- a/interface/wx/app.h
+++ b/interface/wx/app.h
@@ -635,7 +635,7 @@ public:
 
     /**
         Get display mode that is used use. This is only used in framebuffer
-        wxWidgets ports (such as wxMGL or wxDFB).
+        wxWidgets ports such as wxDFB.
     */
     virtual wxVideoMode GetDisplayMode() const;
 
@@ -727,7 +727,7 @@ public:
 
     /**
         Set display mode to use. This is only used in framebuffer wxWidgets
-        ports (such as wxMGL or wxDFB).
+        ports such as wxDFB.
     */
     virtual bool SetDisplayMode(const wxVideoMode& info);
 
diff --git a/interface/wx/checkbox.h b/interface/wx/checkbox.h
index ccd199fd37..d0f8296991 100644
--- a/interface/wx/checkbox.h
+++ b/interface/wx/checkbox.h
@@ -51,7 +51,7 @@ enum wxCheckBoxState
     @style{wxCHK_2STATE}
            Create a 2-state checkbox. This is the default.
     @style{wxCHK_3STATE}
-           Create a 3-state checkbox. Not implemented in wxMGL, wxOS2 and
+           Create a 3-state checkbox. Not implemented in wxOS2 and
            wxGTK built against GTK+ 1.2.
     @style{wxCHK_ALLOW_3RD_STATE_FOR_USER}
            By default a user can't set a 3-state checkbox to the third state.
diff --git a/interface/wx/platinfo.h b/interface/wx/platinfo.h
index e07be913e8..e586b84b04 100644
--- a/interface/wx/platinfo.h
+++ b/interface/wx/platinfo.h
@@ -77,13 +77,12 @@ enum wxPortId
     wxPORT_MSW      = 1 << 1,       //!< wxMSW, native toolkit is Windows API
     wxPORT_MOTIF    = 1 << 2,       //!< wxMotif, using [Open]Motif or Lesstif
     wxPORT_GTK      = 1 << 3,       //!< wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_MGL      = 1 << 4,       //!< wxMGL, using wxUniversal
+    wxPORT_DFB      = 1 << 4,       //!< wxDFB, using wxUniversal
     wxPORT_X11      = 1 << 5,       //!< wxX11, using wxUniversal
     wxPORT_OS2      = 1 << 6,       //!< wxOS2, using OS/2 Presentation Manager
     wxPORT_MAC      = 1 << 7,       //!< wxMac, using Carbon or Classic Mac API
     wxPORT_COCOA    = 1 << 8,       //!< wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9,       //!< wxWinCE, toolkit is WinCE SDK API
-    wxPORT_DFB      = 1 << 10       //!< wxDFB, using wxUniversal
+    wxPORT_WINCE    = 1 << 9        //!< wxWinCE, toolkit is WinCE SDK API
 };
 
 
diff --git a/interface/wx/sysopt.h b/interface/wx/sysopt.h
index 08fb8b211c..9d4adc736f 100644
--- a/interface/wx/sysopt.h
+++ b/interface/wx/sysopt.h
@@ -128,16 +128,6 @@
     @endFlagTable
 
 
-    @section sysopt_mgl MGL
-
-    @beginFlagTable
-    @flag{mgl.aa-threshold}
-        Set this integer option to point size below which fonts are not antialiased. Default: 10.
-    @flag{mgl.screen-refresh}
-        Screen refresh rate in Hz. A reasonable default is used if not specified.
-    @endFlagTable
-
-
     @section sysopt_motif Motif
 
     @beginFlagTable
diff --git a/locale/wxstd.pot b/locale/wxstd.pot
index c3f00f61c3..123ab00260 100644
--- a/locale/wxstd.pot
+++ b/locale/wxstd.pot
@@ -1741,14 +1741,6 @@ msgstr ""
 msgid "Cannot initialize OLE"
 msgstr ""
 
-#: ../src/mgl/app.cpp:224
-msgid "Cannot initialize SciTech MGL!"
-msgstr ""
-
-#: ../src/mgl/window.cpp:547
-msgid "Cannot initialize display."
-msgstr ""
-
 #: ../src/common/socket.cpp:844
 msgid "Cannot initialize sockets"
 msgstr ""
@@ -2361,10 +2353,6 @@ msgstr ""
 msgid "Couldn't create a timer"
 msgstr ""
 
-#: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:153
-msgid "Couldn't create cursor."
-msgstr ""
-
 #: ../src/osx/carbon/overlay.cpp:123
 msgid "Couldn't create the overlay window"
 msgstr ""
@@ -2656,11 +2644,6 @@ msgstr ""
 msgid "Directory '%s' couldn't be deleted"
 msgstr ""
 
-#: ../src/mgl/dirmgl.cpp:200
-#, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr ""
-
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr ""
@@ -3509,11 +3492,6 @@ msgstr ""
 msgid "File \"%s\" could not be opened for writing."
 msgstr ""
 
-#: ../src/mgl/bitmap.cpp:439
-#, c-format
-msgid "File %s does not exist."
-msgstr ""
-
 #: ../src/gtk/filedlg.cpp:53
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
@@ -4642,11 +4620,6 @@ msgstr ""
 msgid "Missing a required parameter."
 msgstr ""
 
-#: ../src/mgl/app.cpp:114
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr ""
-
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr ""
diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx
index 3821a84d11..e5d98a8d92 100644
--- a/samples/access/makefile.unx
+++ b/samples/access/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx
index d90b89f333..c279e2c28e 100644
--- a/samples/animate/makefile.unx
+++ b/samples/animate/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx
index 87557db8fc..28573b447b 100644
--- a/samples/artprov/makefile.unx
+++ b/samples/artprov/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx
index 00d351c061..fe6476a925 100644
--- a/samples/aui/makefile.unx
+++ b/samples/aui/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx
index 0116427e1e..09eb3c65c5 100644
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
index cb7abcc72a..d14d540502 100644
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/clipboard/makefile.unx b/samples/clipboard/makefile.unx
index 2d7f53915f..f3e5d22fef 100644
--- a/samples/clipboard/makefile.unx
+++ b/samples/clipboard/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx
index cb9d60af49..ddb5dec2ae 100644
--- a/samples/collpane/makefile.unx
+++ b/samples/collpane/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx
index e085a4002b..ef3776189e 100644
--- a/samples/combo/makefile.unx
+++ b/samples/combo/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
index fd1ee64129..e30a7c46ef 100644
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx
index 4f705dc650..3da200c593 100644
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
index c2f3f14598..ae396b9b32 100644
--- a/samples/controls/makefile.unx
+++ b/samples/controls/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx
index 9f11a80ceb..7de7223dfd 100644
--- a/samples/dataview/makefile.unx
+++ b/samples/dataview/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx
index 4d53e0c85a..6eaa3e6b2c 100644
--- a/samples/debugrpt/makefile.unx
+++ b/samples/debugrpt/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index a498ec1801..1ddec20cf1 100644
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx
index dac4aa0265..b3dc0c272a 100644
--- a/samples/dialup/makefile.unx
+++ b/samples/dialup/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx
index d8dc23cdaa..59ab4ae587 100644
--- a/samples/display/makefile.unx
+++ b/samples/display/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dll/makefile.unx b/samples/dll/makefile.unx
index a0dd01d0ef..d0cd3b8f49 100644
--- a/samples/dll/makefile.unx
+++ b/samples/dll/makefile.unx
@@ -13,7 +13,7 @@
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
index 3ee8be487e..0dc810c882 100644
--- a/samples/dnd/makefile.unx
+++ b/samples/dnd/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index fcb97046c5..ac58e43c91 100644
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx
index 57a7d16892..900dffb818 100644
--- a/samples/dragimag/makefile.unx
+++ b/samples/dragimag/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx
index ea107663c0..da776328f0 100644
--- a/samples/drawing/makefile.unx
+++ b/samples/drawing/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx
index fec35066bb..ba3d5bcb17 100644
--- a/samples/erase/makefile.unx
+++ b/samples/erase/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx
index 3b44af8bc7..290cef3b31 100644
--- a/samples/event/makefile.unx
+++ b/samples/event/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx
index 0ff6aaa89a..c81f9dbc21 100644
--- a/samples/except/makefile.unx
+++ b/samples/except/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx
index 81f281f9a5..c7d457ab85 100644
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx
index b95494dd17..9b0e074bf5 100644
--- a/samples/font/makefile.unx
+++ b/samples/font/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/fswatcher/makefile.unx b/samples/fswatcher/makefile.unx
index 8cd5f81f2a..ac6f4f0cb2 100644
--- a/samples/fswatcher/makefile.unx
+++ b/samples/fswatcher/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index df6ee55f84..4828185eb3 100644
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx
index addb2da9ff..f510552224 100644
--- a/samples/help/makefile.unx
+++ b/samples/help/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx
index 00a1555e80..da824b7f99 100644
--- a/samples/htlbox/makefile.unx
+++ b/samples/htlbox/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx
index d02b4106a3..ba52fb70f3 100644
--- a/samples/html/about/makefile.unx
+++ b/samples/html/about/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx
index 9a841288a4..6a789c1c4d 100644
--- a/samples/html/help/makefile.unx
+++ b/samples/html/help/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx
index fe443ad2c5..b05471b71e 100644
--- a/samples/html/helpview/makefile.unx
+++ b/samples/html/helpview/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx
index cffddce75a..97f44cdd95 100644
--- a/samples/html/htmlctrl/makefile.unx
+++ b/samples/html/htmlctrl/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx
index 5dfa5ceb80..76e3af79bc 100644
--- a/samples/html/printing/makefile.unx
+++ b/samples/html/printing/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx
index 12cec71417..ec16808419 100644
--- a/samples/html/test/makefile.unx
+++ b/samples/html/test/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx
index 7538740aad..8c8bbfe5e7 100644
--- a/samples/html/virtual/makefile.unx
+++ b/samples/html/virtual/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx
index 950014480c..eeca4ce316 100644
--- a/samples/html/widget/makefile.unx
+++ b/samples/html/widget/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx
index 171e22b468..cceecca5a7 100644
--- a/samples/html/zip/makefile.unx
+++ b/samples/html/zip/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
index 66e12045d2..fb4c93fb3f 100644
--- a/samples/image/makefile.unx
+++ b/samples/image/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx
index b337c79c7a..73a778b7c1 100644
--- a/samples/internat/makefile.unx
+++ b/samples/internat/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx
index af8a4a70e9..360f5d11dc 100644
--- a/samples/ipc/makefile.unx
+++ b/samples/ipc/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx
index 526deaea95..5f10be20b8 100644
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx
index 2dcf3b56e6..3aa55a682f 100644
--- a/samples/keyboard/makefile.unx
+++ b/samples/keyboard/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
index 9c5f7bf1e8..4cecc4e12e 100644
--- a/samples/layout/makefile.unx
+++ b/samples/layout/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
index f34e400e3b..e961a0e606 100644
--- a/samples/listctrl/makefile.unx
+++ b/samples/listctrl/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx
index 7c4d27c307..31dd1577b9 100644
--- a/samples/mdi/makefile.unx
+++ b/samples/mdi/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx
index 2b45becd6e..5cb4528937 100644
--- a/samples/mediaplayer/makefile.unx
+++ b/samples/mediaplayer/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx
index 9a8e799a19..303f913249 100644
--- a/samples/memcheck/makefile.unx
+++ b/samples/memcheck/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx
index 03ccb2bf6c..384dfb256f 100644
--- a/samples/menu/makefile.unx
+++ b/samples/menu/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
index 65bbdbaee4..b1b45a0f77 100644
--- a/samples/minimal/makefile.unx
+++ b/samples/minimal/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx
index 48b7b33434..15f2de5272 100644
--- a/samples/nativdlg/makefile.unx
+++ b/samples/nativdlg/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx
index 325ed930c6..23490c8db4 100644
--- a/samples/notebook/makefile.unx
+++ b/samples/notebook/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx
index 4091331e25..f86d101767 100644
--- a/samples/oleauto/makefile.unx
+++ b/samples/oleauto/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index e2d4df8a44..89d8c71763 100644
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index d8dd90d1c6..883f383726 100644
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index 91ef593cfe..c8f8f88723 100644
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -31,7 +31,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx
index 3e0fa1e2ec..bfae682323 100644
--- a/samples/ownerdrw/makefile.unx
+++ b/samples/ownerdrw/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx
index 0cad3167d3..6b51a72a79 100644
--- a/samples/popup/makefile.unx
+++ b/samples/popup/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx
index 11bb41fd51..359a59363d 100644
--- a/samples/power/makefile.unx
+++ b/samples/power/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx
index 78dfeaa85a..942f703757 100644
--- a/samples/printing/makefile.unx
+++ b/samples/printing/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/propgrid/makefile.unx b/samples/propgrid/makefile.unx
index 1dfc18a3fc..a9bf18be03 100644
--- a/samples/propgrid/makefile.unx
+++ b/samples/propgrid/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx
index e79a2ba00b..db7117e190 100644
--- a/samples/regtest/makefile.unx
+++ b/samples/regtest/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx
index 65ece0fb09..c4c5c6447a 100644
--- a/samples/render/makefile.unx
+++ b/samples/render/makefile.unx
@@ -28,7 +28,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/ribbon/makefile.unx b/samples/ribbon/makefile.unx
index 478b7628bb..ccc6b6dc1c 100644
--- a/samples/ribbon/makefile.unx
+++ b/samples/ribbon/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx
index b7d32d79cd..68a67c12b2 100644
--- a/samples/richtext/makefile.unx
+++ b/samples/richtext/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx
index 95765110dd..a42af2e0c0 100644
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
index aaa68970cd..6a61f5b00b 100644
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx
index d5a79835ec..b51c6d6247 100644
--- a/samples/shaped/makefile.unx
+++ b/samples/shaped/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index 50f64fb348..c6b8688940 100644
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx
index 822e172a43..76b5c4c3cb 100644
--- a/samples/sound/makefile.unx
+++ b/samples/sound/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx
index 5986d0e908..7c74c23d3f 100644
--- a/samples/splash/makefile.unx
+++ b/samples/splash/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx
index 95bc892695..19636482da 100644
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx
index 1f05e109ac..8a08cdcc11 100644
--- a/samples/statbar/makefile.unx
+++ b/samples/statbar/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/stc/makefile.unx b/samples/stc/makefile.unx
index 6936c3f45e..50b39b6f76 100644
--- a/samples/stc/makefile.unx
+++ b/samples/stc/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx
index 73c2290022..2837be667d 100644
--- a/samples/svg/makefile.unx
+++ b/samples/svg/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx
index 8a2990c7cf..8692c44253 100644
--- a/samples/taborder/makefile.unx
+++ b/samples/taborder/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx
index a3224ad457..6c2121c9be 100644
--- a/samples/taskbar/makefile.unx
+++ b/samples/taskbar/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx
index dbc87be62d..b87ac0c402 100644
--- a/samples/text/makefile.unx
+++ b/samples/text/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
index 40256d5fe4..10bf83b69c 100644
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
index d4ec2cc23a..263a0accb3 100644
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
index fd70ec8b05..10a20d7db7 100644
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/treelist/makefile.unx b/samples/treelist/makefile.unx
index 8d49ffbe11..ee7e095856 100644
--- a/samples/treelist/makefile.unx
+++ b/samples/treelist/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx
index 22e0b141a4..18f6ad62e6 100644
--- a/samples/typetest/makefile.unx
+++ b/samples/typetest/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/uiaction/makefile.unx b/samples/uiaction/makefile.unx
index e1ecd63827..86e947b7f6 100644
--- a/samples/uiaction/makefile.unx
+++ b/samples/uiaction/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx
index a596994057..e2690fed85 100644
--- a/samples/validate/makefile.unx
+++ b/samples/validate/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx
index 8c9c493227..bd8b58f29a 100644
--- a/samples/vscroll/makefile.unx
+++ b/samples/vscroll/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/webview/makefile.unx b/samples/webview/makefile.unx
index 7b34dedeae..d9cd9dab06 100644
--- a/samples/webview/makefile.unx
+++ b/samples/webview/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx
index 14ca7b5ad5..88a6688eb6 100644
--- a/samples/widgets/makefile.unx
+++ b/samples/widgets/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index d82b03d1bb..21baa5105b 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -57,8 +57,8 @@ class WidgetsPageInfo;
 // INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories'
 enum
 {
-    // On wxUniversal-based build (wxX11, wxMGL, wxMSWUniv, wxGTKUniv, etc.)
-    // 'native' means 'made with wxUniv port renderer'
+    // In wxUniversal-based builds 'native' means 'made with wxUniv port
+    // renderer'
     NATIVE_PAGE = 0,
     UNIVERSAL_PAGE = NATIVE_PAGE,
     GENERIC_PAGE,
diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx
index 1afd2d9eee..3c158653b2 100644
--- a/samples/wizard/makefile.unx
+++ b/samples/wizard/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/wrapsizer/makefile.unx b/samples/wrapsizer/makefile.unx
index 3804cc393d..181705ee37 100644
--- a/samples/wrapsizer/makefile.unx
+++ b/samples/wrapsizer/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx
index 03bb5e0e15..67378da923 100644
--- a/samples/xrc/makefile.unx
+++ b/samples/xrc/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/samples/xti/makefile.unx b/samples/xti/makefile.unx
index da0658ec2f..de967c8139 100644
--- a/samples/xti/makefile.unx
+++ b/samples/xti/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 1a280042f1..9a3ead6a33 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -196,10 +196,10 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         },
 #endif // __WXUNIVERSAL__
 
-#if defined(__WXMGL__)
-        // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+#if defined(__WXDFB__)
+        // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports
         //     should provide this option. That's why it is in common/appcmn.cpp
-        //     and not mgl/app.cpp
+        //     and not dfb/app.cpp
         {
             wxCMD_LINE_OPTION,
             NULL,
@@ -208,7 +208,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             wxCMD_LINE_VAL_STRING,
             0x0
         },
-#endif // __WXMGL__
+#endif // __WXDFB__
 
         // terminator
         wxCMD_LINE_DESC_END
@@ -236,7 +236,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
     }
 #endif // __WXUNIVERSAL__
 
-#if defined(__WXMGL__)
+#if defined(__WXDFB__)
     wxString modeDesc;
     if ( parser.Found(OPTION_MODE, &modeDesc) )
     {
@@ -250,7 +250,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
             return false;
     }
-#endif // __WXMGL__
+#endif // __WXDFB__
 
     return wxAppConsole::OnCmdLineParsed(parser);
 }
diff --git a/src/common/fontmgrcmn.cpp b/src/common/fontmgrcmn.cpp
index 6ecd7e610e..b4a379ddae 100644
--- a/src/common/fontmgrcmn.cpp
+++ b/src/common/fontmgrcmn.cpp
@@ -123,8 +123,8 @@ wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const
         type |= FaceType_Bold;
 
     // FIXME -- this should read "if ( font->GetStyle() == wxITALIC )",
-    // but since MGL neither DFB supports slant, we try to display it with
-    // italic face (better than nothing...)
+    // but since DFB doesn't support slant, we try to display it with italic
+    // face (better than nothing...)
     if ( font.GetStyle() == wxITALIC || font.GetStyle() == wxSLANT )
     {
         if ( HasFace((FaceType)(type | FaceType_Italic)) )
diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 284f5d7171..7fee6adbdb 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -116,11 +116,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 //     First, let me describe what's the problem: libpng uses jmp_buf in
 //     its png_struct structure. Unfortunately, this structure is
 //     compiler-specific and may vary in size, so if you use libpng compiled
-//     as DLL with another compiler than the main executable, it may not work
-//     (this is for example the case with wxMGL port and SciTech MGL library
-//     that provides custom runtime-loadable libpng implementation with jmpbuf
-//     disabled altogether). Luckily, it is still possible to use setjmp() &
-//     longjmp() as long as the structure is not part of png_struct.
+//     as DLL with another compiler than the main executable, it may not work.
+//     Luckily, it is still possible to use setjmp() & longjmp() as long as the
+//     structure is not part of png_struct.
 //
 //     Sadly, there's no clean way to attach user-defined data to png_struct.
 //     There is only one customizable place, png_struct.io_ptr, which is meant
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 3dccff9618..b8fed7f83c 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -48,11 +48,7 @@ extern "C"
 #include "wx/wfstream.h"
 
 #ifndef TIFFLINKAGEMODE
-    #if defined(__WATCOMC__) && defined(__WXMGL__)
-        #define TIFFLINKAGEMODE cdecl
-    #else
-        #define TIFFLINKAGEMODE LINKAGEMODE
-    #endif
+    #define TIFFLINKAGEMODE LINKAGEMODE
 #endif
 
 // ============================================================================
diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp
index 40f006be79..2df232b6dc 100644
--- a/src/common/platinfo.cpp
+++ b/src/common/platinfo.cpp
@@ -75,13 +75,12 @@ static const wxChar* const wxPortIdNames[] =
     wxT("wxMSW"),
     wxT("wxMotif"),
     wxT("wxGTK"),
-    wxT("wxMGL"),
+    wxT("wxDFB"),
     wxT("wxX11"),
     wxT("wxOS2"),
     wxT("wxMac"),
     wxT("wxCocoa"),
     wxT("wxWinCE"),
-    wxT("wxDFB")
 };
 
 static const wxChar* const wxArchitectureNames[] =
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index e538fb2ce1..749d1ff6cb 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -390,10 +390,6 @@ bool wxPlatform::Is(int platform)
     if (platform == wxOS_UNIX)
         return true;
 #endif
-#ifdef __WXMGL__
-    if (platform == wxPORT_MGL)
-        return true;
-#endif
 #ifdef __OS2__
     if (platform == wxOS_OS2)
         return true;
diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index 0cc0506b3f..8df872883c 100644
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -2,7 +2,6 @@
 // Name:        src/dfb/app.cpp
 // Purpose:     wxApp implementation
 // Author:      Vaclav Slavik
-//              based on MGL implementation
 // Created:     2006-08-16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 REA Elektronik GmbH
diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index 620a04aed9..636cad3bae 100644
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -85,7 +85,7 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 
 bool wxBrush::operator==(const wxBrush& brush) const
 {
-#warning "this is incorrect (MGL too)"
+#warning "this is incorrect"
     return m_refData == brush.m_refData;
 }
 
diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 0f00dfffbf..c4006994df 100644
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -675,9 +675,7 @@ void wxDFBDCImpl::DoDrawSubBitmap(const wxBitmap &bmp,
 
     if ( useMask && bmp.GetMask() )
     {
-        // FIXME_DFB: see MGL sources for a way to do it, but it's not directly
-        //            applicable because DirectFB doesn't implement ROPs; OTOH,
-        //            it has blitting modes that can be useful; finally, see
+        // FIXME_DFB: Could use blitting modes for this; also see
         //            DFB's SetSrcBlendFunction() and SetSrcColorKey()
         wxFAIL_MSG( "drawing bitmaps with masks not implemented" );
         return;
diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index f1b9f9d686..336c8452ef 100644
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -84,7 +84,7 @@ wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 
 bool wxPen::operator==(const wxPen& pen) const
 {
-#warning "this is incorrect (MGL too)"
+#warning "this is incorrect"
     return m_refData == pen.m_refData;
 }
 
diff --git a/src/dfb/toplevel.cpp b/src/dfb/toplevel.cpp
index 8963419683..8a5ef12fa9 100644
--- a/src/dfb/toplevel.cpp
+++ b/src/dfb/toplevel.cpp
@@ -74,7 +74,6 @@ bool wxTopLevelWindowDFB::Create(wxWindow *parent,
 // showing and hiding
 // ----------------------------------------------------------------------------
 
-#warning "FIXME: the rest of this file is almost same as for MGL, merge it"
 bool wxTopLevelWindowDFB::ShowFullScreen(bool show, long style)
 {
     if ( show == m_fsIsShowing )
diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index 06d9619065..9caa5b23c2 100644
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -2,7 +2,7 @@
 // Name:        src/dfb/window.cpp
 // Purpose:     wxWindow
 // Author:      Vaclav Slavik
-//              (based on GTK, MSW, MGL implementations)
+//              (based on GTK, MSW implementations)
 // Created:     2006-80-10
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 REA Elektronik GmbH
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index e24a44ab2d..a12be2f6c4 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -270,7 +270,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
 
 bool wxIsDriveAvailable(const wxString& dirName)
 {
-    // FIXME_MGL - this method leads to hang up under Watcom for some reason
+    // FIXME: this method leads to hang up under Watcom for some reason
 #ifdef __WATCOMC__
     wxUnusedVar(dirName);
 #else
diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 8e76ca8c23..35dae55a81 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -34,58 +34,22 @@
 // Time input function
 // ----------------------------------------------------------------------------
 
-#ifdef __WXMGL__
-    // We take advantage of wxMGL's _EVT_getTicks because it is faster
-    // (especially under MS-DOS!) and more precise than wxGetLocalTimeMillis
-    // if we are unlucky and the latter combines information from two sources.
-    #include "wx/mgl/private.h"
-    extern "C" ulong _EVT_getTicks();
-    #define GetMillisecondsTime _EVT_getTicks
+#define GetMillisecondsTime wxGetLocalTimeMillis
 
-    typedef ulong wxTimerTick_t;
+typedef wxLongLong wxTimerTick_t;
 
-    #define wxTimerTickFmtSpec wxT("lu")
-    #define wxTimerTickPrintfArg(tt) (tt)
+#if wxUSE_LONGLONG_WX
+    #define wxTimerTickFmtSpec wxLongLongFmtSpec "d"
+    #define wxTimerTickPrintfArg(tt) (tt.GetValue())
+#else // using native wxLongLong
+    #define wxTimerTickFmtSpec wxT("s")
+    #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
+#endif // wx/native long long
 
-    #ifdef __DOS__
-        // Under DOS the MGL timer has a 24hr period, so consider the 12 hours
-        // before y to be 'less' and the 12 hours after 'greater' modulo
-        // 24 hours.
-        inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
-        {
-            // _EVT_getTicks wraps at 1573040 * 55
-            const wxTimerTick_t modulus = 1573040 * 55;
-            return (2 * modulus + x - y) % modulus < modulus / 2;
-        }
-    #else
-        // If wxTimerTick_t is 32-bits then it'll wrap in around 50 days. So
-        // let the 25 days before y be 'less' and 25 days after be 'greater'.
-        inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
-        {
-            // This code assumes wxTimerTick_t is an unsigned type.
-            // Set half_modulus with top bit set and the rest zeros.
-            const wxTimerTick_t half_modulus = ~((~(wxTimerTick_t)0) >> 1);
-            return x - y < half_modulus;
-        }
-    #endif
-#else // !__WXMGL__
-    #define GetMillisecondsTime wxGetLocalTimeMillis
-
-    typedef wxLongLong wxTimerTick_t;
-
-    #if wxUSE_LONGLONG_WX
-        #define wxTimerTickFmtSpec wxLongLongFmtSpec "d"
-        #define wxTimerTickPrintfArg(tt) (tt.GetValue())
-    #else // using native wxLongLong
-        #define wxTimerTickFmtSpec wxT("s")
-        #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
-    #endif // wx/native long long
-
-    inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
-    {
-        return x >= y;
-    }
-#endif // __WXMGL__/!__WXMGL__
+inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
+{
+    return x >= y;
+}
 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler
diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
deleted file mode 100644
index 753d2df7f6..0000000000
--- a/src/mgl/app.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/app.cpp
-// Author:      Vaclav Slavik
-//              based on GTK and MSW implementations
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/app.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/frame.h"
-    #include "wx/dialog.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/evtloop.h"
-#include "wx/fontutil.h"
-#include "wx/univ/theme.h"
-#include "wx/univ/renderer.h"
-#include "wx/univ/colschem.h"
-#include "wx/sysopt.h"
-#include "wx/mgl/private.h"
-#include "wx/private/fontmgr.h"
-
-//-----------------------------------------------------------------------------
-// wxApp::Exit()
-//-----------------------------------------------------------------------------
-
-void wxApp::Exit()
-{
-    MGL_exit();
-    exit(0);
-}
-
-
-//-----------------------------------------------------------------------------
-// wxWakeUpIdle
-//-----------------------------------------------------------------------------
-
-void wxApp::WakeUpIdle()
-{
-#if wxUSE_THREADS
-    if (!wxThread::IsMain())
-        wxMutexGuiEnter();
-#endif
-
-    while (wxTheApp->ProcessIdle())
-        ;
-
-#if wxUSE_THREADS
-    if (!wxThread::IsMain())
-        wxMutexGuiLeave();
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// Root window
-//-----------------------------------------------------------------------------
-
-class wxRootWindow : public wxWindow
-{
-    public:
-        wxRootWindow() : wxWindow(NULL, wxID_ANY)
-        {
-            SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
-            SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
-        }
-        virtual ~wxRootWindow()
-        {
-            // we don't want to delete MGL_WM's rootWnd
-            m_wnd = NULL;
-        }
-
-        virtual bool AcceptsFocus() const { return false; }
-
-        DECLARE_DYNAMIC_CLASS(wxRootWindow)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxRootWindow, wxWindow)
-
-static wxRootWindow *gs_rootWindow = NULL;
-
-//-----------------------------------------------------------------------------
-// MGL initialization
-//-----------------------------------------------------------------------------
-
-static bool wxCreateMGL_WM(const wxVideoMode& displayMode)
-{
-    int mode;
-    int refresh = MGL_DEFAULT_REFRESH;
-
-#if wxUSE_SYSTEM_OPTIONS
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh")) )
-        refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
-#endif
-
-    mode = MGL_findMode(displayMode.GetWidth(),
-                        displayMode.GetHeight(),
-                        displayMode.GetDepth());
-    if ( mode == -1 )
-    {
-        wxLogError(_("Mode %ix%i-%i not available."),
-                     displayMode.GetWidth(),
-                     displayMode.GetHeight(),
-                     displayMode.GetDepth());
-        return false;
-    }
-    g_displayDC = new MGLDisplayDC(mode, 1, refresh);
-    if ( !g_displayDC->isValid() )
-    {
-        wxDELETE(g_displayDC);
-        return false;
-    }
-
-    g_winMng = MGL_wmCreate(g_displayDC->getDC());
-    if (!g_winMng)
-        return false;
-
-    return true;
-}
-
-static void wxDestroyMGL_WM()
-{
-    if ( g_winMng )
-    {
-        MGL_wmDestroy(g_winMng);
-        g_winMng = NULL;
-    }
-    wxDELETE(g_displayDC);
-}
-
-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
-
-wxApp::wxApp()
-{
-}
-
-wxApp::~wxApp()
-{
-}
-
-wxVideoMode wxGetDefaultDisplayMode()
-{
-    wxString mode;
-    unsigned w, h, bpp;
-
-    if ( !wxGetEnv(wxT("WXMODE"), &mode) ||
-         (wxSscanf(mode.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3) )
-    {
-        w = 640, h = 480, bpp = 16;
-    }
-
-    return wxVideoMode(w, h, bpp);
-}
-
-bool wxApp::SetDisplayMode(const wxVideoMode& mode)
-{
-    if ( !mode.IsOk() )
-    {
-        return false;
-    }
-    if ( g_displayDC != NULL )
-    {
-        // FIXME_MGL -- we currently don't allow to switch video mode
-        // more than once. This can hopefully be changed...
-        wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
-        return false;
-    }
-
-    if ( !wxCreateMGL_WM(mode) )
-        return false;
-    gs_rootWindow = new wxRootWindow;
-
-    m_displayMode = mode;
-
-    return true;
-}
-
-bool wxApp::OnInitGui()
-{
-    if ( !wxAppBase::OnInitGui() )
-        return false;
-
-    // MGL redirects stdout and stderr to physical console, so let's redirect
-    // it to file if WXSTDERR environment variable is set to be able to see
-    // wxLogDebug() output
-    wxString redirect;
-    if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
-        freopen(redirect.mb_str(), "wt", stderr);
-
-    wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
-    if ( oldLog ) delete oldLog;
-
-    return true;
-}
-
-bool wxApp::Initialize(int& argc, wxChar **argv)
-{
-#ifdef __DJGPP__
-    // VS: disable long filenames under DJGPP as the very first thing,
-    //     since SciTech MGL doesn't like them much...
-    wxSetEnv(wxT("LFN"), wxT("N"));
-#endif
-
-    // intialize MGL before creating wxFontsManager since it uses MGL funcs
-    if ( MGL_init(".", NULL) == 0 )
-    {
-        wxLogError(_("Cannot initialize SciTech MGL!"));
-        return false;
-    }
-
-    if ( !wxAppBase::Initialize(argc, argv) )
-    {
-        MGL_exit();
-        return false;
-    }
-
-#if wxUSE_INTL
-    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-
-    return true;
-}
-
-// Modules are cleaned up after wxApp::CleanUp(), and some modules may
-// require MGL to still be alive, e.g. the stock fonts need the fonts
-// manager. So append this module last minute in wxApp::CleanUp() to close
-// down MGL after all the other modules have been cleaned up.
-//
-struct wxMGLFinalCleanup: public wxModule
-{
-    bool OnInit() { return true; }
-
-    void OnExit()
-    {
-        wxFontsManager::CleanUp();
-
-        wxDestroyMGL_WM();
-        MGL_exit();
-    }
-};
-
-void wxApp::CleanUp()
-{
-    delete gs_rootWindow;
-
-    wxAppBase::CleanUp();
-
-    wxModule::RegisterModule(new wxMGLFinalCleanup);
-}
diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
deleted file mode 100644
index bae5a0c596..0000000000
--- a/src/mgl/bitmap.cpp
+++ /dev/null
@@ -1,871 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/bitmap.cpp
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/bitmap.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/dcmemory.h"
-    #include "wx/icon.h"
-    #include "wx/image.h"
-#endif
-
-#include "wx/filefn.h"
-#include "wx/xpmdecod.h"
-
-#include "wx/mgl/private.h"
-
-#include <mgraph.hpp>
-
-static bitmap_t *MyMGL_createBitmap(int width, int height,
-                                    int bpp, pixel_format_t *pf)
-{
-    MGLMemoryDC mdc(width, height, bpp, pf);
-    return MGL_getBitmapFromDC(mdc.getDC(), 0, 0, width, height, TRUE);
-}
-
-//-----------------------------------------------------------------------------
-// MGL pixel formats:
-//-----------------------------------------------------------------------------
-
-static pixel_format_t gs_pixel_format_15 =
-    {0x1F,0x0A,3, 0x1F,0x05,3, 0x1F,0x00,3, 0x01,0x0F,7}; // 555 15bpp
-
-static pixel_format_t gs_pixel_format_16 =
-    {0x1F,0x0B,3, 0x3F,0x05,2, 0x1F,0x00,3, 0x00,0x00,0}; // 565 16bpp
-
-static pixel_format_t gs_pixel_format_24 =
-    {0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0, 0x00,0x00,0}; // RGB 24bpp
-
-static pixel_format_t gs_pixel_format_32 =
-    {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
-
-static pixel_format_t gs_pixel_format_wxImage =
-    {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
-
-//-----------------------------------------------------------------------------
-// wxBitmapRefData
-//-----------------------------------------------------------------------------
-
-class wxBitmapRefData: public wxGDIRefData
-{
-public:
-    wxBitmapRefData();
-    wxBitmapRefData(int width, int height, int bpp);
-    wxBitmapRefData(const wxBitmapRefData& data);
-    virtual ~wxBitmapRefData();
-
-    virtual bool IsOk() const { return m_bitmap != NULL; }
-
-    int             m_width;
-    int             m_height;
-    int             m_bpp;
-    wxPalette      *m_palette;
-    wxMask         *m_mask;
-    bitmap_t       *m_bitmap;
-
-private:
-    void DoCreateBitmap(int width, int height, int depth);
-};
-
-void wxBitmapRefData::DoCreateBitmap(int width, int height, int depth)
-{
-    m_width = width;
-    m_height = height;
-    m_bpp = depth;
-
-    pixel_format_t pf_dummy;
-    pixel_format_t *pf;
-    int mglDepth = depth;
-
-    switch ( depth )
-    {
-        case -1:
-            wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-
-            g_displayDC->getPixelFormat(pf_dummy);
-            mglDepth = g_displayDC->getBitsPerPixel();
-            pf = &pf_dummy;
-            break;
-        case 1:
-        case 8:
-            pf = NULL;
-            mglDepth = 8; // we emulate monochrome bitmaps using 8 bit ones
-            break;
-        case 15:
-            pf = &gs_pixel_format_15;
-            break;
-        case 16:
-            pf = &gs_pixel_format_16;
-            break;
-        case 24:
-            pf = &gs_pixel_format_24;
-            break;
-        case 32:
-            pf = &gs_pixel_format_32;
-            break;
-        default:
-            wxFAIL_MSG(wxT("invalid bitmap depth"));
-            m_bitmap = NULL;
-            return;
-    }
-
-    m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
-}
-
-wxBitmapRefData::wxBitmapRefData()
-{
-    m_width =
-    m_height =
-    m_bpp = 0;
-
-    m_palette = NULL;
-    m_mask = NULL;
-
-    m_bitmap = NULL;
-}
-
-wxBitmapRefData::wxBitmapRefData(int width, int height, int bpp)
-{
-    DoCreateBitmap(width, height, bpp);
-
-    m_palette = NULL;
-    m_mask = NULL;
-}
-
-wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
-{
-    DoCreateBitmap(data.m_width, data.m_height, data.m_bpp);
-
-    m_palette = NULL; // FIXME: should copy
-    m_mask = NULL; // FIXME: should copy
-}
-
-wxBitmapRefData::~wxBitmapRefData()
-{
-    if ( m_bitmap )
-        MGL_unloadBitmap(m_bitmap);
-    delete m_mask;
-    delete m_palette;
-}
-
-
-//-----------------------------------------------------------------------------
-// wxBitmap
-//-----------------------------------------------------------------------------
-
-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
-
-wxGDIRefData *wxBitmap::CreateGDIRefData() const
-{
-    return new wxBitmapRefData;
-}
-
-wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
-}
-
-bool wxBitmap::Create(int width, int height, int depth)
-{
-    UnRef();
-
-    wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
-
-    m_refData = new wxBitmapRefData(width, height, depth);
-
-    if ( depth == 1 )
-    {
-        // MGL does not support mono DCs, so we have to emulate them with
-        // 8bpp ones. We do that by using a special palette with color 0
-        // set to black and all other colors set to white.
-        SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
-    }
-
-    return IsOk();
-}
-
-wxBitmap::wxBitmap(const wxImage& image, int depth)
-{
-    long width, height;
-
-    wxCHECK_RET( image.IsOk(), wxT("invalid image") );
-
-    width = image.GetWidth();
-    height = image.GetHeight();
-
-    if ( !Create(width, height, depth) ) return;
-
-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
-                    width * 3, (void*)image.GetData(), NULL);
-    wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
-
-    MGLDevCtx *bdc = CreateTmpDC();
-
-    if ( GetDepth() <= 8 && image.HasPalette() )
-        SetPalette(image.GetPalette());
-
-    bdc->bitBlt(idc, 0, 0, width, height, 0, 0, MGL_REPLACE_MODE);
-    delete bdc;
-
-    if ( image.HasMask() )
-    {
-        wxImage mask_image = image.ConvertToMono(image.GetMaskRed(),
-                                                 image.GetMaskGreen(),
-                                                 image.GetMaskBlue());
-        mask_image.SetMask(false);
-        wxBitmap mask_bmp(mask_image, 1);
-        SetMask(new wxMask(mask_bmp));
-    }
-}
-
-wxImage wxBitmap::ConvertToImage() const
-{
-    wxCHECK_MSG( IsOk(), wxImage(), wxT("invalid bitmap") );
-
-    int width, height;
-    width = GetWidth();
-    height = GetHeight();
-
-    wxImage image(width, height);
-    wxASSERT_MSG( image.IsOk(), wxT("cannot create image") );
-
-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
-                    width * 3, (void*)image.GetData(), NULL);
-    wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
-
-    if ( M_BMPDATA->m_palette )
-        image.SetPalette(*(M_BMPDATA->m_palette));
-
-    if ( GetMask() )
-    {
-        // in consistency with other ports, we convert parts covered
-        // by the mask to <16,16,16> colour and set that colour to image's
-        // mask. We do that by OR-blitting the mask over image with
-        // bg colour set to black and fg colour to <16,16,16>
-
-        image.SetMaskColour(16, 16, 16);
-        image.SetMask(true);
-
-        wxDC tmpDC;
-        tmpDC.SetMGLDC(&idc, false);
-        tmpDC.SetBackground(wxBrush(wxColour(16,16,16), wxSOLID));
-        tmpDC.Clear();
-        tmpDC.DrawBitmap(*this, 0, 0, true);
-    }
-    else
-    {
-        image.SetMask(false);
-        idc.putBitmap(0, 0, M_BMPDATA->m_bitmap, MGL_REPLACE_MODE);
-    }
-
-    return image;
-}
-
-wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
-{
-    LoadFile(filename, type);
-}
-
-wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
-{
-    wxCHECK_RET( depth == 1, wxT("can only create mono bitmap from XBM data") );
-
-    if ( !Create(width, height, 1) ) return;
-    MGLDevCtx *bdc = CreateTmpDC();
-    wxCurrentDCSwitcher curDC(bdc);
-    bdc->setColor(1);
-    bdc->setBackColor(0);
-    bdc->clearDevice();
-    bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits);
-    delete bdc;
-}
-
-int wxBitmap::GetHeight() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_height;
-}
-
-int wxBitmap::GetWidth() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_width;
-}
-
-int wxBitmap::GetDepth() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_bpp;
-}
-
-wxMask *wxBitmap::GetMask() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_mask;
-}
-
-void wxBitmap::SetMask(wxMask *mask)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
-
-    AllocExclusive();
-    delete M_BMPDATA->m_mask;
-    M_BMPDATA->m_mask = mask;
-}
-
-bool wxBitmap::CopyFromIcon(const wxIcon& icon)
-{
-    wxBitmap *bmp = (wxBitmap*)(&icon);
-    *this = *bmp;
-    return true;
-}
-
-wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
-{
-    wxCHECK_MSG( IsOk() &&
-                 (rect.x >= 0) && (rect.y >= 0) &&
-                 (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
-                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
-
-    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
-    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );
-
-    if ( GetPalette() )
-        ret.SetPalette(*GetPalette());
-
-    MGLDevCtx *tdc = ret.CreateTmpDC();
-    tdc->putBitmapSection(rect.x, rect.y,
-                          rect.x + rect.width, rect.y + rect.height,
-                          0, 0, M_BMPDATA->m_bitmap, MGL_REPLACE_MODE);
-    delete tdc;
-
-    if ( GetMask() )
-    {
-        wxBitmap submask = GetMask()->GetBitmap().GetSubBitmap(rect);
-        ret.SetMask(new wxMask(submask));
-    }
-
-    return ret;
-}
-
-void wxBitmap::SetMonoPalette(const wxColour& fg, const wxColour& bg)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
-
-    AllocExclusive();
-    palette_t *mono = M_BMPDATA->m_bitmap->pal;
-
-    wxCHECK_RET( M_BMPDATA->m_bpp == 1, wxT("bitmap is not 1bpp") );
-    wxCHECK_RET( mono != NULL, wxT("bitmap w/o palette") );
-
-    mono[0].red = bg.Red();
-    mono[0].green = bg.Green();
-    mono[0].blue = bg.Blue();
-    mono[0].alpha = 0;
-    for (size_t i = 1; i < 256; i++)
-    {
-        mono[i].red = fg.Red();
-        mono[i].green = fg.Green();
-        mono[i].blue = fg.Blue();
-        mono[i].alpha = 0;
-    }
-}
-
-MGLDevCtx *wxBitmap::CreateTmpDC() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
-
-    MGLDevCtx *tdc = new MGLMemoryDC(GetWidth(), GetHeight(),
-                                     M_BMPDATA->m_bitmap->bitsPerPixel,
-                                     M_BMPDATA->m_bitmap->pf,
-                                     M_BMPDATA->m_bitmap->bytesPerLine,
-                                     M_BMPDATA->m_bitmap->surface,
-                                     NULL);
-    wxCHECK_MSG( tdc->isValid(), NULL, wxT("cannot create temporary MGLDC") );
-
-    if ( M_BMPDATA->m_bitmap->pal != NULL )
-    {
-        int cnt;
-
-        switch (M_BMPDATA->m_bitmap->bitsPerPixel)
-        {
-            case  2: cnt = 2;   break;
-            case  4: cnt = 16;  break;
-            case  8: cnt = 256; break;
-            default:
-                cnt = 0;
-                wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
-                break;
-        }
-
-        tdc->setPalette(M_BMPDATA->m_bitmap->pal, cnt, 0);
-        tdc->realizePalette(cnt, 0, FALSE);
-    }
-
-    return tdc;
-}
-
-bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
-{
-    AllocExclusive();
-
-    if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
-         type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )
-    {
-        // prevent accidental loading of bitmap from $MGL_ROOT:
-        if ( !wxFileExists(name) )
-        {
-            wxLogError(_("File %s does not exist."), name.c_str());
-            return false;
-        }
-    }
-
-    wxBitmapHandler *handler = FindHandler(type);
-
-    if ( handler == NULL )
-    {
-        wxImage image;
-        if ( !image.LoadFile(name, type) || !image.IsOk() )
-        {
-            wxLogError("no bitmap handler for type %d defined.", type);
-            return false;
-        }
-        else
-        {
-            *this = wxBitmap(image);
-            return true;
-        }
-    }
-
-    return handler->LoadFile(this, name, type, -1, -1);
-}
-
-bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPalette *palette) const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
-
-    wxBitmapHandler *handler = FindHandler(type);
-
-    if ( handler == NULL )
-    {
-        wxImage image = ConvertToImage();
-        if ( palette )
-            image.SetPalette(*palette);
-
-        if ( image.IsOk() )
-            return image.SaveFile(filename, type);
-        else
-        {
-            wxLogError("no bitmap handler for type %d defined.", type);
-            return false;
-        }
-    }
-
-    return handler->SaveFile(this, filename, type, palette);
-}
-
-wxPalette *wxBitmap::GetPalette() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_palette;
-}
-
-void wxBitmap::SetPalette(const wxPalette& palette)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
-    wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
-
-    AllocExclusive();
-    wxDELETE(M_BMPDATA->m_palette);
-
-    if ( !palette.IsOk() ) return;
-
-    M_BMPDATA->m_palette = new wxPalette(palette);
-
-    int cnt = palette.GetColoursCount();
-    palette_t *pal = palette.GetMGLpalette_t();
-    memcpy(M_BMPDATA->m_bitmap->pal, pal, cnt * sizeof(palette_t));
-}
-
-void wxBitmap::SetHeight(int height)
-{
-    AllocExclusive();
-
-    M_BMPDATA->m_height = height;
-}
-
-void wxBitmap::SetWidth(int width)
-{
-    AllocExclusive();
-
-    M_BMPDATA->m_width = width;
-}
-
-void wxBitmap::SetDepth(int depth)
-{
-    AllocExclusive();
-
-    M_BMPDATA->m_bpp = depth;
-}
-
-bitmap_t *wxBitmap::GetMGLbitmap_t() const
-{
-    return M_BMPDATA->m_bitmap;
-}
-
-// Convert wxColour into it's quantized value in lower-precision
-// pixel format (needed for masking by colour).
-wxColour wxBitmap::QuantizeColour(const wxColour& clr) const
-{
-    pixel_format_t *pf = GetMGLbitmap_t()->pf;
-
-    if ( pf->redAdjust == 0 && pf->greenAdjust == 0 && pf->blueAdjust == 0 )
-        return clr;
-    else
-        return wxColour((unsigned char)((clr.Red() >> pf->redAdjust) << pf->redAdjust),
-                        (unsigned char)((clr.Green() >> pf->greenAdjust) << pf->greenAdjust),
-                        (unsigned char)((clr.Blue() >> pf->blueAdjust) << pf->blueAdjust));
-}
-
-
-//-----------------------------------------------------------------------------
-// wxBitmap I/O handlers
-//-----------------------------------------------------------------------------
-
-class wxMGLBitmapHandler: public wxBitmapHandler
-{
-public:
-    wxMGLBitmapHandler(wxBitmapType type,
-                       const wxString& extension, const wxString& name);
-
-    virtual bool Create(wxBitmap *WXUNUSED(bitmap),
-                        const void* WXUNUSED(data),
-                        long WXUNUSED(flags),
-                        int WXUNUSED(width),
-                        int WXUNUSED(height),
-                        int WXUNUSED(depth) = 1)
-        { return false; }
-
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-                          int desiredWidth, int desiredHeight);
-    virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
-                          int type, const wxPalette *palette = NULL);
-};
-
-wxMGLBitmapHandler::wxMGLBitmapHandler(wxBitmapType type,
-                                       const wxString& extension,
-                                       const wxString& name)
-   : wxBitmapHandler()
-{
-    SetType(type);
-    SetName(name);
-    SetExtension(extension);
-}
-
-bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
-                                  long flags,
-                                  int WXUNUSED(desiredWidth),
-                                  int WXUNUSED(desiredHeight))
-{
-    int width, height, bpp;
-    pixel_format_t pf;
-    wxString fullname;
-    wxMemoryDC dc;
-
-    switch (flags)
-    {
-        case wxBITMAP_TYPE_BMP_RESOURCE:
-        case wxBITMAP_TYPE_JPEG_RESOURCE:
-        case wxBITMAP_TYPE_PNG_RESOURCE:
-        case wxBITMAP_TYPE_PCX_RESOURCE:
-            fullname = name + wxT(".bmp");
-            break;
-        default:
-            fullname= name;
-            break;
-    }
-
-    switch (flags)
-    {
-        case wxBITMAP_TYPE_BMP:
-        case wxBITMAP_TYPE_BMP_RESOURCE:
-            if ( !MGL_getBitmapSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
-                return false;
-            bitmap->Create(width, height, -1);
-            if ( !bitmap->IsOk() ) return false;
-            dc.SelectObject(*bitmap);
-            if ( !dc.GetMGLDC()->loadBitmapIntoDC(fullname.mb_str(), 0, 0, TRUE) )
-                return false;
-            break;
-
-        case wxBITMAP_TYPE_JPEG:
-        case wxBITMAP_TYPE_JPEG_RESOURCE:
-            if ( !MGL_getJPEGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
-                return false;
-            bitmap->Create(width, height, -1);
-            if ( !bitmap->IsOk() ) return false;
-            dc.SelectObject(*bitmap);
-            if ( !dc.GetMGLDC()->loadJPEGIntoDC(fullname.mb_str(), 0, 0, TRUE) )
-                return false;
-            break;
-
-        case wxBITMAP_TYPE_PNG:
-        case wxBITMAP_TYPE_PNG_RESOURCE:
-            if ( !MGL_getPNGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
-                return false;
-            bitmap->Create(width, height, -1);
-            if ( !bitmap->IsOk() ) return false;
-            dc.SelectObject(*bitmap);
-            if ( !dc.GetMGLDC()->loadPNGIntoDC(fullname.mb_str(), 0, 0, TRUE) )
-                return false;
-            break;
-
-        case wxBITMAP_TYPE_PCX:
-        case wxBITMAP_TYPE_PCX_RESOURCE:
-            if ( !MGL_getPCXSize(fullname.mb_str(), &width, &height, &bpp) )
-                return false;
-            bitmap->Create(width, height, -1);
-            if ( !bitmap->IsOk() ) return false;
-            dc.SelectObject(*bitmap);
-            if ( !dc.GetMGLDC()->loadPCXIntoDC(fullname.mb_str(), 0, 0, TRUE) )
-                return false;
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("Unsupported image format."));
-            break;
-    }
-
-    return true;
-}
-
-bool wxMGLBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
-                                  int type, const wxPalette * WXUNUSED(palette))
-{
-    wxMemoryDC mem;
-    MGLDevCtx *tdc;
-    int w = bitmap->GetWidth(),
-        h = bitmap->GetHeight();
-
-    mem.SelectObjectAsSource(*bitmap);
-    tdc = mem.GetMGLDC();
-
-    switch (type)
-    {
-        case wxBITMAP_TYPE_BMP:
-            return (bool)tdc->saveBitmapFromDC(name.mb_str(), 0, 0, w, h);
-        case wxBITMAP_TYPE_JPEG:
-            return (bool)tdc->saveJPEGFromDC(name.mb_str(), 0, 0, w, h, 75);
-        case wxBITMAP_TYPE_PNG:
-            return (bool)tdc->savePNGFromDC(name.mb_str(), 0, 0, w, h);
-        case wxBITMAP_TYPE_PCX:
-            return (bool)tdc->savePCXFromDC(name.mb_str(), 0, 0, w, h);
-    }
-
-    return false;
-}
-
-
-
-// let's handle PNGs in special way because they have alpha channel
-// which we can access via bitmap_t most easily
-class wxPNGBitmapHandler: public wxMGLBitmapHandler
-{
-public:
-    wxPNGBitmapHandler(wxBitmapType type,
-                       const wxString& extension, const wxString& name)
-        : wxMGLBitmapHandler(type, extension, name) {}
-
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-                          int desiredWidth, int desiredHeight);
-};
-
-bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
-                                  long flags,
-                                  int desiredWidth, int desiredHeight)
-{
-    int width, height, bpp;
-    pixel_format_t pf;
-    wxString fullname;
-
-    if ( flags == wxBITMAP_TYPE_PNG_RESOURCE )
-        fullname = name + wxT(".png");
-    else
-        fullname = name;
-
-    if ( !MGL_getPNGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
-        return false;
-
-    if ( bpp != 32 )
-    {
-        // We can load ordinary PNGs faster with 'normal' MGL handler.
-        // Only RGBA PNGs need to be processed in special way because
-        // we have to convert alpha channel to mask
-        return wxMGLBitmapHandler::LoadFile(bitmap, name, flags,
-                                            desiredWidth, desiredHeight);
-    }
-
-    bitmap_t *bmp = MGL_loadPNG(fullname.mb_str(), TRUE);
-
-    if ( bmp == NULL ) return false;
-
-    bitmap->Create(bmp->width, bmp->height, -1);
-    if ( !bitmap->IsOk() ) return false;
-
-    // convert bmp to display's depth and write it to *bitmap:
-    wxMemoryDC dc;
-    dc.SelectObject(*bitmap);
-    dc.GetMGLDC()->putBitmap(0, 0, bmp, MGL_REPLACE_MODE);
-    dc.SelectObject(wxNullBitmap);
-
-    // create mask, if bmp contains alpha channel (ARGB format):
-    if ( bmp->bitsPerPixel == 32 )
-    {
-        int x, y;
-        wxUint32 *s = (wxUint32*)bmp->surface;
-        for (y = 0; y < bmp->height; y++)
-        {
-            s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
-            for (x = 0; x < bmp->width; x++, s ++)
-            {
-                if ( ((((*s) >> bmp->pf->alphaPos) & bmp->pf->alphaMask)
-                        << bmp->pf->alphaAdjust) < 128 )
-                    *s = 0;
-                else
-                    *s = 0x00FFFFFF; // white
-            }
-        }
-        wxBitmap mask(bmp->width, bmp->height, 1);
-        dc.SelectObject(mask);
-        dc.GetMGLDC()->putBitmap(0, 0, bmp, MGL_REPLACE_MODE);
-        dc.SelectObject(wxNullBitmap);
-        bitmap->SetMask(new wxMask(mask));
-    }
-
-    MGL_unloadBitmap(bmp);
-
-    return true;
-}
-
-
-
-
-class wxICOBitmapHandler: public wxBitmapHandler
-{
-    public:
-        wxICOBitmapHandler(wxBitmapType type,
-                           const wxString& extension, const wxString& name);
-
-        virtual bool Create(wxBitmap *WXUNUSED(bitmap),
-                            const void* WXUNUSED(data),
-                            long WXUNUSED(flags),
-                            int WXUNUSED(width),
-                            int WXUNUSED(height),
-                            int WXUNUSED(depth) = 1)
-            { return false; }
-
-        virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-                              int desiredWidth, int desiredHeight);
-        virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
-                              int type, const wxPalette *palette = NULL);
-};
-
-wxICOBitmapHandler::wxICOBitmapHandler(wxBitmapType type,
-                                       const wxString& extension,
-                                       const wxString& name)
-   : wxBitmapHandler()
-{
-    SetType(type);
-    SetName(name);
-    SetExtension(extension);
-}
-
-bool wxICOBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
-                                  long flags,
-                                  int WXUNUSED(desiredWidth),
-                                  int WXUNUSED(desiredHeight))
-{
-    icon_t *icon = NULL;
-    MGLDevCtx *dc;
-
-    if ( flags == wxBITMAP_TYPE_ICO_RESOURCE )
-        icon = MGL_loadIcon(wxString(name + wxT(".ico")).mb_str(), TRUE);
-    else
-        icon = MGL_loadIcon(name.mb_str(), TRUE);
-
-    if ( icon == NULL ) return false;
-
-    bitmap->Create(icon->xorMask.width, icon->xorMask.height);
-
-    wxMemoryDC mem;
-    mem.SelectObject(*bitmap);
-    dc = mem.GetMGLDC();
-    dc->putBitmap(0, 0, &(icon->xorMask), MGL_REPLACE_MODE);
-    mem.SelectObject(wxNullBitmap);
-
-    wxBitmap mask(icon->xorMask.width, icon->xorMask.height, 1);
-    mem.SelectObject(mask);
-    dc = mem.GetMGLDC();
-
-    wxCurrentDCSwitcher curDC(dc);
-    dc->setColor(0);
-    dc->setBackColor(1);
-    dc->clearDevice();
-    dc->putMonoImage(0, 0, icon->xorMask.width, icon->byteWidth,
-                           icon->xorMask.height, (void*)icon->andMask);
-
-    bitmap->SetMask(new wxMask(mask));
-
-    MGL_unloadIcon(icon);
-
-    return true;
-}
-
-bool wxICOBitmapHandler::SaveFile(const wxBitmap *WXUNUSED(bitmap),
-                                  const wxString& WXUNUSED(name),
-                                  int WXUNUSED(type),
-                                  const wxPalette * WXUNUSED(palette))
-{
-    return false;
-}
-
-
-
-
-/*static*/ void wxBitmap::InitStandardHandlers()
-{
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_BMP, wxT("bmp"), wxT("Windows bitmap")));
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_BMP_RESOURCE, wxEmptyString, wxT("Windows bitmap resource")));
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_JPEG, wxT("jpg"), wxT("JPEG image")));
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_JPEG_RESOURCE, wxEmptyString, wxT("JPEG resource")));
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_PCX, wxT("pcx"), wxT("PCX image")));
-    AddHandler(new wxMGLBitmapHandler(wxBITMAP_TYPE_PCX_RESOURCE, wxEmptyString, wxT("PCX resource")));
-
-    AddHandler(new wxPNGBitmapHandler(wxBITMAP_TYPE_PNG, wxT("png"), wxT("PNG image")));
-    AddHandler(new wxPNGBitmapHandler(wxBITMAP_TYPE_PNG_RESOURCE, wxEmptyString, wxT("PNG resource")));
-
-    AddHandler(new wxICOBitmapHandler(wxBITMAP_TYPE_ICO, wxT("ico"), wxT("Icon resource")));
-    AddHandler(new wxICOBitmapHandler(wxBITMAP_TYPE_ICO_RESOURCE, wxEmptyString, wxT("Icon resource")));
-}
diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
deleted file mode 100644
index a00c6ec8b6..0000000000
--- a/src/mgl/brush.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/brush.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/brush.h"
-#include "wx/mgl/private.h"
-#include "wx/dcmemory.h"
-
-
-// ---------------------------------------------------------------------------
-// helper functions
-// ---------------------------------------------------------------------------
-
-// This function converts wxBitmap into pixpattern24_t representation
-// (used by wxBrush and wxPen)
-
-void wxBitmapToPixPattern(const wxBitmap& bitmap,
-                          pixpattern24_t *pix, pattern_t *mask)
-{
-    wxMemoryDC mem;
-    MGLDevCtx *dc;
-    int x, y;
-
-    if ( pix != NULL )
-    {
-        mem.SelectObjectAsSource(bitmap);
-        dc = mem.GetMGLDC();
-        wxCurrentDCSwitcher curDC(dc);
-        dc->beginPixel();
-        for (y = 0; y < 8; y++)
-            for (x = 0; x < 8; x++)
-                dc->unpackColorFast(dc->getPixelFast(x, y),
-                                    pix->p[y][x][2],
-                                    pix->p[y][x][1],
-                                    pix->p[y][x][0]);
-        dc->endPixel();
-    }
-
-    if ( mask && bitmap.GetMask() )
-    {
-        mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap());
-        dc = mem.GetMGLDC();
-        wxCurrentDCSwitcher curDC(dc);
-        dc->beginPixel();
-        for (y = 0; y < 8; y++)
-        {
-            mask->p[y] = 0;
-            for (x = 0; x < 8; x++)
-                if ( dc->getPixelFast(x, y) != 0 )
-                    mask->p[y] = (uchar)(mask->p[y] | (1 << (7 - x)));
-        }
-        dc->endPixel();
-    }
-}
-
-
-//-----------------------------------------------------------------------------
-// wxBrush
-//-----------------------------------------------------------------------------
-
-class wxBrushRefData : public wxGDIRefData
-{
-public:
-    wxBrushRefData();
-    wxBrushRefData(const wxBrushRefData& data);
-
-    virtual bool IsOk() const { return m_colour.IsOk(); }
-
-    bool operator==(const wxBrushRefData& data) const
-    {
-        return (m_style == data.m_style &&
-                m_stipple.IsSameAs(data.m_stipple) &&
-                m_colour == data.m_colour);
-    }
-
-    wxBrushStyle   m_style;
-    wxColour       m_colour;
-    wxBitmap       m_stipple;
-    pixpattern24_t m_pixPattern;
-    pattern_t      m_maskPattern;
-};
-
-wxBrushRefData::wxBrushRefData()
-{
-    m_style = 0;
-
-    int x, y, c;
-    for (y = 0; y < 8; y++)
-        for (x = 0; x < 8; x++)
-            for (c = 0; c < 3; c++)
-                m_pixPattern.p[y][x][c] = 0;
-    for (y = 0; y < 8; y++)
-        m_maskPattern.p[y] = 0;
-}
-
-wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
-{
-    m_style = data.m_style;
-    m_stipple = data.m_stipple;
-    m_colour = data.m_colour;
-
-    int x, y, c;
-    for (y = 0; y < 8; y++)
-        for (x = 0; x < 8; x++)
-            for (c = 0; c < 3; c++)
-                m_pixPattern.p[y][x][c] = data.m_pixPattern.p[y][x][c];
-    for (y = 0; y < 8; y++)
-        m_maskPattern.p[y] = data.m_maskPattern.p[y];
-}
-
-//-----------------------------------------------------------------------------
-
-#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-
-wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
-{
-    m_refData = new wxBrushRefData();
-    M_BRUSHDATA->m_style = style;
-    M_BRUSHDATA->m_colour = colour;
-}
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-wxBrush::wxBrush(const wxColour& col, int style)
-{
-    m_refData = new wxBrushRefData;
-    M_BRUSHDATA->m_style = (wxBrushStyle)style;
-    M_BRUSHDATA->m_colour = colour;
-}
-#endif
-
-wxBrush::wxBrush(const wxBitmap &stippleBitmap)
-{
-    wxCHECK_RET( stippleBitmap.IsOk(), wxT("invalid bitmap") );
-    wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,
-                  wxT("stipple bitmap must be 8x8") );
-
-    m_refData = new wxBrushRefData();
-    M_BRUSHDATA->m_colour = *wxBLACK;
-
-    M_BRUSHDATA->m_stipple = stippleBitmap;
-    wxBitmapToPixPattern(stippleBitmap, &(M_BRUSHDATA->m_pixPattern),
-                                        &(M_BRUSHDATA->m_maskPattern));
-
-    if (M_BRUSHDATA->m_stipple.GetMask())
-        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-    else
-        M_BRUSHDATA->m_style = wxSTIPPLE;
-}
-
-bool wxBrush::operator == (const wxBrush& brush) const
-{
-    if (m_refData == brush.m_refData) return true;
-
-    if (!m_refData || !brush.m_refData) return false;
-
-    return *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData;
-}
-
-bool wxBrush::operator != (const wxBrush& brush) const
-{
-    return m_refData != brush.m_refData;
-}
-
-wxBrushStyle wxBrush::GetStyle() const
-{
-    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
-
-    return M_BRUSHDATA->m_style;
-}
-
-wxColour wxBrush::GetColour() const
-{
-    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
-
-    return M_BRUSHDATA->m_colour;
-}
-
-wxBitmap *wxBrush::GetStipple() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
-
-    return &M_BRUSHDATA->m_stipple;
-}
-
-void* wxBrush::GetMaskPattern() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
-
-    return (void*)&(M_BRUSHDATA->m_maskPattern);
-}
-
-void* wxBrush::GetPixPattern() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
-
-    return (void*)&(M_BRUSHDATA->m_pixPattern);
-}
-
-void wxBrush::SetColour(const wxColour& col)
-{
-    AllocExclusive();
-    M_BRUSHDATA->m_colour = col;
-}
-
-void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
-{
-    AllocExclusive();
-    M_BRUSHDATA->m_colour.Set(r, g, b);
-}
-
-void wxBrush::SetStyle( wxBrushStyle style )
-{
-    AllocExclusive();
-    M_BRUSHDATA->m_style = style;
-}
-
-void wxBrush::SetStipple(const wxBitmap& stipple)
-{
-    AllocExclusive();
-
-    wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );
-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
-                  wxT("stipple bitmap must be 8x8") );
-
-    M_BRUSHDATA->m_stipple = stipple;
-    wxBitmapToPixPattern(stipple, &(M_BRUSHDATA->m_pixPattern),
-                                  &(M_BRUSHDATA->m_maskPattern));
-
-    if (M_BRUSHDATA->m_stipple.GetMask())
-        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-    else
-        M_BRUSHDATA->m_style = wxSTIPPLE;
-}
-
-wxGDIRefData *wxBrush::CreateGDIRefData() const
-{
-    return new wxBrushRefData;
-}
-
-wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxBrushRefData(*(wxBrushRefData *)data);
-}
diff --git a/src/mgl/clipbrd.cpp b/src/mgl/clipbrd.cpp
deleted file mode 100644
index 81f12a67e9..0000000000
--- a/src/mgl/clipbrd.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/clipbrd.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/clipbrd.h"
-
-#if wxUSE_CLIPBOARD
-
-// FIXME_MGL
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
-
-#endif
-  // wxUSE_CLIPBOARD
-
diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
deleted file mode 100644
index 8832eff0e7..0000000000
--- a/src/mgl/cursor.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/cursor.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/cursor.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/hashmap.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/mgl/private.h"
-
-
-//-----------------------------------------------------------------------------
-// wxCursor
-//-----------------------------------------------------------------------------
-
-class wxCursorRefData: public wxObjectRefData
-{
-  public:
-
-    wxCursorRefData();
-    virtual ~wxCursorRefData();
-
-    MGLCursor *m_cursor;
-};
-
-wxCursorRefData::wxCursorRefData()
-{
-    m_cursor = NULL;
-}
-
-wxCursorRefData::~wxCursorRefData()
-{
-    delete m_cursor;
-}
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-
-//-----------------------------------------------------------------------------
-
-WX_DECLARE_HASH_MAP(int, wxCursor, wxIntegerHash, wxIntegerEqual, wxCursorsHash);
-
-static wxCursorsHash *gs_cursorsHash = NULL;
-
-IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
-
-wxCursor::wxCursor()
-{
-}
-
-void wxCursor::InitFromStock(wxStockCursor cursorId)
-{
-    if ( !gs_cursorsHash )
-        gs_cursorsHash = new wxCursorsHash;
-
-    if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() )
-    {
-        wxLogTrace(wxT("mglcursor"), wxT("cursor id %i fetched from cache"), cursorId);
-        *this = (*gs_cursorsHash)[cursorId];
-        return;
-    }
-
-    const char *cursorname = NULL;
-    m_refData = new wxCursorRefData();
-
-    switch (cursorId)
-    {
-        case wxCURSOR_ARROW:           cursorname = "arrow.cur"; break;
-        case wxCURSOR_RIGHT_ARROW:     cursorname = "rightarr.cur"; break;
-        case wxCURSOR_BULLSEYE:        cursorname = "bullseye.cur"; break;
-        case wxCURSOR_CHAR:            cursorname = "char.cur"; break;
-        case wxCURSOR_CROSS:           cursorname = "cross.cur"; break;
-        case wxCURSOR_HAND:            cursorname = "hand.cur"; break;
-        case wxCURSOR_IBEAM:           cursorname = "ibeam.cur"; break;
-        case wxCURSOR_LEFT_BUTTON:     cursorname = "leftbtn.cur"; break;
-        case wxCURSOR_MAGNIFIER:       cursorname = "magnif1.cur"; break;
-        case wxCURSOR_MIDDLE_BUTTON:   cursorname = "midbtn.cur"; break;
-        case wxCURSOR_NO_ENTRY:        cursorname = "noentry.cur"; break;
-        case wxCURSOR_PAINT_BRUSH:     cursorname = "pbrush.cur"; break;
-        case wxCURSOR_PENCIL:          cursorname = "pencil.cur"; break;
-        case wxCURSOR_POINT_LEFT:      cursorname = "pntleft.cur"; break;
-        case wxCURSOR_POINT_RIGHT:     cursorname = "pntright.cur"; break;
-        case wxCURSOR_QUESTION_ARROW:  cursorname = "query.cur"; break;
-        case wxCURSOR_RIGHT_BUTTON:    cursorname = "rightbtn.cur"; break;
-        case wxCURSOR_SIZENESW:        cursorname = "sizenesw.cur"; break;
-        case wxCURSOR_SIZENS:          cursorname = "sizens.cur"; break;
-        case wxCURSOR_SIZENWSE:        cursorname = "sizenwse.cur"; break;
-        case wxCURSOR_SIZEWE:          cursorname = "sizewe.cur"; break;
-        case wxCURSOR_SIZING:          cursorname = "size.cur"; break;
-        case wxCURSOR_SPRAYCAN:        cursorname = "spraycan.cur"; break;
-        case wxCURSOR_WAIT:            cursorname = "wait.cur"; break;
-        case wxCURSOR_WATCH:           cursorname = "clock.cur"; break;
-        case wxCURSOR_BLANK:           cursorname = "blank.cur"; break;
-
-        case wxCURSOR_NONE:
-            *this = wxNullCursor;
-            return;
-
-        default:
-            wxFAIL_MSG(wxT("unsupported cursor type"));
-            break;
-    }
-
-    M_CURSORDATA->m_cursor = new MGLCursor(cursorname);
-
-    // if we cannot load arrow cursor, use MGL's default arrow cursor:
-    if ( !M_CURSORDATA->m_cursor->valid() && cursorId == wxCURSOR_ARROW )
-    {
-        delete M_CURSORDATA->m_cursor;
-        M_CURSORDATA->m_cursor = new MGLCursor(MGL_DEF_CURSOR);
-    }
-
-    if ( !M_CURSORDATA->m_cursor->valid() )
-    {
-        wxLogError(_("Couldn't create cursor."));
-        UnRef();
-    }
-    else
-    {
-        (*gs_cursorsHash)[cursorId] = *this;
-        wxLogTrace(wxT("mglcursor"), wxT("cursor id %i added to cache (%s)"),
-                   cursorId, cursorname);
-    }
-}
-
-wxCursor::wxCursor(const wxString& cursor_file,
-                   wxBitmapType type,
-                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
-{
-    if ( type == wxBITMAP_TYPE_CUR || type == wxBITMAP_TYPE_CUR_RESOURCE )
-    {
-        m_refData = new wxCursorRefData();
-        M_CURSORDATA->m_cursor = new MGLCursor(cursor_file.mb_str());
-        if ( !M_CURSORDATA->m_cursor->valid() )
-        {
-            wxLogError(_("Couldn't create cursor."));
-            UnRef();
-        }
-    }
-    else
-    {
-        wxLogError(wxT("Cannot load cursor resource of this type."));
-    }
-}
-
-wxCursor::~wxCursor()
-{
-    // wxObject unrefs data
-}
-
-MGLCursor *wxCursor::GetMGLCursor() const
-{
-    return M_CURSORDATA->m_cursor;
-}
-
-
-
-// ----------------------------------------------------------------------------
-// Global cursor setting
-// ----------------------------------------------------------------------------
-
-static wxCursor  gs_globalCursor = wxNullCursor;
-
-void wxSetCursor(const wxCursor& cursor)
-{
-    if ( cursor.IsOk() )
-    {
-        if ( g_winMng )
-            MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor());
-        gs_globalCursor = cursor;
-    }
-    else
-    {
-        if ( g_winMng )
-            MGL_wmSetGlobalCursor(g_winMng, NULL);
-        gs_globalCursor = wxNullCursor;
-    }
-}
-
-
-
-//-----------------------------------------------------------------------------
-// busy cursor routines
-//-----------------------------------------------------------------------------
-
-static wxCursor  gs_savedCursor = wxNullCursor;
-static int       gs_busyCount = 0;
-
-const wxCursor &wxBusyCursor::GetStoredCursor()
-{
-    return gs_savedCursor;
-}
-
-const wxCursor wxBusyCursor::GetBusyCursor()
-{
-    return gs_globalCursor;
-}
-
-void wxEndBusyCursor()
-{
-    if ( --gs_busyCount > 0 ) return;
-
-    wxSetCursor(gs_savedCursor);
-    gs_savedCursor = wxNullCursor;
-}
-
-void wxBeginBusyCursor(const wxCursor *cursor)
-{
-    if ( gs_busyCount++ > 0 ) return;
-
-    wxASSERT_MSG( !gs_savedCursor.IsOk(),
-                  wxT("forgot to call wxEndBusyCursor, will leak memory") );
-
-    gs_savedCursor = gs_globalCursor;
-    if ( cursor->IsOk() )
-        wxSetCursor(*cursor);
-    else
-        wxSetCursor(wxCursor(wxCURSOR_WAIT));
-}
-
-bool wxIsBusy()
-{
-    return (gs_busyCount > 0);
-}
-
-
-
-//-----------------------------------------------------------------------------
-// module - clean up code
-//-----------------------------------------------------------------------------
-
-class wxCursorModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-
-    virtual void OnExit()
-    {
-        wxDELETE(gs_cursorsHash);
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxCursorModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxCursorModule, wxModule)
diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
deleted file mode 100644
index ef34e4118d..0000000000
--- a/src/mgl/data.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/data.cpp
-// Purpose:     wxMGL-specific global data
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/cursor.h"
-#endif
-
-/* Current cursor, in order to hang on to
- * cursor handle when setting the cursor globally */
-wxCursor g_globalCursor;
-
-/* Don't allow event propagation during drag */
-bool g_blockEventsOnDrag = false;
-
-/* Don't allow mouse event propagation during scroll */
-bool g_blockEventsOnScroll = false;
-
-/* Don't allow window closing if there are open dialogs */
-int g_openDialogs = 0;
-
-/* true when the message queue is empty. this gets set to
-   false by all event callbacks before anything else is done */
-bool g_isIdle = false;
diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
deleted file mode 100644
index 40766b5af5..0000000000
--- a/src/mgl/dc.cpp
+++ /dev/null
@@ -1,1483 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/dc.cpp
-// Purpose:     wxDC class
-// Author:      Vaclav Slavik
-// Created:     2001/03/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/fontutil.h"
-#include "wx/encinfo.h"
-#include "wx/fontmap.h"
-#include "wx/mgl/private.h"
-
-#include <string.h>
-#include <mgraph.hpp>
-
-
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-const double RAD2DEG        = 180.0 / M_PI;
-
-
-//-----------------------------------------------------------------------------
-// pens data:
-//-----------------------------------------------------------------------------
-
-const ushort STIPPLE_wxDOT        = 0x5555/* - - - - - - - -*/;
-const ushort STIPPLE_wxLONG_DASH  = 0xF0F0/*    ----    ----*/;
-const ushort STIPPLE_wxSHORT_DASH = 0xCCCC/*--  --  --  --  */;
-const ushort STIPPLE_wxDOT_DASH   = 0x3939/*  ---  -  ---  -*/;
-const ushort STIPPLE_wxSOLID      = 0xFFFF/*----------------*/;
-
-#define PATTERN_ROW(b7,b6,b5,b4,b3,b2,b1,b0) \
-            ((b7 << 7) | (b6 << 6) | (b5 << 5) | (b4 << 4) | \
-             (b3 << 3) | (b2 << 2) | (b1 << 1) | b0)
-
-static pattern_t PATTERN_wxFDIAGONAL_HATCH = {{
-       PATTERN_ROW(1,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,1,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,1,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,1,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,1,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,1,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,1),
-       }};
-
-static pattern_t PATTERN_wxCROSSDIAG_HATCH = {{
-       PATTERN_ROW(1,0,0,0,0,0,0,1),
-       PATTERN_ROW(0,1,0,0,0,0,1,0),
-       PATTERN_ROW(0,0,1,0,0,1,0,0),
-       PATTERN_ROW(0,0,0,1,1,0,0,0),
-       PATTERN_ROW(0,0,0,1,1,0,0,0),
-       PATTERN_ROW(0,0,1,0,0,1,0,0),
-       PATTERN_ROW(0,1,0,0,0,0,1,0),
-       PATTERN_ROW(1,0,0,0,0,0,0,1),
-       }};
-
-static pattern_t PATTERN_wxBDIAGONAL_HATCH = {{
-       PATTERN_ROW(0,0,0,0,0,0,0,1),
-       PATTERN_ROW(0,0,0,0,0,0,1,0),
-       PATTERN_ROW(0,0,0,0,0,1,0,0),
-       PATTERN_ROW(0,0,0,0,1,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,1,0,0,0,0,0),
-       PATTERN_ROW(0,1,0,0,0,0,0,0),
-       PATTERN_ROW(1,0,0,0,0,0,0,0),
-       }};
-
-static pattern_t PATTERN_wxCROSS_HATCH = {{
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(1,1,1,1,1,1,1,1),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       }};
-
-static pattern_t PATTERN_wxHORIZONTAL_HATCH = {{
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(1,1,1,1,1,1,1,1),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       PATTERN_ROW(0,0,0,0,0,0,0,0),
-       }};
-
-static pattern_t PATTERN_wxVERTICAL_HATCH = {{
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       PATTERN_ROW(0,0,0,1,0,0,0,0),
-       }};
-
-#undef PATTERN_ROW
-
-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
-
-// Default constructor
-wxDC::wxDC()
-{
-    m_isMemDC = false;
-    m_MGLDC = NULL;
-    m_OwnsMGLDC = false;
-    m_ok = false; // must call SetMGLDevCtx() before using it
-
-    m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
-                    (double)wxGetDisplaySizeMM().GetWidth();
-    m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
-                    (double)wxGetDisplaySizeMM().GetHeight();
-
-    m_pen = *wxBLACK_PEN;
-    m_font = *wxNORMAL_FONT;
-    m_brush = *wxWHITE_BRUSH;
-    m_penOfsX = m_penOfsY = 0;
-
-    m_penSelected = m_brushSelected = false;
-    m_downloadedPatterns[0] = m_downloadedPatterns[1] = false;
-
-    m_mglFont = NULL;
-}
-
-
-wxDC::~wxDC()
-{
-    if (m_OwnsMGLDC)
-        delete m_MGLDC;
-}
-
-void wxDC::SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC)
-{
-    if ( m_OwnsMGLDC && m_MGLDC )
-        delete m_MGLDC;
-    m_MGLDC = mgldc;
-    m_OwnsMGLDC = OwnsMGLDC;
-    m_ok = true;
-
-    if ( !m_globalClippingRegion.IsNull() )
-        SetClippingRegion(m_globalClippingRegion);
-
-    InitializeMGLDC();
-}
-
-void wxDC::InitializeMGLDC()
-{
-    if ( GetDepth() > 8 )
-    {
-        wxCurrentDCSwitcher switcher(m_MGLDC); // will go away with MGL6
-        m_MGLDC->setFontBlendMode(MGL_AA_RGBBLEND);
-    }
-}
-
-
-// ---------------------------------------------------------------------------
-// clipping
-// ---------------------------------------------------------------------------
-
-
-#define DO_SET_CLIPPING_BOX(rg)                      \
-{                                                    \
-    wxRect rect = rg.GetBox();                       \
-    m_clipX1 = (wxCoord) XDEV2LOG(rect.GetLeft());   \
-    m_clipY1 = (wxCoord) YDEV2LOG(rect.GetTop());    \
-    m_clipX2 = (wxCoord) XDEV2LOG(rect.GetRight());  \
-    m_clipY2 = (wxCoord) YDEV2LOG(rect.GetBottom()); \
-}
-
-void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxRect rect(XLOG2DEV(cx), YLOG2DEV(cy), XLOG2DEVREL(cw), YLOG2DEVREL(ch));
-
-    if ( !m_currentClippingRegion.IsNull() )
-        m_currentClippingRegion.Intersect(rect);
-    else
-        m_currentClippingRegion.Union(rect);
-
-    m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion());
-
-    m_clipping = true;
-    DO_SET_CLIPPING_BOX(m_currentClippingRegion)
-}
-
-void wxDC::DoSetDeviceClippingRegion(const wxRegion& region)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( region.IsEmpty() )
-    {
-        DestroyClippingRegion();
-        return;
-    }
-
-    wxRegion rg(region);
-
-    // check if the DC is scaled or moved, and if yes, then
-    // convert rg to device coordinates:
-    if ( m_deviceOriginX != 0 || m_deviceOriginY != 0 ||
-         m_logicalOriginX != 0 || m_logicalOriginY != 0 ||
-         XLOG2DEVREL(500) != 500 || YLOG2DEVREL(500) != 500 )
-    {
-        region_t *mrg = rg.GetMGLRegion().rgnPointer();
-        span_t *s;
-        segment_t *p;
-        for (s = mrg->spans; s; s = s->next)
-        {
-            s->y = YLOG2DEV(s->y);
-            for (p = s->seg; p; p = p->next)
-                p->x = XLOG2DEV(p->x);
-        }
-    }
-
-    if ( !m_currentClippingRegion.IsNull() )
-        m_currentClippingRegion.Intersect(rg);
-    else
-        m_currentClippingRegion.Union(rg);
-
-    m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion());
-
-    m_clipping = true;
-    DO_SET_CLIPPING_BOX(m_currentClippingRegion)
-}
-
-void wxDC::DestroyClippingRegion()
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( !m_globalClippingRegion.IsNull() )
-    {
-        m_MGLDC->setClipRegion(m_globalClippingRegion.GetMGLRegion());
-        m_currentClippingRegion = m_globalClippingRegion;
-        m_clipping = true;
-    }
-    else
-    {
-        m_MGLDC->setClipRect(MGLRect(0, 0, m_MGLDC->sizex()+1, m_MGLDC->sizey()+1));
-        ResetClipping();
-        m_currentClippingRegion.Clear();
-    }
-}
-
-// ---------------------------------------------------------------------------
-// query capabilities
-// ---------------------------------------------------------------------------
-
-bool wxDC::CanDrawBitmap() const
-{
-    return true;
-}
-
-bool wxDC::CanGetTextExtent() const
-{
-    return true;
-}
-
-int wxDC::GetDepth() const
-{
-    return m_MGLDC->getBitsPerPixel();
-}
-
-// ---------------------------------------------------------------------------
-// drawing
-// ---------------------------------------------------------------------------
-
-void wxDC::Clear()
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_backgroundBrush.GetStyle() != wxTRANSPARENT )
-    {
-        int w, h;
-        wxBrush oldb = m_brush;
-        SetBrush(m_backgroundBrush);
-        SelectBrush();
-        GetSize(&w, &h);
-        m_MGLDC->fillRect(0, 0, w, h);
-        SetBrush(oldb);
-    }
-}
-
-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                          const wxColour & col, wxFloodFillStyle style);
-
-bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
-                       const wxColour& col, wxFloodFillStyle style)
-{
-    return wxDoFloodFill(this, x, y, col, style);
-}
-
-bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
-{
-    wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxDC::GetPixel"));
-
-    uchar r, g, b;
-    m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)),
-                             r, g, b);
-    col->Set(r, g, b);
-    return true;
-}
-
-void wxDC::DoCrossHair(wxCoord x, wxCoord y)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        int w = 0;
-        int h = 0;
-        GetSize(&w, &h);
-        m_MGLDC->makeCurrent(); // will go away with MGL6.0
-        if ( !m_penSelected )
-            SelectPen();
-        wxCoord xx = XLOG2DEV(x);
-        wxCoord yy = YLOG2DEV(y);
-        m_MGLDC->line(m_penOfsX, yy + m_penOfsY, w-1 + m_penOfsX, yy + m_penOfsY);
-        m_MGLDC->line(xx + m_penOfsX, m_penOfsY, x + m_penOfsX, h-1 + m_penOfsY);
-        CalcBoundingBox(0, 0);
-        CalcBoundingBox(w, h);
-    }
-}
-
-void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        m_MGLDC->makeCurrent(); // will go away with MGL6.0
-        if ( !m_penSelected )
-            SelectPen();
-        m_MGLDC->lineExt(XLOG2DEV(x1) + m_penOfsX, YLOG2DEV(y1) + m_penOfsY,
-                      XLOG2DEV(x2) + m_penOfsX, YLOG2DEV(y2) + m_penOfsY,FALSE);
-        CalcBoundingBox(x1, y1);
-        CalcBoundingBox(x2, y2);
-    }
-}
-
-// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
-// and ending at (x2, y2)
-void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
-                     wxCoord x2, wxCoord y2,
-                     wxCoord xc, wxCoord yc)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxCoord xx1 = XLOG2DEV(x1);
-    wxCoord yy1 = YLOG2DEV(y1);
-    wxCoord xx2 = XLOG2DEV(x2);
-    wxCoord yy2 = YLOG2DEV(y2);
-    wxCoord xxc = XLOG2DEV(xc);
-    wxCoord yyc = YLOG2DEV(yc);
-    double dx = xx1 - xxc;
-    double dy = yy1 - yyc;
-    double radius = sqrt((double)(dx*dx+dy*dy));
-    wxCoord r = (wxCoord)radius;
-    double radius1, radius2;
-
-
-    if (xx1 == xx2 && yy1 == yy2)
-    {
-        radius1 = 0.0;
-        radius2 = 360.0;
-    }
-    else if (radius == 0.0)
-    {
-        radius1 = radius2 = 0.0;
-    }
-    else
-    {
-        radius1 = (xx1 - xxc == 0) ?
-            (yy1 - yyc < 0) ? 90.0 : -90.0 :
-            -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
-        radius2 = (xx2 - xxc == 0) ?
-            (yy2 - yyc < 0) ? 90.0 : -90.0 :
-            -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
-    }
-    wxCoord alpha1 = wxCoord(radius1);
-    wxCoord alpha2 = alpha1 + wxCoord(radius2 - radius1);
-    while (alpha2 <= 0) alpha2 += 360;
-    while (alpha1 > 360) alpha1 -= 360;
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_brushSelected )
-            SelectBrush();
-        m_MGLDC->fillEllipseArc(xxc, yyc, r, r, alpha1, alpha2);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-         SelectPen();
-        m_MGLDC->ellipseArc(xxc + m_penOfsX, yyc + m_penOfsY, r, r, alpha1, alpha2);
-    }
-
-    CalcBoundingBox(xc - r, yc - r);
-    CalcBoundingBox(xc + r, yc + r);
-}
-
-void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        m_MGLDC->makeCurrent(); // will go away with MGL6.0
-        if ( !m_penSelected )
-            SelectPen();
-        m_MGLDC->pixel(XLOG2DEV(x), YLOG2DEV(y));
-        CalcBoundingBox(x, y);
-    }
-}
-
-void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,wxPolygonFillMode WXUNUSED(fillStyle))
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxCoord xxoffset = XLOG2DEVREL(xoffset),
-            yyoffset = YLOG2DEVREL(yoffset);
-    MGLPoint *cpoints = new MGLPoint[n+1];
-    for (int i = 0; i < n; i++)
-    {
-        CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
-        cpoints[i].x = (int)(XLOG2DEV(points[i].x));
-        cpoints[i].y = (int)(YLOG2DEV(points[i].y));
-    }
-    cpoints[n] = cpoints[0];
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_brushSelected )
-            SelectBrush();
-        m_MGLDC->fillPolygon(n, cpoints, xxoffset, yyoffset);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-            SelectPen();
-        if (m_penOfsX != 0 || m_penOfsY != 0)
-        {
-            for (int i = 0; i <= n; i++)
-            {
-                cpoints[i].x += m_penOfsX;
-                cpoints[i].y += m_penOfsY;
-            }
-        }
-        m_MGLDC->polyLine(n+1, cpoints);
-    }
-
-    delete[] cpoints;
-}
-
-void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        MGLPoint *cpoints = new MGLPoint[n];
-        m_MGLDC->makeCurrent(); // will go away with MGL6.0
-        if ( !m_penSelected )
-            SelectPen();
-        for (int i = 0; i < n; i++)
-        {
-            CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
-            cpoints[i].x = (int)(XLOG2DEV(points[i].x + xoffset) /*+ m_penOfsX*/);
-            cpoints[i].y = (int)(YLOG2DEV(points[i].y + yoffset) /*+ m_penOfsY*/);
-        }
-        m_MGLDC->polyLine(n, cpoints);
-        delete[] cpoints;
-    }
-}
-
-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxCoord xx = XLOG2DEV(x);
-    wxCoord yy = YLOG2DEV(y);
-    wxCoord ww = m_signX * XLOG2DEVREL(width);
-    wxCoord hh = m_signY * YLOG2DEVREL(height);
-
-    if ( ww == 0 || hh == 0 ) return;
-
-    if ( ww < 0 )
-    {
-        ww = -ww;
-        xx = xx - ww;
-    }
-    if ( hh < 0 )
-    {
-        hh = -hh;
-        yy = yy - hh;
-    }
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_brushSelected )
-            SelectBrush();
-        m_MGLDC->fillRect(xx, yy, xx + ww, yy + hh);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-            SelectPen();
-
-        m_MGLDC->rect(xx + m_penOfsX, yy + m_penOfsY,
-                      xx + ww + m_penOfsX, yy + hh + m_penOfsY);
-    }
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + width, y + height);
-}
-
-void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( radius < 0.0 )
-        radius = -radius * ((width < height) ? width : height);
-
-    wxCoord xx = XLOG2DEV(x);
-    wxCoord yy = YLOG2DEV(y);
-    wxCoord ww = m_signX * XLOG2DEVREL(width);
-    wxCoord hh = m_signY * YLOG2DEVREL(height);
-    wxCoord rr = XLOG2DEVREL((wxCoord)radius);
-
-    // CMB: handle -ve width and/or height
-    if ( ww < 0 )
-    {
-        ww = -ww;
-        xx = xx - ww;
-    }
-    if ( hh < 0 )
-    {
-        hh = -hh;
-        yy = yy - hh;
-    }
-
-    // CMB: if radius is zero use DrawRectangle() instead to avoid
-    // X drawing errors with small radii
-    if ( rr == 0 )
-    {
-        DrawRectangle(x, y, width, height);
-        return;
-    }
-
-    // CMB: draw nothing if transformed w or h is 0
-    if ( ww == 0 || hh == 0 ) return;
-
-    // CMB: ensure dd is not larger than rectangle otherwise we
-    // get an hour glass shape
-    wxCoord dd = 2 * rr;
-    if ( dd > ww ) dd = ww;
-    if ( dd > hh ) dd = hh;
-    rr = dd / 2;
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if (!m_brushSelected)
-            SelectBrush();
-        m_MGLDC->fillRect(xx+rr, yy, xx+ww-rr, yy+hh);
-        m_MGLDC->fillRect(xx, yy+rr, xx+ww, yy+hh-rr);
-        m_MGLDC->fillEllipseArc(xx+rr, yy+rr, rr, rr, 90, 180);
-        m_MGLDC->fillEllipseArc(xx+ww-rr, yy+rr, rr, rr, 0, 90);
-        m_MGLDC->fillEllipseArc(xx+rr, yy+hh-rr, rr, rr, 180, 270);
-        m_MGLDC->fillEllipseArc(xx+ww-rr, yy+hh-rr, rr, rr, 270, 0);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-            SelectPen();
-        xx += m_penOfsX;
-        yy += m_penOfsY;
-        m_MGLDC->line(xx+rr+1, yy, xx+ww-rr, yy);
-        m_MGLDC->ellipseArc(xx+ww-rr, yy+rr, rr, rr, 0, 90);
-        m_MGLDC->line(xx+ww, yy+rr+1, xx+ww, yy+hh-rr);
-        m_MGLDC->ellipseArc(xx+ww-rr, yy+hh-rr, rr, rr, 270, 0);
-        m_MGLDC->line(xx+ww-rr, yy+hh, xx+rr+1, yy+hh);
-        m_MGLDC->ellipseArc(xx+rr, yy+hh-rr, rr, rr, 180, 270);
-        m_MGLDC->line(xx, yy+hh-rr, xx, yy+rr+1);
-        m_MGLDC->ellipseArc(xx+rr, yy+rr, rr, rr, 90, 180);
-    }
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + width, y + height);
-}
-
-void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxCoord x2 = (x+width);
-    wxCoord y2 = (y+height);
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_brushSelected )
-            SelectBrush();
-        MGLRect rect(XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
-        m_MGLDC->fillEllipse(rect);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-            SelectPen();
-        MGLRect rect(XLOG2DEV(x) + m_penOfsX, YLOG2DEV(y) + m_penOfsY,
-                     XLOG2DEV(x2) + m_penOfsX, YLOG2DEV(y2) + m_penOfsY);
-        m_MGLDC->ellipse(rect);
-    }
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxCoord x2 = (x+w);
-    wxCoord y2 = (y+h);
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        if (!m_brushSelected) SelectBrush();
-        MGLRect rect(XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
-        m_MGLDC->fillEllipseArc(rect, (int)sa, (int)ea);
-    }
-
-    if ( m_pen.GetStyle() != wxTRANSPARENT )
-    {
-        if ( !m_penSelected )
-            SelectPen();
-        MGLRect rect(XLOG2DEV(x) + m_penOfsX, YLOG2DEV(y) + m_penOfsY,
-                     XLOG2DEV(x2) + m_penOfsX, YLOG2DEV(y2) + m_penOfsY);
-        m_MGLDC->ellipseArc(rect, (int)sa, (int)ea);
-    }
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
-{
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    DrawAnyText(text, x, y);
-
-    // update the bounding box
-    wxCoord w, h;
-    CalcBoundingBox(x, y);
-    GetTextExtent(text, &w, &h);
-    CalcBoundingBox(x + w, y + h);
-}
-
-bool wxDC::SelectMGLFont()
-{
-    if ( m_mglFont == NULL )
-    {
-        float scale = m_scaleY;
-        bool antialiased = (GetDepth() > 8);
-
-        m_mglFont = m_font.GetMGLfont_t(scale, antialiased);
-        wxCHECK_MSG( m_mglFont, false, wxT("invalid font") );
-
-        m_MGLDC->useFont(m_mglFont);
-        wxLogTrace("mgl_font", "useFont(%p)", m_mglFont);
-
-#if !wxUSE_UNICODE
-        wxNativeEncodingInfo nativeEnc;
-        wxFontEncoding encoding = m_font.GetEncoding();
-        if ( !wxGetNativeFontEncoding(encoding, &nativeEnc) ||
-             !wxTestFontEncoding(nativeEnc) )
-        {
-#if wxUSE_FONTMAP
-            if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &nativeEnc) )
-#endif
-            {
-                nativeEnc.mglEncoding = MGL_ENCODING_ASCII;
-            }
-        }
-        m_MGLDC->setTextEncoding(nativeEnc.mglEncoding);
-#endif
-    }
-    return true;
-}
-
-void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    SelectMGLFont();
-
-    // Render the text:
-    wxCoord xx = XLOG2DEV(x);
-    wxCoord yy = YLOG2DEV(y);
-
-    m_MGLDC->setLineStyle(MGL_LINE_STIPPLE);
-    m_MGLDC->setLineStipple(0xFFFF);
-    m_MGLDC->setPenSize(1, 1);
-    m_MGLDC->setPenStyle(MGL_BITMAP_SOLID);
-
-#if wxUSE_UNICODE
-    const wchar_t *c_text = text.c_str();
-#else
-    const char *c_text = text.c_str();
-#endif
-
-#if 1
-    // FIXME_MGL - this is a temporary hack in absence of proper
-    //             implementation of solid text background in MGL. Once
-    //             the bug in MGL is fixed, this code should be nuked
-    //             immediately. Note that the code is not 100% correct;
-    //             it only works with wxCOPY logical function
-    if ( m_backgroundMode == wxSOLID )
-    {
-        int w = m_MGLDC->textWidth(c_text);
-        int h = m_MGLDC->textHeight();
-        m_MGLDC->setColor(m_MGLDC->packColorFast(m_textBackgroundColour.Red(),
-                m_textBackgroundColour.Green(), m_textBackgroundColour.Blue()));
-        m_MGLDC->fillRect(xx, yy, xx+w, yy+h);
-    }
-#endif
-
-    m_MGLDC->setColor(m_MGLDC->packColorFast(m_textForegroundColour.Red(),
-            m_textForegroundColour.Green(), m_textForegroundColour.Blue()));
-    m_MGLDC->setBackColor(m_MGLDC->packColorFast(m_textBackgroundColour.Red(),
-            m_textBackgroundColour.Green(), m_textBackgroundColour.Blue()));
-
-    m_MGLDC->drawStr(xx, yy, c_text);
-
-    // Render underline:
-    if ( m_font.GetUnderlined() )
-    {
-        int x1 = xx, y1 = yy;
-        int x2 = 0 , y2 = 0;
-        int w = m_MGLDC->textWidth(c_text);
-        m_MGLDC->underScoreLocation(x1, y1, c_text);
-        switch (m_MGLDC->getTextDirection())
-        {
-            case MGL_RIGHT_DIR: x2 = x1 + w, y2 = y1; break;
-            case MGL_LEFT_DIR:  x2 = x1 - w, y2 = y1; break;
-            case MGL_UP_DIR:    x2 = x1, y2 = y1 - w; break;
-            case MGL_DOWN_DIR:  x2 = x1, y2 = y1 + w; break;
-        }
-        m_MGLDC->line(x1, y1, x2, y2);
-    }
-
-    m_penSelected = m_brushSelected = false;
-}
-
-void wxDC::DoDrawRotatedText(const wxString& text,
-                             wxCoord x, wxCoord y,
-                             double angle)
-{
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-
-    if ( angle == 0 )
-    {
-        DoDrawText(text, x, y);
-        return;
-    }
-    else if ( angle == 90.0 )
-        m_MGLDC->setTextDirection(MGL_UP_DIR);
-    else if ( angle == 180.0 )
-        m_MGLDC->setTextDirection(MGL_LEFT_DIR);
-    else if ( angle == 270.0 )
-        m_MGLDC->setTextDirection(MGL_DOWN_DIR);
-    else
-    {
-        // FIXME_MGL -- implement once MGL supports it
-        wxFAIL_MSG(wxT("wxMGL only supports rotated text with angle 0,90,180 or 270"));
-        return;
-    }
-
-    DrawAnyText(text, x, y);
-
-    // Restore default:
-    m_MGLDC->setTextDirection(MGL_RIGHT_DIR);
-}
-
-// ---------------------------------------------------------------------------
-// set GDI objects
-// ---------------------------------------------------------------------------
-
-void wxDC::SelectMGLStipplePen(int style)
-{
-    ushort stipple;
-
-    switch (style)
-    {
-        case wxDOT:        stipple = STIPPLE_wxDOT;        break;
-        case wxLONG_DASH:  stipple = STIPPLE_wxLONG_DASH;  break;
-        case wxSHORT_DASH: stipple = STIPPLE_wxSHORT_DASH; break;
-        case wxDOT_DASH:   stipple = STIPPLE_wxDOT_DASH;   break;
-        default:           stipple = STIPPLE_wxSOLID;      break;
-    }
-
-    m_MGLDC->setLineStyle(MGL_LINE_STIPPLE);
-    m_MGLDC->setLineStipple(stipple);
-    m_MGLDC->setPenSize(1, 1);
-    m_MGLDC->setPenStyle(MGL_BITMAP_SOLID);
-    m_penOfsY = m_penOfsX = 0;
-}
-
-// Accepted valus of SelectMGLFatPen's 2nd argument
-enum {
-    wxMGL_SELECT_FROM_PEN,
-    wxMGL_SELECT_FROM_BRUSH
-};
-
-void wxDC::SelectMGLFatPen(int style, int flag)
-{
-    MGL_penStyleType penstyle;
-    const pattern_t *pattern = NULL;
-    pixpattern24_t *pixPattern = NULL;
-    int wx, wy;
-    int slot;
-
-    // Since MGL pens may be created from wxBrush or wxPen and we often
-    // switch between pens and brushes, we take advantage of MGL's ability
-    // to have multiple (pix)pattern_t's loaded. We always download pen
-    // to 0th slot and brush to 1st slot.
-    if ( flag == wxMGL_SELECT_FROM_PEN )
-        slot = 0;
-    else
-        slot = 1;
-
-    // compute pen's width:
-    if ( m_pen.GetWidth() <= 1 )
-    {
-        wx = wy = 1;
-        m_penOfsX = m_penOfsY = 0;
-    }
-    else
-    {
-        wx = (int)(0.5 + fabs((double) XLOG2DEVREL(m_pen.GetWidth())));
-        wy = (int)(0.5 + fabs((double) YLOG2DEVREL(m_pen.GetWidth())));
-        m_penOfsX = -wx/2;
-        m_penOfsY = -wy/2;
-    }
-
-    // find pen's type:
-    penstyle = MGL_BITMAP_TRANSPARENT;
-    switch (style)
-    {
-        case wxBDIAGONAL_HATCH:  pattern = &PATTERN_wxBDIAGONAL_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-        case wxCROSSDIAG_HATCH:  pattern = &PATTERN_wxCROSSDIAG_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-        case wxFDIAGONAL_HATCH:  pattern = &PATTERN_wxFDIAGONAL_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-        case wxCROSS_HATCH:      pattern = &PATTERN_wxCROSS_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-        case wxHORIZONTAL_HATCH: pattern = &PATTERN_wxHORIZONTAL_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-        case wxVERTICAL_HATCH:   pattern = &PATTERN_wxVERTICAL_HATCH;
-                                 penstyle = MGL_BITMAP_TRANSPARENT;
-                                 break;
-
-        case wxSTIPPLE:
-            if ( flag == wxMGL_SELECT_FROM_PEN )
-                pixPattern = (pixpattern24_t*) m_pen.GetPixPattern();
-            else
-                pixPattern = (pixpattern24_t*) m_brush.GetPixPattern();
-            penstyle = MGL_PIXMAP;
-            break;
-
-        case wxSTIPPLE_MASK_OPAQUE:
-            pattern = (pattern_t*) m_brush.GetMaskPattern();
-            penstyle = MGL_BITMAP_OPAQUE;
-            break;
-
-        case wxSOLID:
-        default:
-            penstyle = MGL_BITMAP_SOLID; break;
-    }
-
-    // ...and finally, pass the pen to MGL:
-
-    if ( pattern )
-    {
-        if ( !m_downloadedPatterns[slot] )
-        {
-            m_MGLDC->setPenBitmapPattern(slot, pattern);
-            m_downloadedPatterns[slot] = true;
-        }
-        m_MGLDC->usePenBitmapPattern(slot);
-    }
-
-    if ( pixPattern )
-    {
-        if ( !m_downloadedPatterns[slot] )
-        {
-            pixpattern_t pix;
-            int x, y, c;
-
-            switch (GetDepth())
-            {
-                case 8:
-                    for (y = 0; y < 8; y++)
-                        for (x = 0; x < 8; x++)
-                            pix.b8.p[x][y] = (uchar)m_MGLDC->packColorFast(
-                                                        pixPattern->p[x][y][0],
-                                                        pixPattern->p[x][y][1],
-                                                        pixPattern->p[x][y][2]);
-                    break;
-                case 15:
-                case 16:
-                    for (y = 0; y < 8; y++)
-                        for (x = 0; x < 8; x++)
-                            pix.b16.p[x][y] = (M_uint16)m_MGLDC->packColorFast(
-                                                        pixPattern->p[x][y][0],
-                                                        pixPattern->p[x][y][1],
-                                                        pixPattern->p[x][y][2]);
-                    break;
-                case 24:
-                    for (y = 0; y < 8; y++)
-                        for (x = 0; x < 8; x++)
-                            for (c = 0; c < 3; c++)
-                                pix.b24.p[x][y][c] = pixPattern->p[x][y][c];
-                    break;
-                case 32:
-                    for (y = 0; y < 8; y++)
-                        for (x = 0; x < 8; x++)
-                            pix.b32.p[x][y] = m_MGLDC->packColorFast(
-                                                        pixPattern->p[x][y][0],
-                                                        pixPattern->p[x][y][1],
-                                                        pixPattern->p[x][y][2]);
-                    break;
-                default:
-                    wxFAIL_MSG(wxT("invalid DC depth"));
-                    break;
-            }
-            m_MGLDC->setPenPixmapPattern(slot, &pix);
-            m_downloadedPatterns[slot] = true;
-        }
-        m_MGLDC->usePenPixmapPattern(slot);
-    }
-
-    m_MGLDC->setLineStyle(MGL_LINE_PENSTYLE);
-    m_MGLDC->setPenStyle(penstyle);
-    m_MGLDC->setPenSize(wy, wx);
-}
-
-void wxDC::SelectPen()
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxColour& clr = m_pen.GetColour();
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    m_MGLDC->setColorRGB(clr.Red(), clr.Green(), clr.Blue());
-
-    switch (m_pen.GetStyle())
-    {
-        case wxTRANSPARENT:
-            break;
-
-        case wxDOT:
-        case wxLONG_DASH:
-        case wxSHORT_DASH:
-        case wxDOT_DASH:
-            SelectMGLStipplePen(m_pen.GetStyle());
-            break;
-
-        case wxBDIAGONAL_HATCH:
-        case wxCROSSDIAG_HATCH:
-        case wxFDIAGONAL_HATCH:
-        case wxCROSS_HATCH:
-        case wxHORIZONTAL_HATCH:
-        case wxVERTICAL_HATCH:
-            SelectMGLFatPen(m_pen.GetStyle(), wxMGL_SELECT_FROM_PEN);
-            break;
-
-        case wxSTIPPLE:
-            SelectMGLFatPen(m_pen.GetStyle(), wxMGL_SELECT_FROM_PEN);
-            break;
-
-        case wxSOLID:
-        case wxUSER_DASH:
-        default:
-            if ( m_pen.GetWidth() <= 1 )
-                SelectMGLStipplePen(wxSOLID);
-            else
-                SelectMGLFatPen(wxSOLID, wxMGL_SELECT_FROM_PEN);
-            break;
-    }
-    m_penSelected = true;
-    m_brushSelected = false;
-}
-
-void wxDC::SelectBrush()
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    wxColour fg, bg;
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-
-    if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
-    {
-        fg = m_textForegroundColour;
-        bg = m_textBackgroundColour;
-    }
-    else
-    {
-        fg = m_brush.GetColour();
-        bg = m_backgroundBrush.GetColour();
-    }
-
-    m_MGLDC->setColorRGB(fg.Red(), fg.Green(), fg.Blue());
-    m_MGLDC->setBackColor(m_MGLDC->packColorFast(bg.Red(), bg.Green(), bg.Blue()));
-    m_penSelected = false;
-    m_brushSelected = true;
-
-    SelectMGLFatPen(m_brush.GetStyle(), wxMGL_SELECT_FROM_BRUSH);
-}
-
-void wxDC::SetPen(const wxPen& pen)
-{
-    if ( !pen.IsOk() ) return;
-    if ( m_pen == pen ) return;
-    m_pen = pen;
-    m_penSelected = false;
-    m_downloadedPatterns[0] = false;
-}
-
-void wxDC::SetBrush(const wxBrush& brush)
-{
-    if ( !brush.IsOk() ) return;
-    if ( m_brush == brush ) return;
-    m_brush = brush;
-    m_brushSelected = false;
-    m_downloadedPatterns[1] = false;
-}
-
-void wxDC::SetPalette(const wxPalette& palette)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( !palette.IsOk() )
-    {
-        if ( m_oldPalette.IsOk() )
-            SetPalette(m_oldPalette);
-        return;
-    }
-
-    if ( palette.IsSameAs(m_palette) )
-        return;
-
-    m_oldPalette = m_palette;
-    m_palette = palette;
-
-    int cnt = m_palette.GetColoursCount();
-    palette_t *pal = m_palette.GetMGLpalette_t();
-    m_MGLDC->setPalette(pal, cnt, 0);
-    m_MGLDC->realizePalette(cnt, 0, TRUE);
-}
-
-void wxDC::SetFont(const wxFont& font)
-{
-    if ( font.IsOk() )
-    {
-        m_font = font;
-        m_mglFont = NULL;
-    }
-}
-
-void wxDC::SetBackground(const wxBrush& brush)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if (!brush.IsOk()) return;
-
-    m_backgroundBrush = brush;
-    wxColour &clr = m_backgroundBrush.GetColour();
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    m_MGLDC->setBackColor(
-             m_MGLDC->packColorFast(clr.Red(), clr.Green(), clr.Blue()));
-}
-
-void wxDC::SetBackgroundMode(int mode)
-{
-    m_backgroundMode = mode;
-    if ( mode == wxSOLID )
-        m_MGLDC->setBackMode(MGL_OPAQUE_BACKGROUND);
-    else
-        m_MGLDC->setBackMode(MGL_TRANSPARENT_BACKGROUND);
-}
-
-void wxDC::SetLogicalFunction(wxRasterOperationMode function)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    m_logicalFunction = function;
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-    m_MGLDC->setWriteMode(LogicalFunctionToMGLRop(m_logicalFunction));
-}
-
-int wxDC::LogicalFunctionToMGLRop(int logFunc) const
-{
-    MGL_writeModeType rop;
-
-    switch (logFunc)
-    {
-        case wxCLEAR:        rop = MGL_R2_BLACK;         break;
-        case wxXOR:          rop = MGL_R2_XORSRC;        break;
-        case wxINVERT:       rop = MGL_R2_NOT;           break;
-        case wxOR_REVERSE:   rop = MGL_R2_MERGESRCNOT;   break;
-        case wxAND_REVERSE:  rop = MGL_R2_MASKSRCNOT;    break;
-        case wxCOPY:         rop = MGL_R2_COPYSRC;       break;
-        case wxAND:          rop = MGL_R2_MASKSRC;       break;
-        case wxAND_INVERT:   rop = MGL_R2_MASKNOTSRC;    break;
-        case wxNO_OP:        rop = MGL_R2_NOP;           break;
-        case wxNOR:          rop = MGL_R2_NOTMERGESRC;   break;
-        case wxEQUIV:        rop = MGL_R2_NOTXORSRC;     break;
-        case wxSRC_INVERT:   rop = MGL_R2_NOTCOPYSRC;    break;
-        case wxOR_INVERT:    rop = MGL_R2_MERGENOTSRC;   break;
-        case wxNAND:         rop = MGL_R2_NOTMASKSRC;    break;
-        case wxOR:           rop = MGL_R2_MERGESRC;      break;
-        case wxSET:          rop = MGL_R2_WHITE;         break;
-        default:
-           wxFAIL_MSG( wxT("unsupported logical function") );
-           return MGL_REPLACE_MODE;
-    }
-    return (int)rop;
-}
-
-bool wxDC::StartDoc(const wxString& WXUNUSED(message))
-{
-    // We might be previewing, so return true to let it continue.
-    return true;
-}
-
-void wxDC::EndDoc()
-{
-}
-
-void wxDC::StartPage()
-{
-}
-
-void wxDC::EndPage()
-{
-}
-
-// ---------------------------------------------------------------------------
-// text metrics
-// ---------------------------------------------------------------------------
-
-wxCoord wxDC::GetCharHeight() const
-{
-    wxCurrentDCSwitcher switcher(m_MGLDC);
-    if ( !wxConstCast(this, wxDC)->SelectMGLFont() ) return -1;
-    return YDEV2LOGREL(m_mglFont->fontHeight);
-}
-
-wxCoord wxDC::GetCharWidth() const
-{
-    wxCurrentDCSwitcher switcher(m_MGLDC);
-    if ( !wxConstCast(this, wxDC)->SelectMGLFont() ) return -1;
-    // VS: wxT() is intentional, charWidth() has both char and wchar_t version
-    // VS: YDEV is corrent, it should *not* be XDEV, because font's are only
-    //     scaled according to m_scaleY
-    return YDEV2LOGREL(m_mglFont->fontWidth);
-}
-
-void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
-                           wxCoord *descent, wxCoord *externalLeading,
-                           const wxFont *theFont) const
-{
-    wxFont oldFont;
-
-    if ( theFont != NULL )
-    {
-        oldFont = m_font;
-        wxConstCast(this, wxDC)->SetFont(*theFont);
-    }
-
-    wxCurrentDCSwitcher switcher(m_MGLDC);
-    if ( !wxConstCast(this, wxDC)->SelectMGLFont() ) return;
-
-    if ( x )
-        // VS: YDEV is corrent, it should *not* be XDEV, because font's are
-        //     only scaled according to m_scaleY
-        *x = YDEV2LOGREL(m_MGLDC->textWidth(string.wc_str()));
-    if ( y )
-        *y = YDEV2LOGREL(m_MGLDC->textHeight());
-    if ( descent )
-        *descent = YDEV2LOGREL(m_mglFont->descent);
-    if ( externalLeading )
-        *externalLeading = YDEV2LOGREL(m_mglFont->leading);
-
-    if ( theFont != NULL )
-        wxConstCast(this, wxDC)->SetFont(oldFont);
-}
-
-
-// ---------------------------------------------------------------------------
-// mapping modes
-// ---------------------------------------------------------------------------
-
-void wxDC::ComputeScaleAndOrigin()
-{
-    double newX = m_logicalScaleX * m_userScaleX;
-    double newY = m_logicalScaleY * m_userScaleY;
-
-    // make sure font will be reloaded before drawing:
-    if ( newY != m_scaleY )
-        m_mglFont = NULL;
-    // make sure m_penOfs{X,Y} will be reevaluated before drawing:
-    if ( newY != m_scaleY || newX != m_scaleX )
-        m_penSelected = false;
-
-    m_scaleX = newX, m_scaleY = newY;
-}
-
-void wxDC::DoGetSize(int *w, int *h) const
-{
-    if (w) *w = m_MGLDC->sizex()+1;
-    if (h) *h = m_MGLDC->sizey()+1;
-}
-
-void wxDC::DoGetSizeMM(int *width, int *height) const
-{
-    int w = 0;
-    int h = 0;
-    GetSize(&w, &h);
-    if ( width ) *width = int(double(w) / (m_userScaleX*m_mm_to_pix_x));
-    if ( height ) *height = int(double(h) / (m_userScaleY*m_mm_to_pix_y));
-}
-
-wxSize wxDC::GetPPI() const
-{
-    return wxSize(int(double(m_mm_to_pix_x) * inches2mm),
-                  int(double(m_mm_to_pix_y) * inches2mm));
-}
-
-
-// ---------------------------------------------------------------------------
-// Blitting
-// ---------------------------------------------------------------------------
-
-bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
-                  wxCoord width, wxCoord height,
-                  wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                  wxRasterOperationMode rop, bool useMask,
-                  wxCoord xsrcMask, wxCoord ysrcMask)
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid dc") );
-    wxCHECK_MSG( source, false, wxT("invalid source dc") );
-
-    // transform the source DC coords to the device ones
-    xsrc = source->LogicalToDeviceX(xsrc);
-    ysrc = source->LogicalToDeviceY(ysrc);
-
-    /* FIXME_MGL: use the mask origin when drawing transparently */
-    if (xsrcMask == -1 && ysrcMask == -1)
-    {
-        xsrcMask = xsrc; ysrcMask = ysrc;
-    }
-    else
-    {
-        xsrcMask = source->LogicalToDeviceX(xsrcMask);
-        ysrcMask = source->LogicalToDeviceY(ysrcMask);
-    }
-
-    CalcBoundingBox(xdest, ydest);
-    CalcBoundingBox(xdest + width, ydest + height);
-
-    /* scale/translate size and position */
-    wxCoord xx = XLOG2DEV(xdest);
-    wxCoord yy = YLOG2DEV(ydest);
-
-    if ( source->m_isMemDC )
-    {
-        wxMemoryDC *memDC = (wxMemoryDC*) source;
-        DoDrawSubBitmap(memDC->GetSelectedObject(),
-                        xsrc, ysrc, width, height,
-                        xdest, ydest, rop, useMask);
-    }
-    else
-    {
-        wxCoord ww = XLOG2DEVREL(width);
-        wxCoord hh = YLOG2DEVREL(height);
-
-        m_MGLDC->makeCurrent(); // will go away with MGL6.0
-        m_MGLDC->bitBlt(*source->GetMGLDC(),
-                        xsrc, ysrc, xsrc + ww, ysrc + hh,
-                        xx, yy, LogicalFunctionToMGLRop(rop));
-    }
-
-    return true;
-}
-
-void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );
-
-    wxCoord w = bmp.GetWidth();
-    wxCoord h = bmp.GetHeight();
-
-    DoDrawSubBitmap(bmp, 0, 0, w, h, x, y, m_logicalFunction, useMask);
-}
-
-void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-{
-    // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
-    DoDrawBitmap((const wxBitmap&)icon, x, y, true);
-}
-
-
-static inline void DoBitBlt(const wxBitmap& src, MGLDevCtx *dst,
-                            int sx, int sy, int sw, int sh,
-                            int dx, int dy, int dw, int dh,
-                            int rop, bool useStretching, bool putSection)
-{
-    bitmap_t *bmp = src.GetMGLbitmap_t();
-    if (!useStretching)
-    {
-        if (!putSection)
-            dst->putBitmap(dx, dy, bmp, rop);
-        else
-            dst->putBitmapSection(sx, sy, sx + sw, sy + sh, dx, dy, bmp, rop);
-    }
-    else
-    {
-        if (!putSection)
-            dst->stretchBitmap(dx, dy, dx + dw, dy + dh, bmp, rop);
-        else
-            dst->stretchBitmapSection(sx, sy, sx + sw, sy + sh,
-                                      dx, dy, dx + dw, dy + dh, bmp, rop);
-    }
-}
-
-void wxDC::DoDrawSubBitmap(const wxBitmap &bmp,
-                           wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                           wxCoord destx, wxCoord desty, int rop, bool useMask)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + w, y + h);
-
-    wxCoord dx = XLOG2DEV(destx);
-    wxCoord dy = YLOG2DEV(desty);
-    wxCoord dw = XLOG2DEVREL(w);
-    wxCoord dh = YLOG2DEVREL(h);
-
-    m_MGLDC->makeCurrent(); // will go away with MGL6.0
-
-    bool useStretching = ((w != dw) || (h != dh));
-    bool putSection = (w != bmp.GetWidth() || h != bmp.GetHeight());
-    MGL_writeModeType mglRop = (MGL_writeModeType)LogicalFunctionToMGLRop(rop);
-
-    if ( bmp.GetDepth() == 1 )
-    {
-        // Mono bitmaps are handled in special way -- all 1s are drawn in
-        // foreground colours, all 0s in background colour.
-
-        ((wxBitmap&)bmp).SetMonoPalette(m_textForegroundColour, m_textBackgroundColour);
-    }
-
-    if ( useMask && bmp.GetMask() )
-    {
-        // Since MGL does not support masks directly (in MGL, mask is handled
-        // in same way as in wxImage, i.e. there is one "key" color), we
-        // simulate masked bitblt in 6 steps (same as in MSW):
-        //
-        // 1. Create a temporary bitmap and copy the destination area into it.
-        // 2. Copy the source area into the temporary bitmap using the
-        //    specified logical function.
-        // 3. Set the masked area in the temporary bitmap to BLACK by ANDing
-        //    the mask bitmap with the temp bitmap with the foreground colour
-        //    set to WHITE and the bg colour set to BLACK.
-        // 4. Set the unmasked area in the destination area to BLACK by
-        //    ANDing the mask bitmap with the destination area with the
-        //    foreground colour set to BLACK and the background colour set
-        //    to WHITE.
-        // 5. OR the temporary bitmap with the destination area.
-        // 6. Delete the temporary bitmap.
-        //
-        // This sequence of operations ensures that the source's transparent
-        // area need not be black, and logical functions are supported.
-
-        wxBitmap mask = bmp.GetMask()->GetBitmap();
-
-        MGLMemoryDC *temp;
-
-        if ( GetDepth() <= 8 )
-        {
-            temp = new MGLMemoryDC(dw, dh, GetDepth(), NULL);
-            wxDC tempdc;
-            tempdc.SetMGLDC(temp, false);
-            tempdc.SetPalette(m_palette);
-        }
-        else
-        {
-            pixel_format_t pf;
-            m_MGLDC->getPixelFormat(pf);
-            temp = new MGLMemoryDC(dw, dh, GetDepth(), &pf);
-        }
-
-        wxCHECK_RET( temp->isValid(), wxT("cannot create temporary dc") );
-
-        temp->bitBlt(*m_MGLDC, dx, dy, dx + dw, dy + dh, 0, 0, MGL_REPLACE_MODE);
-
-        DoBitBlt(bmp, temp, x, y, w, h, 0, 0, dw, dh, mglRop,
-                 useStretching, putSection);
-
-        mask.SetMonoPalette(wxColour(0,0,0), wxColour(255,255,255));
-        DoBitBlt(mask, temp, x, y, w, h, 0, 0, dw, dh, MGL_R2_MASKSRC,
-                 useStretching, putSection);
-        DoBitBlt(mask, m_MGLDC, x, y, w, h, dx, dy, dw, dh, MGL_R2_MASKNOTSRC,
-                 useStretching, putSection);
-
-        m_MGLDC->bitBlt(*temp, 0, 0, dw, dh, dx, dy, MGL_OR_MODE);
-
-        delete temp;
-    }
-
-    else
-    {
-        DoBitBlt(bmp, m_MGLDC, x, y, w, h, dx, dy, dw, dh, mglRop,
-                 useStretching, putSection);
-    }
-}
diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
deleted file mode 100644
index 9e3d14aa82..0000000000
--- a/src/mgl/dcclient.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/dcclient.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dcclient.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif
-
-#include <mgraph.hpp>
-
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
-
-wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
-{
-    MGLDevCtx *dc = win->GetPaintMGLDC();
-
-    if ( dc )
-    {
-        m_inPaintHandler = TRUE;
-
-        m_globalClippingRegion = win->GetUpdateRegion();
-        SetMGLDC(dc, FALSE);
-    }
-    else
-    {
-        m_inPaintHandler = FALSE;
-
-        dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle()));
-
-        MGLRegion clip;
-        dc->getClipRegion(clip);
-        m_globalClippingRegion = wxRegion(clip);
-        SetMGLDC(dc, TRUE);
-        // TRUE means that dtor will delete MGLDevCtx object
-        // but it won't destroy MGLDC returned by MGL_wmBeginPaint because
-        // ~MGLDevCtx() doesn't call destroy()
-    }
-}
-
-wxWindowDC::~wxWindowDC()
-{
-    if ( !m_inPaintHandler )
-    {
-        GetMGLDC()->setDC(NULL);
-        MGL_wmEndPaint(m_wnd->GetHandle());
-    }
-}
-
-wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
-{
-    wxRect r = m_wnd->GetClientRect();
-    m_globalClippingRegion.Intersect(r);
-    SetClippingRegion(m_globalClippingRegion);
-    SetDeviceOrigin(r.x, r.y);
-}
diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
deleted file mode 100644
index a5a61a33f6..0000000000
--- a/src/mgl/dcmemory.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/dcmemory.cpp
-// Purpose:
-// Author:      Robert Roebling, Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling,
-//                  2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dcmemory.h"
-
-
-//-----------------------------------------------------------------------------
-// wxMemoryDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
-
-void wxMemoryDC::Init()
-{
-    m_isMemDC = true;
-}
-
-wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
-{
-    Init();
-}
-
-wxMemoryDC::~wxMemoryDC()
-{
-}
-
-void wxMemoryDC::DoSelect(const wxBitmap& bitmap)
-{
-    if ( bitmap.IsOk() )
-    {
-        m_selected = bitmap;
-        SetMGLDC(m_selected.CreateTmpDC(), TRUE);
-    }
-}
-
-void wxMemoryDC::SetPen(const wxPen &pen)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( GetDepth() == 1 && *wxTRANSPARENT_PEN != pen )
-    {
-        if ( *wxWHITE_PEN == pen )
-            wxDC::SetPen(*wxBLACK_PEN);
-        else
-            wxDC::SetPen(*wxWHITE_PEN);
-    }
-    else
-    {
-        wxDC::SetPen(pen);
-    }
-}
-
-void wxMemoryDC::SetBrush(const wxBrush &brush)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( GetDepth() == 1 && *wxTRANSPARENT_BRUSH != brush )
-    {
-        if ( *wxWHITE_BRUSH == brush )
-            wxDC::SetBrush(*wxBLACK_BRUSH);
-        else
-            wxDC::SetBrush(*wxWHITE_BRUSH);
-    }
-    else
-    {
-        wxDC::SetBrush(brush);
-    }
-}
-
-void wxMemoryDC::SetTextForeground(const wxColour &col)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( GetDepth() == 1 )
-    {
-        if ( col == *wxWHITE )
-            wxDC::SetTextForeground(*wxBLACK);
-        else
-            wxDC::SetTextForeground(*wxWHITE);
-    }
-    else
-    {
-        wxDC::SetTextForeground(col);
-    }
-}
-
-void wxMemoryDC::SetTextBackground(const wxColour &col)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid dc") );
-
-    if ( GetDepth() == 1 )
-    {
-        if ( col == *wxWHITE )
-            wxDC::SetTextBackground(*wxBLACK);
-        else
-            wxDC::SetTextBackground(*wxWHITE);
-    }
-    else
-    {
-        wxDC::SetTextBackground(col);
-    }
-}
diff --git a/src/mgl/dcscreen.cpp b/src/mgl/dcscreen.cpp
deleted file mode 100644
index 4edb3f61c7..0000000000
--- a/src/mgl/dcscreen.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/dcscreen.cpp
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dcscreen.h"
-
-#include "wx/mgl/private.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
-
-wxScreenDC::wxScreenDC()
-           :wxDC()
-{
-    SetMGLDC(g_displayDC, FALSE /* no ownership */);
-
-    // VS: we have to hide the mouse, otherwise rendering artifacts may occur
-    MS_obscure();
-}
-
-wxScreenDC::~wxScreenDC()
-{
-    MS_show();
-}
diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
deleted file mode 100644
index 8c1e79f339..0000000000
--- a/src/mgl/dirmgl.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/dirmgl.cpp
-// Purpose:     wxDir implementation for MGL
-// Author:      Vaclav Slavik, Vadim Zeitlin
-// Modified by:
-// Created:     2001/12/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifndef __UNIX__
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif // PCH
-
-#include "wx/dir.h"
-#include "wx/filefn.h"          // for wxMatchWild
-#include "wx/mgl/private.h"
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_DIR       ((wxDirData *)m_data)
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// this class stores everything we need to enumerate the files
-class wxDirData
-{
-public:
-    wxDirData(const wxString& dirname);
-    ~wxDirData();
-
-    bool IsOk() const { return m_dir != NULL; }
-
-    void SetFileSpec(const wxString& filespec);
-    void SetFlags(int flags) { m_flags = flags; }
-
-    void Rewind();
-    bool Read(wxString *filename);
-
-    const wxString& GetName() const { return m_dirname; }
-
-private:
-    void    *m_dir;
-
-    wxString m_dirname;
-    wxString m_filespec;
-
-    int      m_flags;
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxDirData
-// ----------------------------------------------------------------------------
-
-wxDirData::wxDirData(const wxString& dirname)
-         : m_dirname(dirname)
-{
-    m_dir = NULL;
-
-    // throw away the trailing slashes
-    size_t n = m_dirname.length();
-    wxCHECK_RET( n, wxT("empty dir name in wxDir") );
-
-    while ( n > 0 && m_dirname[--n] == wxFILE_SEP_PATH ) {}
-
-    m_dirname.Truncate(n + 1);
-}
-
-wxDirData::~wxDirData()
-{
-    if ( m_dir )
-        PM_findClose(m_dir);
-}
-
-void wxDirData::SetFileSpec(const wxString& filespec)
-{
-#ifdef __DOS__
-    if ( filespec.empty() )
-        m_filespec = wxT("*.*");
-    else
-#endif
-    m_filespec = filespec;
-}
-
-void wxDirData::Rewind()
-{
-    if ( m_dir )
-    {
-        PM_findClose(m_dir);
-        m_dir = NULL;
-    }
-}
-
-bool wxDirData::Read(wxString *filename)
-{
-    PM_findData data;
-    bool matches = false;
-
-    data.dwSize = sizeof(data);
-
-    wxString path = m_dirname;
-    path += wxFILE_SEP_PATH;
-    path.reserve(path.length() + 255); // speed up string concatenation
-
-    while ( !matches )
-    {
-        if ( m_dir )
-        {
-            if ( !PM_findNextFile(m_dir, &data) )
-                return false;
-        }
-        else
-        {
-            m_dir = PM_findFirstFile(path + m_filespec , &data);
-            if ( m_dir == PM_FILE_INVALID )
-            {
-                m_dir = NULL;
-                return false;
-            }
-        }
-
-        // don't return "." and ".." unless asked for
-        if ( data.name[0] == '.' &&
-             ((data.name[1] == '.' && data.name[2] == '\0') ||
-              (data.name[1] == '\0')) )
-        {
-            if ( !(m_flags & wxDIR_DOTDOT) )
-                continue;
-
-            // we found a valid match
-            break;
-        }
-
-        // check the type now
-        if ( !(m_flags & wxDIR_FILES) && !(data.attrib & PM_FILE_DIRECTORY) )
-        {
-            // it's a file, but we don't want them
-            continue;
-        }
-        else if ( !(m_flags & wxDIR_DIRS) && (data.attrib & PM_FILE_DIRECTORY) )
-        {
-            // it's a dir, and we don't want it
-            continue;
-        }
-
-        matches = m_flags & wxDIR_HIDDEN ? true : !(data.attrib & PM_FILE_HIDDEN);
-    }
-
-    *filename = data.name;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir construction/destruction
-// ----------------------------------------------------------------------------
-
-wxDir::wxDir(const wxString& dirname)
-{
-    m_data = NULL;
-
-    (void)Open(dirname);
-}
-
-bool wxDir::Open(const wxString& dirname)
-{
-    delete M_DIR;
-    m_data = NULL;
-
-    if ( !wxDir::Exists(dirname) )
-    {
-        wxLogError(_("Directory '%s' doesn't exist!"), dirname.c_str());
-        return false;
-    }
-
-    m_data = new wxDirData(dirname);
-    return true;
-}
-
-bool wxDir::IsOpened() const
-{
-    return m_data != NULL;
-}
-
-wxString wxDir::GetName() const
-{
-    wxString name;
-    if ( m_data )
-    {
-        name = M_DIR->GetName();
-        if ( !name.empty() && (name.Last() == wxFILE_SEP_PATH) )
-        {
-            // chop off the last (back)slash
-            name.Truncate(name.length() - 1);
-        }
-    }
-
-    return name;
-}
-
-wxDir::~wxDir()
-{
-    delete M_DIR;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir enumerating
-// ----------------------------------------------------------------------------
-
-bool wxDir::GetFirst(wxString *filename,
-                     const wxString& filespec,
-                     int flags) const
-{
-    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
-
-    M_DIR->Rewind();
-
-    M_DIR->SetFileSpec(filespec);
-    M_DIR->SetFlags(flags);
-
-    return GetNext(filename);
-}
-
-bool wxDir::GetNext(wxString *filename) const
-{
-    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
-
-    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );
-
-    return M_DIR->Read(filename);
-}
-
-#endif // !__UNIX__
diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
deleted file mode 100644
index 5e89f6b8b8..0000000000
--- a/src/mgl/evtloop.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/evtloop.cpp
-// Purpose:     implements wxEventLoop for MGL
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-    #include "wx/app.h"
-    #include "wx/thread.h"
-    #include "wx/timer.h"
-#endif //WX_PRECOMP
-
-#include "wx/evtloop.h"
-
-#include "wx/generic/private/timer.h"
-#include "wx/mgl/private.h"
-
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
-    // ctor
-    wxEventLoopImpl()
-        {
-            SetExitCode(0);
-            SetKeepLooping(true);
-        }
-
-    // process an event
-    void Dispatch();
-
-    // generate an idle event, return true if more idle time requested
-    bool SendIdleEvent();
-
-    // set/get the exit code
-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
-    int GetExitCode() const { return m_exitcode; }
-
-    void SetKeepLooping(bool k) { m_keepLooping = k; }
-    bool GetKeepLooping() const { return m_keepLooping; }
-
-private:
-
-    // the exit code of the event loop
-    int m_exitcode;
-    // false if the loop should end
-    bool m_keepLooping;
-};
-
-// ============================================================================
-// wxEventLoopImpl implementation
-// ============================================================================
-
-void wxEventLoopImpl::Dispatch()
-{
-    event_t evt;
-
-    // VS: The code below is equal to MGL's EVT_halt implementation, with
-    //     two things added: sleeping (busy waiting is stupid, let's make CPU's
-    //     life a bit easier) and timers updating.
-
-    // EVT_halt(&evt, EVT_EVERYEVT);
-    for (;;)
-    {
-#if wxUSE_TIMER
-        wxGenericTimerImpl::NotifyTimers();
-#endif
-        MGL_wmUpdateDC(g_winMng);
-
-        EVT_pollJoystick();
-        if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
-        PM_sleep(10);
-    }
-    // end of EVT_halt
-
-    MGL_wmProcessEvent(g_winMng, &evt);
-}
-
-bool wxEventLoopImpl::SendIdleEvent()
-{
-    return wxTheApp->ProcessIdle();
-}
-
-// ============================================================================
-// wxGUIEventLoop implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxGUIEventLoop running and exiting
-// ----------------------------------------------------------------------------
-
-wxGUIEventLoop::~wxGUIEventLoop()
-{
-    wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );
-}
-
-int wxGUIEventLoop::Run()
-{
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );
-
-    m_impl = new wxEventLoopImpl;
-
-    wxEventLoopActivator activate(this);
-
-    for ( ;; )
-    {
-#if wxUSE_THREADS
-        //wxMutexGuiLeaveOrEnter(); // FIXME_MGL - huh?
-#endif // wxUSE_THREADS
-
-        // generate and process idle events for as long as we don't have
-        // anything else to do
-        while ( !Pending() && m_impl->SendIdleEvent() ) {}
-
-        // a message came or no more idle processing to do, sit in Dispatch()
-        // waiting for the next message
-        if ( !Dispatch() )
-        {
-            // app terminated
-            break;
-        }
-    }
-
-    OnExit();
-
-    int exitcode = m_impl->GetExitCode();
-    wxDELETE(m_impl);
-
-    return exitcode;
-}
-
-void wxGUIEventLoop::Exit(int rc)
-{
-    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );
-
-    m_impl->SetExitCode(rc);
-    m_impl->SetKeepLooping(false);
-
-    // Send a dummy event so that the app won't block in EVT_halt if there
-    // are no user-generated events in the queue:
-    EVT_post(0, EVT_USEREVT, 0, 0);
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoop message processing dispatching
-// ----------------------------------------------------------------------------
-
-bool wxGUIEventLoop::Pending() const
-{
-    // update the display here, so that wxYield refreshes display and
-    // changes take effect immediately, not after emptying events queue:
-    MGL_wmUpdateDC(g_winMng);
-
-    // is there an event in the queue?
-    event_t evt;
-    return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));
-}
-
-bool wxGUIEventLoop::Dispatch()
-{
-    wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") );
-
-    m_impl->Dispatch();
-    return m_impl->GetKeepLooping();
-}
-
-
-//-----------------------------------------------------------------------------
-// wxYield
-//-----------------------------------------------------------------------------
-
-bool wxGUIEventLoop::YieldFor(long eventsToProcess)
-{
-#if wxUSE_THREADS
-    if ( !wxThread::IsMain() )
-    {
-        // can't process events from other threads, MGL is thread-unsafe
-        return true;
-    }
-#endif // wxUSE_THREADS
-
-    m_isInsideYield = true;
-    m_eventsToProcessInsideYield = eventsToProcess;
-
-    wxLog::Suspend();
-
-    // TODO: implement event filtering using the eventsToProcess mask
-
-    while (Pending())
-        Dispatch();
-
-    /* it's necessary to call ProcessIdle() to update the frames sizes which
-       might have been changed (it also will update other things set from
-       OnUpdateUI() which is a nice (and desired) side effect) */
-    while (wxTheApp->ProcessIdle()) { }
-
-    wxLog::Resume();
-
-    m_isInsideYield = false;
-
-    return true;
-}
diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
deleted file mode 100644
index 117b1d7bdb..0000000000
--- a/src/mgl/font.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/font.cpp
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/font.h"
-
-#include "wx/private/fontmgr.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-typedef wxFontMgrFontRefData wxFontRefData;
-#define M_FONTDATA ((wxFontRefData*)m_refData)
-
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-bool wxFont::Create(const wxNativeFontInfo& info)
-{
-    return Create(info.pointSize, info.family, info.style, info.weight,
-                  info.underlined, info.faceName, info.encoding);
-}
-
-bool wxFont::Create(int pointSize,
-                    wxFontFamily family,
-                    wxFontStyle style,
-                    wxFontWeight weight,
-                    bool underlined,
-                    const wxString& face,
-                    wxFontEncoding encoding)
-{
-    m_refData = new wxFontRefData(pointSize, family, style, weight,
-                                  underlined, face, encoding);
-    return true;
-}
-
-wxGDIRefData *wxFont::CreateGDIRefData() const
-{
-    return new wxFontRefData;
-}
-
-wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxFontRefData(*(wxFontRefData *)data);
-}
-
-
-// ----------------------------------------------------------------------------
-// accessors
-// ----------------------------------------------------------------------------
-
-struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
-
-    // we don't support DC scaling yet, so use scale=1
-    wxFontInstance *i = M_FONTDATA->GetFontInstance(1.0, antialiased);
-    return i ? i->GetMGLfont_t() : NULL;
-}
-
-int wxFont::GetPointSize() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
-
-    return M_FONTDATA->GetPointSize();
-}
-
-wxString wxFont::GetFaceName() const
-{
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
-
-    return M_FONTDATA->GetFaceName();
-}
-
-wxFontFamily wxFont::DoGetFamily() const
-{
-    return M_FONTDATA->GetFamily();
-}
-
-wxFontStyle wxFont::GetStyle() const
-{
-    wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
-
-    return M_FONTDATA->GetStyle();
-}
-
-wxFontWeight wxFont::GetWeight() const
-{
-    wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
-
-    return M_FONTDATA->GetWeight();
-}
-
-bool wxFont::GetUnderlined() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-
-    return M_FONTDATA->GetUnderlined();
-}
-
-
-wxFontEncoding wxFont::GetEncoding() const
-{
-    wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
-
-    return M_FONTDATA->GetEncoding();
-}
-
-bool wxFont::IsFixedWidth() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-
-    return M_FONTDATA->IsFixedWidth();
-}
-
-const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
-
-    return M_FONTDATA->GetNativeFontInfo();
-}
-
-// ----------------------------------------------------------------------------
-// change font attributes
-// ----------------------------------------------------------------------------
-
-void wxFont::SetPointSize(int pointSize)
-{
-    AllocExclusive();
-    M_FONTDATA->SetPointSize(pointSize);
-}
-
-void wxFont::SetFamily(wxFontFamily family)
-{
-    AllocExclusive();
-    M_FONTDATA->SetFamily(family);
-}
-
-void wxFont::SetStyle(wxFontStyle style)
-{
-    AllocExclusive();
-    M_FONTDATA->SetStyle(style);
-}
-
-void wxFont::SetWeight(wxFontWeight weight)
-{
-    AllocExclusive();
-    M_FONTDATA->SetWeight(weight);
-}
-
-bool wxFont::SetFaceName(const wxString& faceName)
-{
-    AllocExclusive();
-    M_FONTDATA->SetFaceName(faceName);
-    return wxFontBase::SetFaceName(faceName);
-}
-
-void wxFont::SetUnderlined(bool underlined)
-{
-    AllocExclusive();
-    M_FONTDATA->SetUnderlined(underlined);
-}
-
-void wxFont::SetEncoding(wxFontEncoding encoding)
-{
-    AllocExclusive();
-    M_FONTDATA->SetEncoding(encoding);
-}
-
diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
deleted file mode 100644
index 5659d4b643..0000000000
--- a/src/mgl/fontenum.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/fontenum.cpp
-// Purpose:     wxFontEnumerator class for MGL
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/fontenum.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-#endif
-
-#include "wx/encinfo.h"
-#include "wx/fontutil.h"
-#include "wx/private/fontmgr.h"
-
-#include <mgraph.h>
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-
-// ----------------------------------------------------------------------------
-// wxFontEnumerator
-// ----------------------------------------------------------------------------
-
-bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
-                                          bool fixedWidthOnly)
-{
-    bool found = false;
-    const wxFontBundleList& list = wxFontsManager::Get()->GetBundles();
-    wxFontBundleList::Node *node;
-    wxFontBundle *f = NULL;
-    wxNativeEncodingInfo info;
-
-    if ( encoding != wxFONTENCODING_SYSTEM )
-        wxGetNativeFontEncoding(encoding, &info);
-
-    for (node = list.GetFirst(); node; node = node->GetNext())
-    {
-        f = node->GetData();
-        info.facename = f->GetName();
-        if ( (!fixedWidthOnly || f->IsFixed()) &&
-             (encoding == wxFONTENCODING_SYSTEM || wxTestFontEncoding(info)) )
-        {
-            found = true;
-            if ( !OnFacename(f->GetName()) )
-                return true;
-        }
-    }
-
-    return found;
-}
-
-bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
-{
-    static wxFontEncoding encodings[] =
-    {
-        wxFONTENCODING_ISO8859_1,
-        wxFONTENCODING_ISO8859_2,
-        wxFONTENCODING_ISO8859_3,
-        wxFONTENCODING_ISO8859_4,
-        wxFONTENCODING_ISO8859_5,
-        wxFONTENCODING_ISO8859_6,
-        wxFONTENCODING_ISO8859_7,
-        wxFONTENCODING_ISO8859_8,
-        wxFONTENCODING_ISO8859_9,
-        wxFONTENCODING_ISO8859_10,
-        //wxFONTENCODING_ISO8859_11,
-        //wxFONTENCODING_ISO8859_12,
-        wxFONTENCODING_ISO8859_13,
-        wxFONTENCODING_ISO8859_14,
-        wxFONTENCODING_ISO8859_15,
-        wxFONTENCODING_CP1250,
-        wxFONTENCODING_CP1251,
-        wxFONTENCODING_CP1252,
-        wxFONTENCODING_CP1253,
-        wxFONTENCODING_CP1254,
-        wxFONTENCODING_CP1255,
-        wxFONTENCODING_CP1256,
-        wxFONTENCODING_CP1257,
-        wxFONTENCODING_KOI8,
-
-        wxFONTENCODING_SYSTEM
-    };
-
-    static const char *encodingNames[] =
-    {
-        "iso88590-1",
-        "iso88590-2",
-        "iso88590-3",
-        "iso88590-4",
-        "iso88590-5",
-        "iso88590-6",
-        "iso88590-7",
-        "iso88590-8",
-        "iso88590-9",
-        "iso88590-10",
-        "iso88590-13",
-        "iso88590-14",
-        "iso88590-15",
-        "windows-1250",
-        "windows-1251",
-        "windows-1252",
-        "windows-1253",
-        "windows-1254",
-        "windows-1255",
-        "windows-1256",
-        "windows-1257",
-        "koi-8",
-        NULL
-    };
-
-    wxNativeEncodingInfo info;
-    info.facename = family;
-
-    for (size_t i = 0; encodings[i] != wxFONTENCODING_SYSTEM; i++)
-    {
-        if ( !wxGetNativeFontEncoding(encodings[i], &info) ||
-             !wxTestFontEncoding(info) )
-            continue;
-        if ( !OnFontEncoding(family, encodingNames[i]) )
-            break;
-    }
-
-    return true;
-}
diff --git a/src/mgl/fontmgr.cpp b/src/mgl/fontmgr.cpp
deleted file mode 100644
index 63449e2739..0000000000
--- a/src/mgl/fontmgr.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/fontmgr.cpp
-// Purpose:     font management for wxMGL
-// Author:      Vaclav Slavik
-// Created:     2006-11-18
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-//              (c) 2006 REA Elektronik GmbH
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include "wx/private/fontmgr.h"
-#include "wx/sysopt.h"
-
-#include <mgraph.h>
-
-static int gs_antialiasingThreshold = -1;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxFontInstance
-// ----------------------------------------------------------------------------
-
-wxFontInstance::wxFontInstance(float ptSize, bool aa, font_lib_t *fontLib)
-    : wxFontInstanceBase(ptSize, aa)
-{
-    m_font = MGL_loadFontInstance(fontLib, ptSize, 0.0, 0.0, aa);
-
-    wxASSERT_MSG( m_font, wxT("cannot create font instance") );
-}
-
-wxFontInstance::~wxFontInstance()
-{
-    if ( m_font )
-        MGL_unloadFontInstance(m_font);
-}
-
-// ----------------------------------------------------------------------------
-// wxFontFace
-// ----------------------------------------------------------------------------
-
-void wxFontFace::Acquire()
-{
-    wxFontFaceBase::Acquire();
-
-    if ( m_refCnt == 1 )
-    {
-        wxCHECK_RET( m_fontLib == NULL, wxT("font lib already created") );
-
-        wxLogTrace("mgl_font", "opening library '%s'", m_fileName.mb_str());
-        m_fontLib = MGL_openFontLib(m_fileName.fn_str());
-    }
-}
-
-void wxFontFace::Release()
-{
-    wxFontFaceBase::Release();
-
-    if ( m_refCnt == 0 )
-    {
-        wxCHECK_RET( m_fontLib != NULL, wxT("font lib not created") );
-
-        wxLogTrace("mgl_font", "closing library '%s'", m_fileName.mb_str());
-        MGL_closeFontLib(m_fontLib);
-        m_fontLib = NULL;
-    }
-}
-
-wxFontInstance *wxFontFace::GetFontInstance(float ptSize, bool aa)
-{
-    if ( gs_antialiasingThreshold == -1 )
-    {
-        gs_antialiasingThreshold = 10;
-#if wxUSE_SYSTEM_OPTIONS
-        if ( wxSystemOptions::HasOption(wxT("mgl.aa-threshold")) )
-            gs_antialiasingThreshold =
-                wxSystemOptions::GetOptionInt(wxT("mgl.aa-threshold"));
-        wxLogTrace("mgl_font", "AA threshold set to %i", gs_antialiasingThreshold);
-#endif
-    }
-
-    // Small characters don't look good when antialiased with the algorithm
-    // that FreeType uses (mere 2x2 supersampling), so let's disable AA
-    // completely for small fonts. Bitmap fonts are not antialiased either.
-    if ( ptSize <= gs_antialiasingThreshold ||
-         m_fontLib->fontLibType == MGL_BITMAPFONT_LIB )
-    {
-        aa = false;
-    }
-
-    return wxFontFaceBase::GetFontInstance(ptSize, aa);
-}
-
-wxFontInstance *wxFontFace::CreateFontInstance(float ptSize, bool aa)
-{
-    wxASSERT_MSG( m_fontLib, wxT("font library not loaded!") );
-
-    return new wxFontInstance(ptSize, aa, m_fontLib);
-}
-
-// ----------------------------------------------------------------------------
-// wxFontBundle
-// ----------------------------------------------------------------------------
-
-wxFontBundle::wxFontBundle(const font_info_t *info)
-    : m_fontInfo(info)
-{
-    if ( info->regularFace[0] != '\0' )
-        m_faces[FaceType_Regular] = new wxFontFace(info->regularFace);
-
-    if ( info->italicFace[0] != '\0' )
-        m_faces[FaceType_Italic] = new wxFontFace(info->italicFace);
-
-    if ( info->boldFace[0] != '\0' )
-        m_faces[FaceType_Bold] = new wxFontFace(info->boldFace);
-
-    if ( info->boldItalicFace[0] != '\0' )
-        m_faces[FaceType_BoldItalic] = new wxFontFace(info->boldItalicFace);
-
-    wxLogTrace("mgl_font", "new family '%s' (r=%s, i=%s, b=%s, bi=%s)\n",
-               info->familyName, info->regularFace, info->italicFace,
-               info->boldFace, info->boldItalicFace);
-}
-
-wxString wxFontBundle::GetName() const
-{
-    return wxString::FromAscii(m_fontInfo->familyName);
-}
-
-bool wxFontBundle::IsFixed() const
-{
-    return m_fontInfo->isFixed;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxFontsManager
-// ----------------------------------------------------------------------------
-
-wxString wxFontsManager::GetDefaultFacename(wxFontFamily family) const
-{
-    switch ( family )
-    {
-        case wxSCRIPT:
-            return wxT("Script");
-        case wxDECORATIVE:
-            return wxT("Charter");
-        case wxROMAN:
-            return wxT("Times");
-        case wxTELETYPE:
-        case wxMODERN:
-            return wxT("Courier");
-        case wxSWISS:
-        case wxDEFAULT:
-        default:
-            return wxT("Helvetica");
-    }
-}
-
-static ibool MGLAPI enum_callback(const font_info_t *info, void *cookie)
-{
-    wxFontsManager *db = (wxFontsManager*)cookie;
-    db->AddBundle(new wxFontBundle(info));
-    return TRUE;
-}
-
-void wxFontsManager::AddAllFonts()
-{
-    MGL_enumerateFonts(enum_callback, (void*)this);
-}
diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
deleted file mode 100644
index f58bcc6be6..0000000000
--- a/src/mgl/fontutil.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/fontutil.cpp
-// Purpose:     Font helper functions for MGL
-// Author:      Vaclav Slavik
-// Created:     2001/04/29
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/hash.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/fontutil.h"
-#include "wx/encinfo.h"
-#include "wx/fontmap.h"
-#include "wx/tokenzr.h"
-
-#include "wx/listimpl.cpp"
-#include "wx/sysopt.h"
-#include "wx/mgl/private.h"
-#include "wx/private/fontmgr.h"
-
-#include <mgraph.h>
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-// convert to/from the string representation: format is
-//      encoding[;facename]
-bool wxNativeEncodingInfo::FromString(const wxString& s)
-{
-    wxStringTokenizer tokenizer(s, wxT(";"));
-
-    wxString encid = tokenizer.GetNextToken();
-    long enc;
-    if ( !encid.ToLong(&enc) )
-        return false;
-    encoding = (wxFontEncoding)enc;
-
-    // ok even if empty
-    facename = tokenizer.GetNextToken();
-
-    return true;
-}
-
-wxString wxNativeEncodingInfo::ToString() const
-{
-    wxString s;
-    s << (long)encoding;
-    if ( !facename.empty() )
-    {
-        s << wxT(';') << facename;
-    }
-
-    return s;
-}
-
-// ----------------------------------------------------------------------------
-// common functions
-// ----------------------------------------------------------------------------
-
-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                             wxNativeEncodingInfo *info)
-{
-    wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );
-
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-        encoding = wxFont::GetDefaultEncoding();
-    }
-
-    switch ( encoding )
-    {
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_ISO8859_2:
-        case wxFONTENCODING_ISO8859_3:
-        case wxFONTENCODING_ISO8859_4:
-        case wxFONTENCODING_ISO8859_5:
-        case wxFONTENCODING_ISO8859_6:
-        case wxFONTENCODING_ISO8859_7:
-        case wxFONTENCODING_ISO8859_8:
-        case wxFONTENCODING_ISO8859_9:
-        case wxFONTENCODING_ISO8859_10:
-        case wxFONTENCODING_ISO8859_11:
-        case wxFONTENCODING_ISO8859_13:
-        case wxFONTENCODING_ISO8859_14:
-        case wxFONTENCODING_ISO8859_15:
-            info->mglEncoding = MGL_ENCODING_ISO8859_1 +
-                                (encoding - wxFONTENCODING_ISO8859_1);
-            break;
-
-        case wxFONTENCODING_KOI8:
-            info->mglEncoding = MGL_ENCODING_KOI8;
-            break;
-
-        case wxFONTENCODING_CP1250:
-        case wxFONTENCODING_CP1251:
-        case wxFONTENCODING_CP1252:
-        case wxFONTENCODING_CP1253:
-        case wxFONTENCODING_CP1254:
-        case wxFONTENCODING_CP1255:
-        case wxFONTENCODING_CP1256:
-        case wxFONTENCODING_CP1257:
-            info->mglEncoding = MGL_ENCODING_CP1250 +
-                                (encoding - wxFONTENCODING_CP1250);
-            break;
-
-        case wxFONTENCODING_SYSTEM:
-            info->mglEncoding = MGL_ENCODING_ASCII;
-            break;
-
-        default:
-            // encoding not known to MGL
-            return false;
-    }
-
-    info->encoding = encoding;
-
-    return true;
-}
-
-bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
-{
-    if ( !info.facename )
-        return true;
-
-    wxFontBundle *bundle = wxFontsManager::Get()->GetBundle(info.facename);
-    if ( !bundle )
-        return false;
-    if ( bundle->GetInfo()->fontLibType == MGL_BITMAPFONT_LIB )
-    {
-        return (info.mglEncoding == MGL_ENCODING_ASCII ||
-                info.mglEncoding == MGL_ENCODING_ISO8859_1 ||
-                info.mglEncoding == MGL_ENCODING_ISO8859_15 ||
-                info.mglEncoding == MGL_ENCODING_CP1252);
-    }
-    else
-        return true;
-}
diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp
deleted file mode 100644
index fcac1e22ea..0000000000
--- a/src/mgl/palette.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/palette.cpp
-// Author:      Vaclav Slavik
-// Created:     2001/03/11
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/palette.h"
-#include <mgraph.h>
-
-
-//-----------------------------------------------------------------------------
-// wxPalette
-//-----------------------------------------------------------------------------
-
-class wxPaletteRefData: public wxObjectRefData
-{
-    public:
-        wxPaletteRefData(void);
-        virtual ~wxPaletteRefData(void);
-
-        int m_count;
-        palette_t *m_entries;
-};
-
-wxPaletteRefData::wxPaletteRefData()
-{
-    m_count = 0;
-    m_entries = NULL;
-}
-
-wxPaletteRefData::~wxPaletteRefData()
-{
-    delete[] m_entries;
-}
-
-//-----------------------------------------------------------------------------
-
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
-
-wxPalette::wxPalette()
-{
-    m_refData = NULL;
-}
-
-wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
-{
-    Create(n, red, green, blue);
-}
-
-wxPalette::~wxPalette()
-{
-}
-
-bool wxPalette::Create(int n,
-                       const unsigned char *red,
-                       const unsigned char *green,
-                       const unsigned char *blue)
-{
-    UnRef();
-    m_refData = new wxPaletteRefData();
-
-    M_PALETTEDATA->m_count = n;
-    M_PALETTEDATA->m_entries = new palette_t[n];
-
-    palette_t *e = M_PALETTEDATA->m_entries;
-    for (int i = 0; i < n; i++, e++)
-    {
-        e->red = red[i];
-        e->green = green[i];
-        e->blue = blue[i];
-        e->alpha = 0;
-    }
-
-    return true;
-}
-
-int wxPalette::GetPixel(unsigned char red,
-                        unsigned char green,
-                        unsigned char blue) const
-{
-    if (!m_refData) return wxNOT_FOUND;
-
-    int closest = 0;
-    double d, distance = 1000.0; // max. dist is 256
-
-    palette_t *e = M_PALETTEDATA->m_entries;
-    for (int i = 0; i < M_PALETTEDATA->m_count; i++, e++)
-    {
-        if ((d = 0.299 * abs(red - e->red) +
-                 0.587 * abs(green - e->green) +
-                 0.114 * abs(blue - e->blue)) < distance) {
-            distance = d;
-            closest = i;
-        }
-    }
-
-    return closest;
-}
-
-bool wxPalette::GetRGB(int pixel,
-                       unsigned char *red,
-                       unsigned char *green,
-                       unsigned char *blue) const
-{
-    if (!m_refData) return false;
-    if (pixel >= M_PALETTEDATA->m_count) return false;
-
-    palette_t& p = M_PALETTEDATA->m_entries[pixel];
-    if (red) *red = p.red;
-    if (green) *green = p.green;
-    if (blue) *blue = p.blue;
-    return true;
-}
-
-int wxPalette::GetColoursCount() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid palette") );
-    return M_PALETTEDATA->m_count;
-}
-
-palette_t *wxPalette::GetMGLpalette_t() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid palette") );
-    return M_PALETTEDATA->m_entries;
-}
diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
deleted file mode 100644
index 25572afe19..0000000000
--- a/src/mgl/pen.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/pen.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/pen.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/bitmap.h"
-    #include "wx/colour.h"
-#endif
-
-#include "wx/mgl/private.h"
-
-//-----------------------------------------------------------------------------
-// wxPen
-//-----------------------------------------------------------------------------
-
-class wxPenRefData: public wxObjectRefData
-{
-public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-
-    bool operator==(const wxPenRefData& data) const
-    {
-        // we intentionally don't compare m_hPen fields here
-        return m_style == data.m_style &&
-               m_width == data.m_width &&
-               memcmp(&m_pixPattern,
-                      &data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&
-               m_capStyle == data.m_capStyle &&
-               m_joinStyle == data.m_joinStyle &&
-               m_colour == data.m_colour &&
-               (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
-               (m_style != wxPENSTYLE_USER_DASH ||
-                (m_dash == data.m_dash &&
-                    memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
-    }
-
-    int            m_width;
-    wxPenStyle     m_style;
-    wxColour       m_colour;
-    wxBitmap       m_stipple;
-    pixpattern24_t m_pixPattern;
-
-    // not used by wxMGL, but we want to preserve values
-    wxPenJoin      m_joinStyle;
-    wxPenCap       m_capStyle;
-    int            m_countDashes;
-    wxDash        *m_dash;
-};
-
-wxPenRefData::wxPenRefData()
-{
-    m_width = 1;
-    m_style = wxPENSTYLE_SOLID;
-    m_joinStyle = wxJOIN_ROUND;
-    m_capStyle = wxCAP_ROUND;
-    m_dash = NULL;
-    m_countDashes = 0;
-
-    int x, y, c;
-    for (y = 0; y < 8; y++)
-        for (x = 0; x < 8; x++)
-            for (c = 0; c < 3; c++)
-                m_pixPattern.p[x][y][c] = 0;
-}
-
-wxPenRefData::wxPenRefData(const wxPenRefData& data)
-{
-    m_style = data.m_style;
-    m_width = data.m_width;
-    m_joinStyle = data.m_joinStyle;
-    m_capStyle = data.m_capStyle;
-    m_colour = data.m_colour;
-    m_countDashes = data.m_countDashes;
-    m_dash = data.m_dash;
-    m_stipple = data.m_stipple;
-
-    int x, y, c;
-    for (y = 0; y < 8; y++)
-        for (x = 0; x < 8; x++)
-            for (c = 0; c < 3; c++)
-                m_pixPattern.p[x][y][c] = data.m_pixPattern.p[x][y][c];
-}
-
-//-----------------------------------------------------------------------------
-
-#define M_PENDATA ((wxPenRefData *)m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
-
-wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)
-{
-    m_refData = new wxPenRefData();
-    M_PENDATA->m_width = width;
-    M_PENDATA->m_style = style;
-    M_PENDATA->m_colour = colour;
-}
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-wxPen::wxPen(const wxColour& colour, int width, int style)
-{
-    m_refData = new wxPenRefData();
-    M_PENDATA->m_width = width;
-    M_PENDATA->m_style = (wxPenStyle)style;
-    M_PENDATA->m_colour = colour;
-}
-#endif
-
-wxPen::wxPen(const wxBitmap& stipple, int width)
-{
-    wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );
-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
-                  wxT("stipple bitmap must be 8x8") );
-
-    m_refData = new wxPenRefData();
-    M_PENDATA->m_width = width;
-    M_PENDATA->m_style = wxPENSTYLE_STIPPLE;
-    M_PENDATA->m_stipple = stipple;
-    wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
-}
-
-bool wxPen::operator == (const wxPen& pen) const
-{
-    if (m_refData == pen.m_refData) return true;
-
-    if (!m_refData || !pen.m_refData) return false;
-
-    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
-}
-
-bool wxPen::operator != (const wxPen& pen) const
-{
-    return m_refData != pen.m_refData;
-}
-
-void wxPen::SetColour(const wxColour &colour)
-{
-    AllocExclusive();
-    M_PENDATA->m_colour = colour;
-}
-
-void wxPen::SetDashes(int number_of_dashes, const wxDash *dash)
-{
-    AllocExclusive();
-    M_PENDATA->m_countDashes = number_of_dashes;
-    M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
-}
-
-void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue)
-{
-    AllocExclusive();
-    M_PENDATA->m_colour.Set(red, green, blue);
-}
-
-void wxPen::SetCap(wxPenCap capStyle)
-{
-    AllocExclusive();
-    M_PENDATA->m_capStyle = capStyle;
-}
-
-void wxPen::SetJoin(wxPenJoin joinStyle)
-{
-    AllocExclusive();
-    M_PENDATA->m_joinStyle = joinStyle;
-}
-
-void wxPen::SetStyle(wxPenStyle style)
-{
-    AllocExclusive();
-    M_PENDATA->m_style = style;
-}
-
-void wxPen::SetStipple(const wxBitmap& stipple)
-{
-    wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );
-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
-                  wxT("stipple bitmap must be 8x8") );
-
-    AllocExclusive();
-    M_PENDATA->m_stipple = stipple;
-    wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
-}
-
-void wxPen::SetWidth(int width)
-{
-    AllocExclusive();
-    M_PENDATA->m_width = width;
-}
-
-int wxPen::GetDashes(wxDash **ptr) const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    *ptr = (wxDash*)M_PENDATA->m_dash;
-    return M_PENDATA->m_countDashes;
-}
-
-int wxPen::GetDashCount() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return (M_PENDATA->m_countDashes);
-}
-
-wxDash* wxPen::GetDash() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
-
-    return (wxDash*)M_PENDATA->m_dash;
-}
-
-wxPenCap wxPen::GetCap() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return M_PENDATA->m_capStyle;
-}
-
-wxPenJoin wxPen::GetJoin() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return M_PENDATA->m_joinStyle;
-}
-
-wxPenStyle wxPen::GetStyle() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return M_PENDATA->m_style;
-}
-
-int wxPen::GetWidth() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return M_PENDATA->m_width;
-}
-
-wxColour wxPen::GetColour() const
-{
-    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
-
-    return M_PENDATA->m_colour;
-}
-
-wxBitmap *wxPen::GetStipple() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
-
-    return &(M_PENDATA->m_stipple);
-}
-
-void* wxPen::GetPixPattern() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
-
-    return (void*)&(M_PENDATA->m_pixPattern);
-}
-
-
-wxGDIRefData *wxPen::CreateGDIRefData() const
-{
-    return new wxPenRefData;
-}
-
-wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxPenRefData(*(wxPenRefData *)data);
-}
diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
deleted file mode 100644
index 7a93ccce57..0000000000
--- a/src/mgl/region.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:      src/mgl/region.cpp
-// Purpose:   Region handling for wxWidgets/MGL
-// Author:    Vaclav Slavik
-// RCS-ID:    $Id$
-// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:   wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/region.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/gdicmn.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/thread.h"
-
-#include <mgraph.hpp>
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxRegionRectList)
-
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
-
-//-----------------------------------------------------------------------------
-// wxRegionRefData implementation
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxRegionRefData : public wxGDIRefData
-{
-public:
-    wxRegionRefData() {}
-
-    wxRegionRefData(const wxRegionRefData& data)
-    {
-        m_region = data.m_region;
-    }
-
-    virtual ~wxRegionRefData() {}
-
-    MGLRegion m_region;
-};
-
-#define M_REGION       (((wxRegionRefData*)m_refData)->m_region)
-#define M_REGION_OF(r) (((wxRegionRefData*)(r.m_refData))->m_region)
-
-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
-
-wxGDIRefData *wxRegion::CreateGDIRefData() const
-{
-    return new wxRegionRefData;
-}
-
-wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxRegionRefData(*(wxRegionRefData *)data);
-}
-
-/*
- * Create an empty region.
- */
-wxRegion::wxRegion()
-{
-    m_refData = NULL;
-}
-
-wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
-{
-    m_refData = new wxRegionRefData;
-    MGLRect rect(x, y, x + w, y + h);
-    M_REGION = rect;
-}
-
-wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
-{
-    m_refData = new wxRegionRefData;
-    MGLRect rect(topLeft.x, topLeft.y, bottomRight.x+1, bottomRight.y+1);
-    M_REGION = rect;
-}
-
-wxRegion::wxRegion(const wxRect& r)
-{
-    m_refData = new wxRegionRefData;
-    MGLRect rect(r.GetLeft(), r.GetTop(), r.GetRight()+1, r.GetBottom()+1);
-    M_REGION = rect;
-}
-
-wxRegion::wxRegion(const MGLRegion& region)
-{
-    m_refData = new wxRegionRefData;
-    M_REGION = region;
-}
-
-wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
-{
-    m_refData = new wxRegionRefData;
-    point_t *pts = new point_t[n];
-
-    for (size_t i = 0; i < n; i++)
-    {
-        pts[i].x = points[i].x;
-        pts[i].y = points[i].y;
-    }
-
-    region_t* rgn = MGL_rgnPolygon(n, pts, 1, 0, 0);
-
-    M_REGION = rgn;
-
-    delete [] pts;
-}
-
-wxRegion::~wxRegion()
-{
-    // m_refData unrefed in ~wxObject
-}
-
-const MGLRegion& wxRegion::GetMGLRegion() const
-{
-    return M_REGION;
-}
-
-//-----------------------------------------------------------------------------
-// Modify region
-//-----------------------------------------------------------------------------
-
-// Clear current region
-void wxRegion::Clear()
-{
-    UnRef();
-}
-
-
-//-----------------------------------------------------------------------------
-// Information on region
-//-----------------------------------------------------------------------------
-
-bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const
-{
-    wxFAIL_MSG( wxT("not implemented") );
-
-    return false;
-}
-
-// Outer bounds of region
-bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
-{
-    if (m_refData)
-    {
-        rect_t rect;
-        rect = M_REGION.getBounds();
-        x = rect.left;
-        y = rect.top;
-        w = rect.right - rect.left;
-        h = rect.bottom - rect.top;
-
-        return true;
-    }
-    else
-    {
-        x = y = w = h = 0;
-        return false;
-    }
-}
-
-// Is region empty?
-bool wxRegion::IsEmpty() const
-{
-    if (!m_refData)
-        return true;
-
-    return (bool)(M_REGION.isEmpty());
-}
-
-//-----------------------------------------------------------------------------
-// Modifications
-//-----------------------------------------------------------------------------
-
-bool wxRegion::DoOffset(wxCoord x, wxCoord y)
-{
-    AllocExclusive();
-    M_REGION.offset(x, y);
-    return true;
-}
-
-// Union rectangle or region with this.
-bool wxRegion::DoUnionWithRect(const wxRect& r)
-{
-    AllocExclusive();
-    M_REGION += MGLRect(r.x, r.y, r.GetRight() + 1, r.GetHeight() + 1);
-    return true;
-}
-
-bool wxRegion::DoUnionWithRegion(const wxRegion& region)
-{
-    AllocExclusive();
-    M_REGION += M_REGION_OF(region);
-    return true;
-}
-
-bool wxRegion::DoIntersect(const wxRegion& region)
-{
-    AllocExclusive();
-    M_REGION &= M_REGION_OF(region);
-    return true;
-}
-
-bool wxRegion::DoSubtract(const wxRegion& region)
-{
-    AllocExclusive();
-    M_REGION -= M_REGION_OF(region);
-    return true;
-}
-
-bool wxRegion::DoXor(const wxRegion& region)
-{
-    AllocExclusive();
-    MGLRegion rg1 = M_REGION + M_REGION_OF(region),
-              rg2 = M_REGION & M_REGION_OF(region);
-    M_REGION = rg1 - rg2;
-    return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// Tests
-//-----------------------------------------------------------------------------
-
-// Does the region contain the point (x,y)?
-wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
-{
-    if (!m_refData)
-        return wxOutRegion;
-
-    if (M_REGION.includes((int)x, (int)y))
-        return wxInRegion;
-    else
-        return wxOutRegion;
-}
-
-// Does the region contain the rectangle (x, y, w, h)?
-wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
-{
-    if (!m_refData)
-        return wxOutRegion;
-
-    MGLRect rect(r.x, r.y, r.GetRight() + 1, r.GetBottom() + 1);
-    MGLRegion rg;
-
-    // 1) is the rectangle entirely covered by the region?
-    rg = MGLRegion(rect) - M_REGION;
-    if (rg.isEmpty())
-        return wxInRegion;
-
-    // 2) is the rectangle completely outside the region?
-    rg = M_REGION & rect; // intersection
-    if (rg.isEmpty())
-        return wxOutRegion;
-
-    // 3) neither case happened => it is partially covered:
-    return wxPartRegion;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//                               wxRegionIterator                                 //
-///////////////////////////////////////////////////////////////////////////////
-
-#if wxUSE_THREADS
-static wxMutex *gs_mutexIterator;
-
-class wxMglRegionModule : public wxModule
-{
-public:
-    virtual bool OnInit()
-    {
-        gs_mutexIterator = new wxMutex();
-        return true;
-    }
-    virtual void OnExit()
-    {
-        wxDELETE(gs_mutexIterator);
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxMglRegionModule)
-};
-IMPLEMENT_DYNAMIC_CLASS(wxMglRegionModule, wxModule)
-#endif
-
-/*
- * Initialize empty iterator
- */
-wxRegionIterator::wxRegionIterator() : m_currentNode(NULL)
-{
-    m_rects.DeleteContents(true);
-}
-
-wxRegionIterator::~wxRegionIterator()
-{
-}
-
-/*
- * Initialize iterator for region
- */
-wxRegionIterator::wxRegionIterator(const wxRegion& region)
-{
-    m_rects.DeleteContents(true);
-    Reset(region);
-}
-
-/*
- * Reset iterator for a new /e region.
- */
-
-
-static wxRegionRectList *gs_rectList;
-
-static void MGLAPI wxMGL_region_callback(const rect_t *r)
-{
-    gs_rectList->Append(new wxRect(r->left, r->top,
-                                   r->right - r->left, r->bottom - r->top));
-}
-
-void wxRegionIterator::Reset(const wxRegion& region)
-{
-    m_currentNode = NULL;
-    m_rects.Clear();
-
-    if (!region.Empty())
-    {
-#if wxUSE_THREADS
-        wxMutexLocker lock(*gs_mutexIterator);
-#endif
-        gs_rectList = &m_rects;
-        M_REGION_OF(region).traverse(wxMGL_region_callback);
-        m_currentNode = m_rects.GetFirst();
-    }
-}
-
-/*
- * Increment iterator. The rectangle returned is the one after the
- * incrementation.
- */
-void wxRegionIterator::operator ++ ()
-{
-    if (m_currentNode)
-        m_currentNode = m_currentNode->GetNext();
-}
-
-/*
- * Increment iterator. The rectangle returned is the one before the
- * incrementation.
- */
-void wxRegionIterator::operator ++ (int)
-{
-    if (m_currentNode)
-        m_currentNode = m_currentNode->GetNext();
-}
-
-wxCoord wxRegionIterator::GetX() const
-{
-    if (m_currentNode)
-        return m_currentNode->GetData()->x;
-    else
-        return 0;
-}
-
-wxCoord wxRegionIterator::GetY() const
-{
-    if (m_currentNode)
-        return m_currentNode->GetData()->y;
-    else
-        return 0;
-}
-
-wxCoord wxRegionIterator::GetW() const
-{
-    if (m_currentNode)
-        return m_currentNode->GetData()->width;
-    else
-        return 0;
-}
-
-wxCoord wxRegionIterator::GetH() const
-{
-    if (m_currentNode)
-        return m_currentNode->GetData()->height;
-    else
-        return 0;
-}
diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
deleted file mode 100644
index 107eb14b12..0000000000
--- a/src/mgl/settings.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/settings.cpp
-// Author:      Vaclav Slavik, Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/settings.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/colour.h"
-    #include "wx/font.h"
-    #include "wx/gdicmn.h"
-    #include "wx/module.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// global data
-// ----------------------------------------------------------------------------
-
-static wxFont *gs_fontDefault = NULL;
-
-class wxSystemSettingsModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit()
-    {
-        wxDELETE(gs_fontDefault);
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
-
-
-
-wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
-{
-    // overridden by wxSystemSettings::GetColour in wxUniversal
-    return wxColour(0,0,0);
-}
-
-wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
-{
-    switch (index)
-    {
-        case wxSYS_OEM_FIXED_FONT:
-        case wxSYS_ANSI_FIXED_FONT:
-        case wxSYS_SYSTEM_FIXED_FONT:
-        {
-            return *wxNORMAL_FONT;
-        }
-        case wxSYS_ANSI_VAR_FONT:
-        case wxSYS_SYSTEM_FONT:
-        case wxSYS_DEVICE_DEFAULT_FONT:
-        case wxSYS_DEFAULT_GUI_FONT:
-        {
-            if ( !gs_fontDefault )
-                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
-            return *gs_fontDefault;
-        }
-        default:
-        {
-        }
-    }
-
-    return wxNullFont;
-}
-
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
-{
-    int val;
-
-    switch (index)
-    {
-        case wxSYS_SCREEN_X:
-            wxDisplaySize(&val, NULL);
-            return val;
-        case wxSYS_SCREEN_Y:
-            wxDisplaySize(NULL, &val);
-            return val;
-        default:
-        {
-        }
-    }
-
-    return -1;  // unsupported metric
-}
-
-bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
-{
-    switch (index)
-    {
-        case wxSYS_CAN_ICONIZE_FRAME:
-        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-        case wxSYS_TABLET_PRESENT:
-            return false;
-
-        default:
-            wxFAIL_MSG( wxT("unknown feature") );
-    }
-
-    return false;
-}
diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
deleted file mode 100644
index d2ede3f43c..0000000000
--- a/src/mgl/toplevel.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/toplevel.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/toplevel.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif // WX_PRECOMP
-
-#include "wx/mgl/private.h"
-
-// ----------------------------------------------------------------------------
-// idle system
-// ----------------------------------------------------------------------------
-
-extern int g_openDialogs;
-
-// ----------------------------------------------------------------------------
-// event tables
-// ----------------------------------------------------------------------------
-
-#ifndef __WXUNIVERSAL__
-    IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
-#endif
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-void wxTopLevelWindowMGL::Init()
-{
-    m_isShown = false;
-    m_isIconized = false;
-    m_isMaximized = false;
-    m_fsIsShowing = false;
-    m_sizeSet = false;
-}
-
-bool wxTopLevelWindowMGL::Create(wxWindow *parent,
-                                 wxWindowID id,
-                                 const wxString& title,
-                                 const wxPoint& posOrig,
-                                 const wxSize& sizeOrig,
-                                 long style,
-                                 const wxString &name)
-{
-    // always create a frame of some reasonable, even if arbitrary, size (at
-    // least for MSW compatibility)
-    wxSize size = sizeOrig;
-    if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord )
-    {
-        wxSize sizeDefault = GetDefaultSize();
-        if ( size.x == wxDefaultCoord )
-            size.x = sizeDefault.x;
-        if ( size.y == wxDefaultCoord )
-            size.y = sizeDefault.y;
-    }
-
-    // for default positioning, centre the first top level window and
-    // cascade any addtional ones from there.
-    wxPoint pos = posOrig;
-    if ( pos.x == wxDefaultCoord || pos.y == wxDefaultCoord )
-    {
-        wxSize sizeDisplay = wxGetDisplaySize();
-        static wxPoint nextPos((sizeDisplay.x - size.x) / 2,
-                               (sizeDisplay.y - size.y) / 2);
-
-        if ( pos.x == wxDefaultCoord )
-            pos.x = nextPos.x;
-        if ( pos.y == wxDefaultCoord )
-            pos.y = nextPos.y;
-        if ( pos.x + size.x > sizeDisplay.x || pos.y + size.y > sizeDisplay.y )
-            pos = wxPoint();
-
-        const wxSize cascadeOffset(16, 20);
-        nextPos = pos + cascadeOffset;
-    }
-
-    wxWindow::Create(NULL, id, pos, size, style, name);
-    SetParent(parent);
-    if ( parent )
-        parent->AddChild(this);
-
-    wxTopLevelWindows.Append(this);
-    m_title = title;
-
-    return true;
-}
-
-bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
-{
-    if (show == m_fsIsShowing) return false; // return what?
-
-    m_fsIsShowing = show;
-
-    if (show)
-    {
-        m_fsSaveStyle = m_windowStyle;
-        m_fsSaveFlag = style;
-        GetPosition(&m_fsSaveFrame.x, &m_fsSaveFrame.y);
-        GetSize(&m_fsSaveFrame.width, &m_fsSaveFrame.height);
-
-        if ( style & wxFULLSCREEN_NOCAPTION )
-            m_windowStyle &= ~wxCAPTION;
-        if ( style & wxFULLSCREEN_NOBORDER )
-            m_windowStyle = wxSIMPLE_BORDER;
-
-        int x, y;
-        wxDisplaySize(&x, &y);
-        SetSize(0, 0, x, y);
-    }
-    else
-    {
-        m_windowStyle = m_fsSaveStyle;
-        SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
-                m_fsSaveFrame.width, m_fsSaveFrame.height);
-    }
-
-    return true;
-}
-
-bool wxTopLevelWindowMGL::Show(bool show)
-{
-    bool ret = wxTopLevelWindowBase::Show(show);
-
-    // If this is the first time Show was called, send size event,
-    // so that the frame can adjust itself (think auto layout or single child)
-    if ( !m_sizeSet )
-    {
-        m_sizeSet = true;
-        wxSizeEvent event(GetSize(), GetId());
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-
-    if ( ret && show && CanAcceptFocus() )
-        SetFocus();
-        // FIXME_MGL -- don't do this for popup windows?
-    return ret;
-}
-
-void wxTopLevelWindowMGL::Maximize(bool maximize)
-{
-    int x, y, w, h;
-    wxClientDisplayRect(&x, &y, &w, &h);
-
-    rect_t screenRect = MGL_defRect(x, y, w, h);
-    MGL_wmInvalidateRect(g_winMng, &screenRect);
-
-    if ( maximize && !m_isMaximized )
-    {
-        m_isMaximized = true;
-
-        GetPosition(&m_savedFrame.x, &m_savedFrame.y);
-        GetSize(&m_savedFrame.width, &m_savedFrame.height);
-
-        SetSize(x, y, w, h);
-    }
-    else if ( !maximize && m_isMaximized )
-    {
-        m_isMaximized = false;
-        SetSize(m_savedFrame.x, m_savedFrame.y,
-                m_savedFrame.width, m_savedFrame.height);
-    }
-}
-
-bool wxTopLevelWindowMGL::IsMaximized() const
-{
-    return m_isMaximized;
-}
-
-void wxTopLevelWindowMGL::Restore()
-{
-    if ( IsIconized() )
-    {
-        Iconize(false);
-    }
-    if ( IsMaximized() )
-    {
-        Maximize(false);
-    }
-}
-
-void wxTopLevelWindowMGL::Iconize(bool WXUNUSED(iconize))
-{
-    wxFAIL_MSG(wxT("Iconize not supported under wxMGL"));
-    // FIXME_MGL - Iconize is not supported in fullscreen mode.
-    //             It will be supported in windowed mode (if ever implemented in MGL...)
-}
-
-bool wxTopLevelWindowMGL::IsIconized() const
-{
-    return m_isIconized;
-}
diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
deleted file mode 100644
index 25618fdb3c..0000000000
--- a/src/mgl/utils.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/utils.cpp
-// Purpose:
-// Author:      Vaclav Slavik
-// Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/utils.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/apptrait.h"
-#include "wx/process.h"
-#include "wx/evtloop.h"
-
-#include <stdarg.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <mgraph.hpp>
-
-#ifdef __UNIX__
-#include "wx/unix/execute.h"
-#endif
-
-#include "wx/mgl/private.h"
-
-//----------------------------------------------------------------------------
-// misc.
-//----------------------------------------------------------------------------
-
-// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-wxMemorySize wxGetFreeMemory()
-{
-    // TODO - probably should be extracted to
-    //        src/msdos/utilsdos.cpp and src/unix/utilsunx.cpp
-    //        to avoid code duplication
-    return -1;
-}
-
-void wxBell()
-{
-    // FIXME_MGL
-}
-
-bool wxGetKeyState(wxKeyCode key)
-{
-    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
-        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
-
-    // TODO
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// display characterstics
-// ----------------------------------------------------------------------------
-
-void wxDisplaySize(int *width, int *height)
-{
-   wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
-    if (width) *width = g_displayDC->sizex()+1;
-    if (height) *height = g_displayDC->sizey()+1;
-}
-
-void wxDisplaySizeMM(int *width, int *height)
-{
-    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
-
-    int xDPI, yDPI;
-    MGL_getDotsPerInch(&xDPI, &yDPI);
-
-    if ( width )
-        *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);
-    if ( height )
-        *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
-}
-
-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
-{
-    if ( x ) *x = 0;
-    if ( y ) *y = 0;
-    wxDisplaySize(width, height);
-    // FIXME_MGL - windowed version needs different handling
-}
-
-bool wxColourDisplay()
-{
-    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
-
-    return (wxDisplayDepth() > 1);
-}
-
-int wxDisplayDepth()
-{
-    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
-
-    return g_displayDC->getBitsPerPixel();
-}
-
-wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
-{
-    if ( verMaj )
-        *verMaj = MGL_RELEASE_MAJOR;
-    if ( verMin )
-        *verMin = MGL_RELEASE_MINOR;
-
-    return wxPORT_MGL;
-}
-
-wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
-{
-    return new wxEventLoop;
-}
-
-
-void wxGetMousePosition(int* x, int* y)
-{
-    MS_getPos(x, y);
-}
-
-wxPoint wxGetMousePosition()
-{
-    wxPoint pt;
-    wxGetMousePosition(&pt.x, &pt.y);
-    return pt;
-}
-
-wxMouseState wxGetMouseState()
-{
-    wxMouseState ms;
-    int x, y;
-
-    wxGetMousePosition(&x, &y);
-
-    ms.SetX(x);
-    ms.SetY(y);
-
-    extern unsigned long g_buttonState;
-    ms.SetLeftDown(g_buttonState & EVT_LEFTBUT);
-    ms.SetMiddleDown(g_buttonState & EVT_MIDDLEBUT);
-    ms.SetRightDown(g_buttonState & EVT_RIGHTBUT);
-
-    ms.SetControlDown(EVT_isKeyDown(KB_leftCtrl) || EVT_isKeyDown(KB_rightCtrl));
-    ms.SetShiftDown(EVT_isKeyDown(KB_leftShift) || EVT_isKeyDown(KB_rightShift));
-    ms.SetAltDown(EVT_isKeyDown(KB_leftAlt));
-    ms.SetMetaDown(EVT_isKeyDown(KB_rightAlt));
-
-    return ms;
-}
-
diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
deleted file mode 100644
index ec655b4ebd..0000000000
--- a/src/mgl/window.cpp
+++ /dev/null
@@ -1,1208 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mgl/window.cpp
-// Purpose:     wxWindow
-// Author:      Vaclav Slavik
-//              (based on GTK & MSW implementations)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/window.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msgdlg.h"
-    #include "wx/accel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/panel.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/dcscreen.h"
-    #include "wx/menu.h"
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-    #include "wx/dnd.h"
-#endif
-
-#include "wx/sysopt.h"
-#include "wx/mgl/private.h"
-#include "wx/caret.h"
-
-#include <mgraph.hpp>
-
-#if wxUSE_TOOLTIPS
-    #include "wx/tooltip.h"
-#endif
-
-// ---------------------------------------------------------------------------
-// global variables
-// ---------------------------------------------------------------------------
-
-// MGL window manager and associated DC.
-winmng_t *g_winMng = NULL;
-MGLDevCtx *g_displayDC = NULL;
-
-// the window that has keyboard focus:
-static wxWindowMGL *gs_focusedWindow = NULL;
-// the window that is about to be focused after currently focused
-// one looses focus:
-static wxWindow *gs_toBeFocusedWindow = NULL;
-// the window that is currently under mouse cursor:
-static wxWindowMGL *gs_windowUnderMouse = NULL;
-// the window that has mouse capture
-static wxWindowMGL *gs_mouseCapture = NULL;
-// the frame that is currently active (i.e. its child has focus). It is
-// used to generate wxActivateEvents
-static wxWindowMGL *gs_activeFrame = NULL;
-// track the mouse button state for wxGetMouseState()
-unsigned long g_buttonState = 0;
-
-// ---------------------------------------------------------------------------
-// constants
-// ---------------------------------------------------------------------------
-
-// Custom identifiers used to distinguish between various event handlers
-// and capture handlers passed to MGL_wm
-enum
-{
-    wxMGL_CAPTURE_MOUSE = 1,
-    wxMGL_CAPTURE_KEYB  = 2
-};
-
-
-// ---------------------------------------------------------------------------
-// private functions
-// ---------------------------------------------------------------------------
-
-// Returns toplevel grandparent of given window:
-static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)
-{
-    wxWindowMGL *p = win;
-    while (p && !p->IsTopLevel())
-         p = p->GetParent();
-    return p;
-}
-
-// An easy way to capture screenshots:
-static void wxCaptureScreenshot(bool activeWindowOnly)
-{
-#ifdef __DOS__
-    #define SCREENSHOT_FILENAME wxT("sshot%03i.png")
-#else
-    #define SCREENSHOT_FILENAME wxT("screenshot-%03i.png")
-#endif
-    static int screenshot_num = 0;
-    wxString screenshot;
-
-    do
-    {
-        screenshot.Printf(SCREENSHOT_FILENAME, screenshot_num++);
-    } while ( wxFileExists(screenshot) && screenshot_num < 1000 );
-
-    wxRect r(0, 0, g_displayDC->sizex(), g_displayDC->sizey());
-
-    if ( activeWindowOnly && gs_activeFrame )
-    {
-        r.Intersect(gs_activeFrame->GetRect());
-    }
-
-    g_displayDC->savePNGFromDC(screenshot.mb_str(),
-                               r.x, r. y, r.x+r.width, r.y+r.height);
-
-    wxMessageBox(wxString::Format(wxT("Screenshot captured: %s"),
-                                  screenshot.c_str()));
-}
-
-// ---------------------------------------------------------------------------
-// MGL_WM hooks:
-// ---------------------------------------------------------------------------
-
-static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc)
-{
-    wxWindowMGL *w = (wxWindow*) wnd->userData;
-
-    if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )
-    {
-        MGLDevCtx ctx(dc);
-        w->HandlePaint(&ctx);
-    }
-}
-
-static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
-{
-    wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
-    wxPoint orig(win->GetClientAreaOrigin());
-    wxPoint where;
-
-    g_buttonState = e->modifiers;
-
-    MGL_wmCoordGlobalToLocal(win->GetHandle(),
-                             e->where_x, e->where_y, &where.x, &where.y);
-
-    for (wxWindowMGL *w = win; w; w = w->GetParent())
-    {
-        if ( !w->IsEnabled() )
-            return FALSE;
-        if ( w->IsTopLevel() )
-            break;
-    }
-
-    wxEventType type = wxEVT_NULL;
-    wxMouseEvent event;
-    event.SetEventObject(win);
-    event.SetTimestamp(e->when);
-    event.m_x = where.x - orig.x;
-    event.m_y = where.y - orig.y;
-    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
-    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
-    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
-    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
-    event.m_leftDown = ( e->modifiers & EVT_LEFTBUT ) != 0;
-    event.m_middleDown = ( e->modifiers & EVT_MIDDLEBUT ) != 0;
-    event.m_rightDown = ( e->modifiers & EVT_RIGHTBUT ) != 0;
-
-    switch (e->what)
-    {
-        case EVT_MOUSEDOWN:
-            // Change focus if the user clicks outside focused window:
-            if ( win->CanAcceptFocus() && wxWindow::FindFocus() != win )
-                win->SetFocus();
-
-            if ( e->message & EVT_DBLCLICK )
-            {
-                if ( e->message & EVT_LEFTBMASK )
-                    type = wxEVT_LEFT_DCLICK;
-                else if ( e->message & EVT_MIDDLEBMASK )
-                    type = wxEVT_MIDDLE_DCLICK;
-                else if ( e->message & EVT_RIGHTBMASK )
-                    type = wxEVT_RIGHT_DCLICK;
-            }
-            else
-            {
-                if ( e->message & EVT_LEFTBMASK )
-                    type = wxEVT_LEFT_DOWN;
-                else if ( e->message & EVT_MIDDLEBMASK )
-                    type = wxEVT_MIDDLE_DOWN;
-                else if ( e->message & EVT_RIGHTBMASK )
-                    type = wxEVT_RIGHT_DOWN;
-            }
-
-            break;
-
-        case EVT_MOUSEUP:
-            if ( e->message & EVT_LEFTBMASK )
-                type = wxEVT_LEFT_UP;
-            else if ( e->message & EVT_MIDDLEBMASK )
-                type = wxEVT_MIDDLE_UP;
-            else if ( e->message & EVT_RIGHTBMASK )
-                type = wxEVT_RIGHT_UP;
-            break;
-
-        case EVT_MOUSEMOVE:
-            if ( !gs_mouseCapture )
-            {
-                if ( win != gs_windowUnderMouse )
-                {
-                    if ( gs_windowUnderMouse )
-                    {
-                        wxMouseEvent event2(event);
-                        MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(),
-                                                 e->where_x, e->where_y,
-                                                 &event2.m_x, &event2.m_y);
-
-                        wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin());
-                        event2.m_x -= orig.x;
-                        event2.m_y -= orig.y;
-
-                        event2.SetEventObject(gs_windowUnderMouse);
-                        event2.SetEventType(wxEVT_LEAVE_WINDOW);
-                        gs_windowUnderMouse->HandleWindowEvent(event2);
-                    }
-
-                    wxMouseEvent event3(event);
-                    event3.SetEventType(wxEVT_ENTER_WINDOW);
-                    win->HandleWindowEvent(event3);
-
-                    gs_windowUnderMouse = win;
-                }
-            }
-            else // gs_mouseCapture
-            {
-                bool inside = (where.x >= 0 &&
-                               where.y >= 0 &&
-                               where.x < win->GetSize().x &&
-                               where.y < win->GetSize().y);
-                if ( (inside && gs_windowUnderMouse != win) ||
-                     (!inside && gs_windowUnderMouse == win) )
-                {
-                    wxMouseEvent evt(inside ?
-                                     wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
-                    evt.SetEventObject(win);
-                    win->HandleWindowEvent(evt);
-                    gs_windowUnderMouse = inside ? win : NULL;
-                }
-            }
-
-            type = wxEVT_MOTION;
-            break;
-
-        default:
-            break;
-    }
-
-    if ( type == wxEVT_NULL )
-    {
-        return FALSE;
-    }
-    else
-    {
-        event.SetEventType(type);
-        return win->HandleWindowEvent(event);
-    }
-}
-
-static long wxScanToKeyCode(event_t *event, bool translate)
-{
-    // VS: make it __WXDEBUG__-only, since we have lots of wxLogTrace calls
-    //     here and the arguments would be stored in non-debug executable even
-    //     though wxLogTrace would be no-op...
-    #ifdef __WXDEBUG__
-      #define KEY(mgl_key,wx_key) \
-        case mgl_key: \
-          wxLogTrace(wxT("keyevents"), \
-                     wxT("key " #mgl_key ", mapped to " #wx_key)); \
-          key = wx_key; \
-          break;
-    #else
-      #define KEY(mgl_key,wx_key) \
-        case mgl_key: key = wx_key; break;
-    #endif
-
-    long key = 0;
-
-    if ( translate )
-    {
-        bool numlock = (event->modifiers & EVT_NUMLOCK) != 0;
-
-        switch ( EVT_scanCode(event->message) )
-        {
-            KEY (KB_padMinus,       WXK_NUMPAD_SUBTRACT)
-            KEY (KB_padPlus,        WXK_NUMPAD_ADD)
-            KEY (KB_padTimes,       WXK_NUMPAD_MULTIPLY)
-            KEY (KB_padDivide,      WXK_NUMPAD_DIVIDE)
-            KEY (KB_padCenter,      numlock ? WXK_NUMPAD5 : WXK_NUMPAD_SEPARATOR) // ?
-            KEY (KB_padLeft,        numlock ? WXK_NUMPAD4 : WXK_NUMPAD_LEFT)
-            KEY (KB_padRight,       numlock ? WXK_NUMPAD6 : WXK_NUMPAD_RIGHT)
-            KEY (KB_padUp,          numlock ? WXK_NUMPAD8 : WXK_NUMPAD_UP)
-            KEY (KB_padDown,        numlock ? WXK_NUMPAD2 : WXK_NUMPAD_DOWN)
-            KEY (KB_padInsert,      numlock ? WXK_NUMPAD0 : WXK_NUMPAD_INSERT)
-            KEY (KB_padDelete,      numlock ? WXK_DECIMAL : WXK_NUMPAD_DELETE)
-            KEY (KB_padHome,        numlock ? WXK_NUMPAD7 : WXK_NUMPAD_HOME)
-            KEY (KB_padEnd,         numlock ? WXK_NUMPAD1 : WXK_NUMPAD_END)
-            KEY (KB_padPageUp,      numlock ? WXK_NUMPAD9 : WXK_NUMPAD_PAGEUP)
-            KEY (KB_padPageDown,    numlock ? WXK_NUMPAD3 : WXK_NUMPAD_PAGEDOWN)
-            KEY (KB_1,              '1')
-            KEY (KB_2,              '2')
-            KEY (KB_3,              '3')
-            KEY (KB_4,              '4')
-            KEY (KB_5,              '5')
-            KEY (KB_6,              '6')
-            KEY (KB_7,              '7')
-            KEY (KB_8,              '8')
-            KEY (KB_9,              '9')
-            KEY (KB_0,              '0')
-            KEY (KB_minus,          WXK_SUBTRACT)
-            KEY (KB_equals,         WXK_ADD)
-            KEY (KB_backSlash,      '\\')
-            KEY (KB_Q,              'Q')
-            KEY (KB_W,              'W')
-            KEY (KB_E,              'E')
-            KEY (KB_R,              'R')
-            KEY (KB_T,              'T')
-            KEY (KB_Y,              'Y')
-            KEY (KB_U,              'U')
-            KEY (KB_I,              'I')
-            KEY (KB_O,              'O')
-            KEY (KB_P,              'P')
-            KEY (KB_leftSquareBrace,'[')
-            KEY (KB_rightSquareBrace,']')
-            KEY (KB_A,              'A')
-            KEY (KB_S,              'S')
-            KEY (KB_D,              'D')
-            KEY (KB_F,              'F')
-            KEY (KB_G,              'G')
-            KEY (KB_H,              'H')
-            KEY (KB_J,              'J')
-            KEY (KB_K,              'K')
-            KEY (KB_L,              'L')
-            KEY (KB_semicolon,      ';')
-            KEY (KB_apostrophe,     '\'')
-            KEY (KB_Z,              'Z')
-            KEY (KB_X,              'X')
-            KEY (KB_C,              'C')
-            KEY (KB_V,              'V')
-            KEY (KB_B,              'B')
-            KEY (KB_N,              'N')
-            KEY (KB_M,              'M')
-            KEY (KB_comma,          ',')
-            KEY (KB_period,         '.')
-            KEY (KB_divide,         WXK_DIVIDE)
-            KEY (KB_space,          WXK_SPACE)
-            KEY (KB_tilde,          '~')
-
-            default: break;
-        }
-    }
-
-    if ( key == 0 )
-    {
-        switch ( EVT_scanCode(event->message) )
-        {
-            KEY (KB_padEnter,       WXK_NUMPAD_ENTER)
-            KEY (KB_F1,             WXK_F1)
-            KEY (KB_F2,             WXK_F2)
-            KEY (KB_F3,             WXK_F3)
-            KEY (KB_F4,             WXK_F4)
-            KEY (KB_F5,             WXK_F5)
-            KEY (KB_F6,             WXK_F6)
-            KEY (KB_F7,             WXK_F7)
-            KEY (KB_F8,             WXK_F8)
-            KEY (KB_F9,             WXK_F9)
-            KEY (KB_F10,            WXK_F10)
-            KEY (KB_F11,            WXK_F11)
-            KEY (KB_F12,            WXK_F12)
-            KEY (KB_left,           WXK_LEFT)
-            KEY (KB_right,          WXK_RIGHT)
-            KEY (KB_up,             WXK_UP)
-            KEY (KB_down,           WXK_DOWN)
-            KEY (KB_insert,         WXK_INSERT)
-            KEY (KB_delete,         WXK_DELETE)
-            KEY (KB_home,           WXK_HOME)
-            KEY (KB_end,            WXK_END)
-            KEY (KB_pageUp,         WXK_PAGEUP)
-            KEY (KB_pageDown,       WXK_PAGEDOWN)
-            KEY (KB_capsLock,       WXK_CAPITAL)
-            KEY (KB_numLock,        WXK_NUMLOCK)
-            KEY (KB_scrollLock,     WXK_SCROLL)
-            KEY (KB_leftShift,      WXK_SHIFT)
-            KEY (KB_rightShift,     WXK_SHIFT)
-            KEY (KB_leftCtrl,       WXK_CONTROL)
-            KEY (KB_rightCtrl,      WXK_CONTROL)
-            KEY (KB_leftAlt,        WXK_ALT)
-            KEY (KB_rightAlt,       WXK_ALT)
-            KEY (KB_leftWindows,    WXK_START)
-            KEY (KB_rightWindows,   WXK_START)
-            KEY (KB_menu,           WXK_MENU)
-            KEY (KB_sysReq,         WXK_SNAPSHOT)
-            KEY (KB_esc,            WXK_ESCAPE)
-            KEY (KB_backspace,      WXK_BACK)
-            KEY (KB_tab,            WXK_TAB)
-            KEY (KB_enter,          WXK_RETURN)
-
-            default:
-                key = EVT_asciiCode(event->message);
-                break;
-        }
-    }
-
-    #undef KEY
-
-    return key;
-}
-
-static bool wxHandleSpecialKeys(wxKeyEvent& event)
-{
-    // Add an easy way to capture screenshots:
-    if ( event.m_keyCode == WXK_SNAPSHOT
-    #ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL!
-         || (event.m_keyCode == WXK_F1 &&
-            event.m_shiftDown && event.m_controlDown)
-    #endif
-       )
-    {
-        wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
-        return true;
-    }
-
-    return false;
-}
-
-static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
-{
-    wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
-
-    if ( !win->IsEnabled() ) return FALSE;
-
-    wxPoint where;
-    MGL_wmCoordGlobalToLocal(win->GetHandle(),
-                             e->where_x, e->where_y, &where.x, &where.y);
-
-    wxKeyEvent event;
-    event.SetEventObject(win);
-    event.SetTimestamp(e->when);
-    event.m_keyCode = wxScanToKeyCode(e, true);
-    event.m_x = where.x;
-    event.m_y = where.y;
-    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
-    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
-    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
-    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
-
-    if ( e->what == EVT_KEYUP )
-    {
-        event.SetEventType(wxEVT_KEY_UP);
-        return win->HandleWindowEvent(event);
-    }
-    else
-    {
-        bool ret;
-        wxKeyEvent event2;
-
-        event.SetEventType(wxEVT_KEY_DOWN);
-        event2 = event;
-
-        ret = win->HandleWindowEvent(event);
-
-        // wxMSW doesn't send char events with Alt pressed
-        // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
-        // will only be sent if it is not in an accelerator table:
-        event2.m_keyCode = wxScanToKeyCode(e, false);
-        if ( !ret && event2.m_keyCode != 0 )
-        {
-            event2.SetEventType(wxEVT_CHAR);
-            ret = win->HandleWindowEvent(event2);
-        }
-
-        // Synthetize navigation key event, but do it only if the TAB key
-        // wasn't handled yet:
-        if ( !ret && event.m_keyCode == WXK_TAB &&
-             win->GetParent() && win->GetParent()->HasFlag(wxTAB_TRAVERSAL) )
-        {
-            wxNavigationKeyEvent navEvent;
-            navEvent.SetEventObject(win->GetParent());
-            // Shift-TAB goes in reverse direction:
-            navEvent.SetDirection(!event.m_shiftDown);
-            // Ctrl-TAB changes the (parent) window, i.e. switch notebook page:
-            navEvent.SetWindowChange(event.m_controlDown);
-            navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow));
-            ret = win->HandleWindowEvent(navEvent);
-        }
-
-        // Finally, process special meaning keys that are usually
-        // a responsibility of OS or window manager:
-        if ( !ret )
-            ret = wxHandleSpecialKeys(event);
-
-        return ret;
-    }
-}
-
-// ---------------------------------------------------------------------------
-// event tables
-// ---------------------------------------------------------------------------
-
-// in wxUniv this class is abstract because it doesn't have DoPopupMenu()
-IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
-
-BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)
-END_EVENT_TABLE()
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-// ----------------------------------------------------------------------------
-// constructors and such
-// ----------------------------------------------------------------------------
-
-extern wxVideoMode wxGetDefaultDisplayMode();
-
-void wxWindowMGL::Init()
-{
-    // First of all, make sure window manager is up and running. If it is
-    // not the case, initialize it in default display mode
-    if ( !g_winMng )
-    {
-        if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
-        {
-            wxLogFatalError(_("Cannot initialize display."));
-        }
-    }
-
-    // mgl specific:
-    m_wnd = NULL;
-    m_isShown = true;
-    m_paintMGLDC = NULL;
-    m_eraseBackground = -1;
-}
-
-// Destructor
-wxWindowMGL::~wxWindowMGL()
-{
-    SendDestroyEvent();
-
-    if ( gs_mouseCapture == this )
-        ReleaseMouse();
-
-    if (gs_activeFrame == this)
-    {
-        gs_activeFrame = NULL;
-        // activate next frame in Z-order:
-        if ( m_wnd->prev )
-        {
-            wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
-            win->SetFocus();
-        }
-        else if ( m_wnd->next )
-        {
-            wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
-            win->SetFocus();
-        }
-    }
-
-    if ( gs_focusedWindow == this )
-        KillFocus();
-
-    if ( gs_windowUnderMouse == this )
-        gs_windowUnderMouse = NULL;
-
-    DestroyChildren();
-
-    if ( m_wnd )
-        MGL_wmDestroyWindow(m_wnd);
-}
-
-// real construction (Init() must have been called before!)
-bool wxWindowMGL::Create(wxWindow *parent,
-                         wxWindowID id,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         const wxString& name)
-{
-    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return false;
-
-    if ( parent )
-        parent->AddChild(this);
-
-    int x, y, w, h;
-    x = pos.x, y = pos.y;
-    if ( x == -1 )
-        x = 0; // FIXME_MGL, something better, see GTK+
-    if ( y == -1 )
-        y = 0; // FIXME_MGL, something better, see GTK+
-    AdjustForParentClientOrigin(x, y, 0);
-    w = WidthDefault(size.x);
-    h = HeightDefault(size.y);
-
-    long mgl_style = 0;
-    window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
-
-    if ( style & wxFULL_REPAINT_ON_RESIZE )
-    {
-        mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
-    }
-    if ( style & wxSTAY_ON_TOP )
-    {
-        mgl_style |= MGL_WM_ALWAYS_ON_TOP;
-    }
-    if ( style & wxPOPUP_WINDOW )
-    {
-        mgl_style |= MGL_WM_ALWAYS_ON_TOP;
-        // it is created hidden as other top level windows
-        m_isShown = false;
-        wnd_parent = NULL;
-    }
-
-    window_t *wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
-
-    MGL_wmSetWindowFlags(wnd, mgl_style);
-    MGL_wmShowWindow(wnd, m_isShown);
-
-    SetMGLwindow_t(wnd);
-
-    return true;
-}
-
-void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
-{
-    if ( m_wnd )
-        MGL_wmDestroyWindow(m_wnd);
-
-    m_wnd = wnd;
-    if ( !m_wnd ) return;
-
-    m_isShown = (bool)m_wnd->visible;
-
-    MGL_wmSetWindowUserData(m_wnd, (void*) this);
-    MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
-    MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0);
-    MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0);
-
-    if ( m_cursor.IsOk() )
-        MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
-    else
-        MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
-}
-
-// ---------------------------------------------------------------------------
-// basic operations
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::SetFocus()
-{
-    if ( gs_focusedWindow == this ) return;
-
-    wxWindowMGL *oldFocusedWindow = gs_focusedWindow;
-
-    if ( gs_focusedWindow )
-    {
-        gs_toBeFocusedWindow = (wxWindow*)this;
-        gs_focusedWindow->KillFocus();
-        gs_toBeFocusedWindow = NULL;
-    }
-
-    gs_focusedWindow = this;
-
-    MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);
-
-    wxWindowMGL *active = wxGetTopLevelParent(this);
-    if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame )
-    {
-        if ( gs_activeFrame )
-        {
-            wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());
-            event.SetEventObject(gs_activeFrame);
-            gs_activeFrame->HandleWindowEvent(event);
-        }
-
-        gs_activeFrame = active;
-        wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());
-        event.SetEventObject(gs_activeFrame);
-        gs_activeFrame->HandleWindowEvent(event);
-    }
-
-    // notify the parent keeping track of focus for the kbd navigation
-    // purposes that we got it
-    wxChildFocusEvent eventFocus((wxWindow*)this);
-    HandleWindowEvent(eventFocus);
-
-    wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
-    event.SetEventObject(this);
-    event.SetWindow((wxWindow*)oldFocusedWindow);
-    HandleWindowEvent(event);
-
-#if wxUSE_CARET
-    // caret needs to be informed about focus change
-    wxCaret *caret = GetCaret();
-    if ( caret )
-        caret->OnSetFocus();
-#endif // wxUSE_CARET
-}
-
-void wxWindowMGL::KillFocus()
-{
-    if ( gs_focusedWindow != this ) return;
-    gs_focusedWindow = NULL;
-
-    if ( m_isBeingDeleted ) return;
-
-    MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB);
-
-#if wxUSE_CARET
-    // caret needs to be informed about focus change
-    wxCaret *caret = GetCaret();
-    if ( caret )
-        caret->OnKillFocus();
-#endif // wxUSE_CARET
-
-    wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
-    event.SetEventObject(this);
-    event.SetWindow(gs_toBeFocusedWindow);
-    HandleWindowEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// this wxWindowBase function is implemented here (in platform-specific file)
-// because it is static and so couldn't be made virtual
-// ----------------------------------------------------------------------------
-wxWindow *wxWindowBase::DoFindFocus()
-{
-    return (wxWindow*)gs_focusedWindow;
-}
-
-bool wxWindowMGL::Show(bool show)
-{
-    if ( !wxWindowBase::Show(show) )
-        return false;
-
-    MGL_wmShowWindow(m_wnd, show);
-
-    if (!show && gs_activeFrame == this)
-    {
-        // activate next frame in Z-order:
-        if ( m_wnd->prev )
-        {
-            wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
-            win->SetFocus();
-        }
-        else if ( m_wnd->next )
-        {
-            wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
-            win->SetFocus();
-        }
-        else
-        {
-            gs_activeFrame = NULL;
-        }
-    }
-
-    return true;
-}
-
-// Raise the window to the top of the Z order
-void wxWindowMGL::Raise()
-{
-    MGL_wmRaiseWindow(m_wnd);
-}
-
-// Lower the window to the bottom of the Z order
-void wxWindowMGL::Lower()
-{
-    MGL_wmLowerWindow(m_wnd);
-}
-
-void wxWindowMGL::DoCaptureMouse()
-{
-    if ( gs_mouseCapture )
-        MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
-
-    gs_mouseCapture = this;
-    MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
-}
-
-void wxWindowMGL::DoReleaseMouse()
-{
-    wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") );
-
-    MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
-    gs_mouseCapture = NULL;
-}
-
-/* static */ wxWindow *wxWindowBase::GetCapture()
-{
-    return (wxWindow*)gs_mouseCapture;
-}
-
-bool wxWindowMGL::SetCursor(const wxCursor& cursor)
-{
-    if ( !wxWindowBase::SetCursor(cursor) )
-    {
-        // no change
-        return false;
-    }
-
-    if ( m_cursor.IsOk() )
-        MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
-    else
-        MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
-
-    return true;
-}
-
-void wxWindowMGL::WarpPointer(int x, int y)
-{
-    int w, h;
-    wxDisplaySize(&w, &h);
-
-    ClientToScreen(&x, &y);
-    if ( x < 0 )
-        x = 0;
-    if ( y < 0 )
-        y = 0;
-    if ( x >= w )
-        x = w-1;
-    if ( y >= h )
-        y = h-1;
-
-    EVT_setMousePos(x, y);
-}
-
-// Set this window to be the child of 'parent'.
-bool wxWindowMGL::Reparent(wxWindowBase *parent)
-{
-    if ( !wxWindowBase::Reparent(parent) )
-        return false;
-
-    MGL_wmReparentWindow(m_wnd, parent->GetHandle());
-
-    return true;
-}
-
-
-// ---------------------------------------------------------------------------
-// drag and drop
-// ---------------------------------------------------------------------------
-
-#if wxUSE_DRAG_AND_DROP
-
-void wxWindowMGL::SetDropTarget(wxDropTarget *pDropTarget)
-{
-    if ( m_dropTarget != 0 ) {
-        m_dropTarget->Revoke(m_hWnd);
-        delete m_dropTarget;
-    }
-
-    m_dropTarget = pDropTarget;
-    if ( m_dropTarget != 0 )
-        m_dropTarget->Register(m_hWnd);
-}
-// FIXME_MGL
-#endif // wxUSE_DRAG_AND_DROP
-
-// old style file-manager drag&drop support: we retain the old-style
-// DragAcceptFiles in parallel with SetDropTarget.
-void wxWindowMGL::DragAcceptFiles(bool WXUNUSED(accept))
-{
-#if 0 // FIXME_MGL
-    HWND hWnd = GetHwnd();
-    if ( hWnd )
-        ::DragAcceptFiles(hWnd, (BOOL)accept);
-#endif
-}
-
-// ---------------------------------------------------------------------------
-// moving and resizing
-// ---------------------------------------------------------------------------
-
-// Get total size
-void wxWindowMGL::DoGetSize(int *x, int *y) const
-{
-    wxASSERT_MSG( m_wnd, wxT("invalid window") );
-
-    if (x) *x = m_wnd->width;
-    if (y) *y = m_wnd->height;
-}
-
-void wxWindowMGL::DoGetPosition(int *x, int *y) const
-{
-    wxASSERT_MSG( m_wnd, wxT("invalid window") );
-
-    int pX = 0, pY = 0;
-    AdjustForParentClientOrigin(pX, pY, 0);
-
-    if (x) *x = m_wnd->x - pX;
-    if (y) *y = m_wnd->y - pY;
-}
-
-void wxWindowMGL::DoScreenToClient(int *x, int *y) const
-{
-    int ax, ay;
-    MGL_wmCoordGlobalToLocal(m_wnd, 0, 0, &ax, &ay);
-    if (x)
-        (*x) += ax;
-    if (y)
-        (*y) += ay;
-}
-
-void wxWindowMGL::DoClientToScreen(int *x, int *y) const
-{
-    int ax, ay;
-    MGL_wmCoordLocalToGlobal(m_wnd, 0, 0, &ax, &ay);
-    if (x)
-        (*x) += ax;
-    if (y)
-        (*y) += ay;
-}
-
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindowMGL::DoGetClientSize(int *x, int *y) const
-{
-    DoGetSize(x, y);
-}
-
-void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxRect rcClient(GetClientRect());
-
-    MGL_wmSetWindowPosition(m_wnd, x, y, width, height);
-
-    // When the origin or a window stays fixed but the height or width
-    // changes, invalidate the old and new non-client areas
-    if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) &&
-         m_wnd->x == x && m_wnd->y == y &&
-         rcClient.Intersect(GetClientRect()) != wxRect(0, 0, width, height) )
-    {
-        wxRegion rgn(0, 0, width, height);
-        rgn.Subtract(rcClient);
-
-        // This should work I think, but doesn't seem to:
-        //MGL_wmInvalidateWindowRegion(m_wnd, rgn.GetMGLRegion().rgnPointer());
-
-        // Use MGL_wmInvalidateWindowRect instead:
-        for (wxRegionIterator it(rgn); it; it++)
-        {
-            rect_t rc;
-            rc.left = it.GetX();
-            rc.top = it.GetY();
-            rc.right = rc.left + it.GetW();
-            rc.bottom = rc.top + it.GetH();
-            MGL_wmInvalidateWindowRect(m_wnd, &rc);
-        }
-    }
-}
-
-// set the size of the window: if the dimensions are positive, just use them,
-// but if any of them is equal to -1, it means that we must find the value for
-// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
-// which case -1 is a valid value for x and y)
-//
-// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
-// the width/height to best suit our contents, otherwise we reuse the current
-// width/height
-void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // get the current size and position...
-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-    int currentW,currentH;
-    GetSize(&currentW, &currentH);
-
-    // ... and don't do anything (avoiding flicker) if it's already ok
-    if ( x == currentX && y == currentY &&
-         width == currentW && height == currentH )
-    {
-        return;
-    }
-
-    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        x = currentX;
-    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        y = currentY;
-
-    AdjustForParentClientOrigin(x, y, sizeFlags);
-
-    wxSize size(-1, -1);
-    if ( width == -1 )
-    {
-        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
-        {
-            size = DoGetBestSize();
-            width = size.x;
-        }
-        else
-        {
-            // just take the current one
-            width = currentW;
-        }
-    }
-
-    if ( height == -1 )
-    {
-        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-        {
-            if ( size.x == -1 )
-            {
-                size = DoGetBestSize();
-            }
-            //else: already called DoGetBestSize() above
-
-            height = size.y;
-        }
-        else
-        {
-            // just take the current one
-            height = currentH;
-        }
-    }
-
-    int maxWidth = GetMaxWidth(),
-        minWidth = GetMinWidth(),
-        maxHeight = GetMaxHeight(),
-        minHeight = GetMinHeight();
-
-    if ( minWidth != -1 && width < minWidth ) width = minWidth;
-    if ( maxWidth != -1 && width > maxWidth ) width = maxWidth;
-    if ( minHeight != -1 && height < minHeight ) height = minHeight;
-    if ( maxHeight != -1 && height > maxHeight ) height = maxHeight;
-
-    if ( m_wnd->x != x || m_wnd->y != y ||
-         (int)m_wnd->width != width || (int)m_wnd->height != height )
-    {
-        DoMoveWindow(x, y, width, height);
-
-        wxSize newSize(width, height);
-        wxSizeEvent event(newSize, GetId());
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-}
-
-void wxWindowMGL::DoSetClientSize(int width, int height)
-{
-    SetSize(width, height);
-}
-
-// ---------------------------------------------------------------------------
-// text metrics
-// ---------------------------------------------------------------------------
-
-int wxWindowMGL::GetCharHeight() const
-{
-    wxScreenDC dc;
-    dc.SetFont(m_font);
-    return dc.GetCharHeight();
-}
-
-int wxWindowMGL::GetCharWidth() const
-{
-    wxScreenDC dc;
-    dc.SetFont(m_font);
-    return dc.GetCharWidth();
-}
-
-void wxWindowMGL::DoGetTextExtent(const wxString& string,
-                                  int *x, int *y,
-                                  int *descent,
-                                  int *externalLeading,
-                                  const wxFont *theFont) const
-{
-    wxScreenDC dc;
-    if (!theFont)
-        theFont = &m_font;
-    dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
-}
-
-
-// ---------------------------------------------------------------------------
-// painting
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
-{
-    if ( m_eraseBackground == -1 )
-        m_eraseBackground = eraseBack;
-    else
-        m_eraseBackground |= eraseBack;
-
-    if ( rect )
-    {
-        rect_t r;
-        r.left = rect->GetLeft(), r.right = rect->GetRight();
-        r.top = rect->GetTop(), r.bottom = rect->GetBottom();
-        MGL_wmInvalidateWindowRect(GetHandle(), &r);
-    }
-    else
-        MGL_wmInvalidateWindow(GetHandle());
-}
-
-void wxWindowMGL::Update()
-{
-    if ( !IsFrozen() )
-        MGL_wmUpdateDC(g_winMng);
-}
-
-void wxWindowMGL::DoFreeze()
-{
-    m_refreshAfterThaw = false;
-}
-
-void wxWindowMGL::DoThaw()
-{
-    if ( m_refreshAfterThaw )
-        Refresh();
-}
-
-void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
-{
-    if ( IsFrozen() )
-    {
-        // Don't paint anything if the window is frozen.
-        m_refreshAfterThaw = true;
-        return;
-    }
-
-#if wxDEBUG_LEVEL >= 2
-    // FIXME_MGL -- debugging stuff, to be removed!
-    static int debugPaintEvents = -1;
-    if ( debugPaintEvents == -1 )
-        debugPaintEvents = wxGetEnv(wxT("WXMGL_DEBUG_PAINT_EVENTS"), NULL);
-    if ( debugPaintEvents )
-    {
-        dc->setColorRGB(255,0,255);
-        dc->fillRect(-1000,-1000,2000,2000);
-        wxMilliSleep(50);
-    }
-#endif // wxDEBUG_LEVEL >= 2
-
-    MGLRegion clip;
-    dc->getClipRegion(clip);
-    m_updateRegion = wxRegion(clip);
-    m_paintMGLDC = dc;
-
-#if wxUSE_CARET
-    // must hide caret temporarily, otherwise we'd get rendering artifacts
-    wxCaret *caret = GetCaret();
-    if ( caret )
-        caret->Hide();
-#endif // wxUSE_CARET
-
-    if ( m_eraseBackground != 0 )
-    {
-        wxWindowDC dc((wxWindow*)this);
-        wxEraseEvent eventEr(m_windowId, &dc);
-        eventEr.SetEventObject(this);
-        HandleWindowEvent(eventEr);
-    }
-    m_eraseBackground = -1;
-
-    wxNcPaintEvent eventNc(GetId());
-    eventNc.SetEventObject(this);
-    HandleWindowEvent(eventNc);
-
-    wxPaintEvent eventPt(GetId());
-    eventPt.SetEventObject(this);
-    HandleWindowEvent(eventPt);
-
-#if wxUSE_CARET
-    if ( caret )
-        caret->Show();
-#endif // wxUSE_CARET
-
-    m_paintMGLDC = NULL;
-    m_updateRegion.Clear();
-}
-
-
-// Find the wxWindow at the current mouse position, returning the mouse
-// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
-{
-    return wxFindWindowAtPoint(pt = wxGetMousePosition());
-}
-
-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
-{
-    window_t *wnd = MGL_wmGetWindowAtPosition(g_winMng, pt.x, pt.y);
-    return (wxWindow*)wnd->userData;
-}
diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 9adf6a99b8..c8b9e7aa7d 100644
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -185,9 +185,8 @@ int wxDialog::ShowModal()
 
     wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") );
 
-#if defined(__WXGTK__) || defined(__WXMGL__)
+#if defined(__WXGTK__)
     wxBusyCursorSuspender suspender;
-    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
 #endif
 
     m_windowDisabler = new wxWindowDisabler(this);
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index ca9e07313f..8570049b19 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -2212,7 +2212,6 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc,
         }
         rectInt.Deflate(2);
 
-#if !defined(__WXMGL__)
         static const char *stipple_xpm[] = {
             /* columns rows colors chars-per-pixel */
             "2 2 2 1",
@@ -2222,24 +2221,6 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc,
             "w ",
             " w",
         };
-#else
-        // VS: MGL can only do 8x8 stipple brushes
-        static const char *stipple_xpm[] = {
-            /* columns rows colors chars-per-pixel */
-            "8 8 2 1",
-            "  c None",
-            "w c white",
-            /* pixels */
-            "w w w w ",
-            " w w w w",
-            "w w w w ",
-            " w w w w",
-            "w w w w ",
-            " w w w w",
-            "w w w w ",
-            " w w w w",
-        };
-#endif
         dc.SetBrush(wxBrush(stipple_xpm));
 
         dc.SetTextForeground(wxSCHEME_COLOUR(m_scheme, SHADOW_HIGHLIGHT));
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 9ec63e0861..1842fc485e 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -94,8 +94,6 @@ public:
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXOSX_OR_COCOA__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)
-#elif defined(__WXMGL__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)
 #elif defined(__WXDFB__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)
 #elif defined(__WXX11__)
diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index f033ac1774..5f027ac1b7 100644
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -48,7 +48,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "emulator.xpm"
 #endif
 
diff --git a/wxMGL.spec b/wxMGL.spec
deleted file mode 100644
index f48f2aa806..0000000000
--- a/wxMGL.spec
+++ /dev/null
@@ -1,104 +0,0 @@
-%define pref /usr
-%define ver 2.9.4
-%define ver2 2.9
-%define rel 1
-
-Summary: The SciTech MGL port of the wxWindows library
-Name: wxMGL
-Version: %{ver}
-Release: %{rel}
-License: wxWindows Licence
-Group: System/Libraries
-Source: wxMGL-%{ver}.tar.bz2
-URL: http://www.wxwindows.org
-Packager: Vaclav Slavik <vaclav@wxwindows.org>
-Prefix: %{pref}
-BuildRoot: /var/tmp/%{name}-root
-
-# all packages providing an implementation of wxWindows library (regardless of
-# the toolkit used) should provide the (virtual) wxwin package, this makes it
-# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
-Provides: wxwin
-
-Provides: libwx_mgl.so
-Provides: libwx_mgl-%{ver2}.so
-
-Requires: mgl
-BuildRequires: mgl-devel
-
-%description
-wxWindows is a free C++ library for cross-platform GUI development.
-With wxWindows, you can create applications for different GUIs (GTK+,
-Motif/LessTif, MS Windows, Mac) from the same source code.
-
-%package devel
-Summary: The SciTech MGL port of the wxWindows library
-Group: Development/Libraries
-Requires: wxMGL = %{ver}
-
-%description devel
-Header files for wxMGL, the SciTech MGL port of the wxWindows library.
-
-%package static
-Summary: wxMGL static libraries
-Group: Development/Libraries
-
-%description static
-Static libraries for wxMGL. You need them if you want to link statically against wxMGL.
-
-%prep
-%setup -n wxMGL-%{ver}
-
-%build
-if [ "$SMP" != "" ]; then
-  export MAKE="make -j$SMP"
-else
-  export MAKE="make"
-fi
-
-mkdir obj-shared
-cd obj-shared
-../configure --prefix=%{pref} --with-mgl --disable-fs_inet
-$MAKE
-cd ..
-
-mkdir obj-static
-cd obj-static
-../configure --prefix=%{pref} --disable-shared --with-mgl --disable-fs_inet
-$MAKE
-cd ..
-
-%install
-rm -rf $RPM_BUILD_ROOT
-(cd obj-static; make prefix=$RPM_BUILD_ROOT%{pref} install)
-(cd obj-shared; make prefix=$RPM_BUILD_ROOT%{pref} install)
-
-%find_lang wxstd
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files -f wxstd.lang
-%defattr(-,root,root)
-%doc COPYING.LIB *.txt
-%{_libdir}/libwx_mgl*-%{ver2}*.so.*
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libwx_mgl*-%{ver2}*.so
-%dir %{_includedir}/wx-*
-%{_includedir}/wx-*/*
-%dir %{_libdir}/wx
-%{_libdir}/wx/*
-%{_bindir}/wxmgl*-config
-%{_datadir}/aclocal/*.m4
-
-%files static
-%defattr (-,root,root)
-%{_libdir}/lib*.a
diff --git a/wxwin.m4 b/wxwin.m4
index f0e0bc619e..4f6a2eb460 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -560,7 +560,7 @@ dnl WX_STANDARD_OPTIONS([options-to-add])
 dnl
 dnl Adds to the configure script one or more of the following options:
 dnl   --enable-[debug|unicode|shared|wxshared|wxdebug]
-dnl   --with-[gtk|msw|motif|x11|mac|mgl|dfb]
+dnl   --with-[gtk|msw|motif|x11|mac|dfb]
 dnl   --with-wxversion
 dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
 dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
@@ -606,9 +606,9 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
                     if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                             "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
-                            "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
+                            -a "$TOOLKIT" != "dfb" ; then
                         AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, dfb)
                         ])
                     fi
 
@@ -872,7 +872,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
             WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
             WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
             WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
-            WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
             WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
 
             WX_PORT="unknown"
@@ -883,7 +882,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
             if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
             if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
             if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
-            if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
             if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
 
             dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac