diff --git a/Makefile.in b/Makefile.in
index 5dc386c53a..f7ee647b69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -740,7 +740,6 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/msw/fswatcher.h \
 	$(BASE_WINCE_HDR) \
 	$(BASE_OSX_HDR) \
-	wx/msdos/mimetype.h \
 	wx/fs_inet.h \
 	wx/protocol/file.h \
 	wx/protocol/ftp.h \
@@ -881,9 +880,6 @@ ALL_BASE_SOURCES =  \
 	src/msw/fswatcher.cpp \
 	$(BASE_WINCE_SRC) \
 	$(BASE_OSX_SRC) \
-	src/msdos/dir.cpp \
-	src/msdos/mimetype.cpp \
-	src/msdos/utilsdos.cpp \
 	src/common/event.cpp \
 	src/common/fs_mem.cpp \
 	src/common/msgout.cpp \
@@ -2588,7 +2584,6 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/osx/core/stdpaths.h
 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
-@COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
 	wx/unix/app.h \
 	wx/unix/apptbase.h \
@@ -4528,9 +4523,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_fswatcher_kqueue.o \
 	monodll_fswatcher_fsevents.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_MSDOS_1@	monodll_msdos_dir.o monodll_msdos_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	monodll_utilsdos.o
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_fdiodispatcher.o \
 	monodll_selectdispatcher.o \
@@ -4574,7 +4566,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	$(__BASE_WINCE_SRC_OBJECTS)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
 @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_wince_time.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_WIN32_1@	= monodll_msw_main.o monodll_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
@@ -6906,9 +6897,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_fswatcher_kqueue.o \
 	monolib_fswatcher_fsevents.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_MSDOS_1@	= monolib_msdos_dir.o monolib_msdos_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	monolib_utilsdos.o
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_fdiodispatcher.o \
 	monolib_selectdispatcher.o \
@@ -6952,7 +6940,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	$(__BASE_WINCE_SRC_OBJECTS_1)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
 @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_wince_time.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_WIN32_1@	= monolib_msw_main.o monolib_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
@@ -9337,9 +9324,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_fswatcher_kqueue.o \
 	basedll_fswatcher_fsevents.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_MSDOS_1@	= basedll_msdos_dir.o basedll_msdos_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	basedll_utilsdos.o
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_fdiodispatcher.o \
 	basedll_selectdispatcher.o \
@@ -9383,7 +9367,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	$(__BASE_WINCE_SRC_OBJECTS_2)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
 @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_wince_time.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_WIN32_1@	= basedll_main.o basedll_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
@@ -9426,9 +9409,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_fswatcher_kqueue.o \
 	baselib_fswatcher_fsevents.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_MSDOS_1@	= baselib_msdos_dir.o baselib_msdos_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	baselib_utilsdos.o
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_fdiodispatcher.o \
 	baselib_selectdispatcher.o \
@@ -9472,7 +9452,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	$(__BASE_WINCE_SRC_OBJECTS_3)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
 @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_wince_time.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_WIN32_1@	= baselib_main.o baselib_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
@@ -9644,7 +9623,6 @@ COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd = rm -f \
 	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd)
 @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
 @COND_PLATFORM_WIN32_1@	= coredll_msw_main.o coredll_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
@@ -11424,7 +11402,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
 @COND_ICC_PCH_1@	./.pch/wxprec_corelib/wx/wxprec.h.gch
 @COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \
 @COND_USE_PCH_1@	= ./.pch/wxprec_corelib/wx/wxprec.h.gch
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
 @COND_PLATFORM_WIN32_1@	= corelib_msw_main.o corelib_volume.o
 @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
@@ -17788,15 +17765,6 @@ monodll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONODLL_ODEP
 monodll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp
 
-monodll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-monodll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-monodll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -23719,15 +23687,6 @@ monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP
 monolib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp
 
-monolib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-monolib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -29650,15 +29609,6 @@ basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP
 basedll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp
 
-basedll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-basedll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -30133,15 +30083,6 @@ baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP
 baselib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp
 
-baselib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-baselib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-baselib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -41434,7 +41375,6 @@ GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
 MOTIFDIR = $(WXDIR)/src/motif
-MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
 MACDIR   = $(WXDIR)/src/osx
 COCOADIR = $(WXDIR)/src/cocoa
@@ -41693,7 +41633,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
-	mkdir $(DISTDIR)/include/wx/msdos
 	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
@@ -41710,7 +41649,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/src/osx
 	mkdir $(DISTDIR)/src/osx/core
 	mkdir $(DISTDIR)/src/osx/carbon
-	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 5b34ce9f5d..4e630ef8f8 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -350,12 +350,6 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
-    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
-        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl] ###
     COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
@@ -452,18 +446,6 @@ dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../dem
         COND_PLATFORM_MAC_1=""
     fi
     AC_SUBST(COND_PLATFORM_MAC_1)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
-    COND_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MSDOS" = "x0" ; then
-        COND_PLATFORM_MSDOS_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_MSDOS_0)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
-    COND_PLATFORM_MSDOS_1="#"
-    if test "x$PLATFORM_MSDOS" = "x1" ; then
-        COND_PLATFORM_MSDOS_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_MSDOS_1)
 dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_PLATFORM_OS2_1="#"
     if test "x$PLATFORM_OS2" = "x1" ; then
diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index 669373dc30..cd68c839e5 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -69,7 +69,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
 [
     PLATFORM_UNIX=0
     PLATFORM_WIN32=0
-    PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOS=0
     PLATFORM_MACOSX=0
@@ -80,9 +79,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             *-*-mingw32* )
                 PLATFORM_WIN32=1
             ;;
-            *-pc-msdosdjgpp )
-                PLATFORM_MSDOS=1
-            ;;
             *-*-darwin* )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -103,9 +99,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             win32 )
                 PLATFORM_WIN32=1
             ;;
-            msdos )
-                PLATFORM_MSDOS=1
-            ;;
             darwin )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -124,7 +117,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
 
     AC_SUBST(PLATFORM_UNIX)
     AC_SUBST(PLATFORM_WIN32)
-    AC_SUBST(PLATFORM_MSDOS)
     AC_SUBST(PLATFORM_MAC)
     AC_SUBST(PLATFORM_MACOS)
     AC_SUBST(PLATFORM_MACOSX)
@@ -213,11 +205,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
             DLLPREFIX=""
             dlldir="$bindir"
         ;;
-        *-pc-msdosdjgpp )
-            EXEEXT=".exe"
-            DLLPREFIX=""
-            dlldir="$bindir"
-        ;;
         *-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
@@ -403,8 +390,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
-      *-*-sysv5* | \
-      *-pc-msdosdjgpp )
+      *-*-sysv5* )
         dnl defaults are ok
       ;;
 
diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl
index 5df403bcfd..5cf902b2d3 100644
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -33,9 +33,6 @@
         <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             COMPILED_FROM_DSP
         </define>
-        <define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
-            __MSDOS__
-        </define>
         <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/expat/lib/xmlparse.c
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0f55b0771a..8222b9cdbe 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -242,21 +242,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(BASE_COREFOUNDATION_HDR)
 </set>
 
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!--                               MSDOS                                    -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_MSDOS_SRC" hints="files">
-    src/msdos/dir.cpp
-    src/msdos/mimetype.cpp
-    src/msdos/utilsdos.cpp
-</set>
-<set var="BASE_AND_GUI_MSDOS_SRC" hints="files">
-</set>
-<set var="BASE_MSDOS_HDR" hints="files">
-    wx/msdos/mimetype.h
-</set>
-
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                               wxQT                                       -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -3883,7 +3868,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
         <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_AND_GUI_OSX_CARBON_SRC)</if>
@@ -3891,7 +3875,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
         <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
         <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
     </set>
@@ -3915,7 +3898,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">
@@ -4131,7 +4113,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
         $(BASE_OSX_HDR)
-        $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
         $(XML_HDR)
     </set>
@@ -4141,7 +4122,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_CMN_SRC)
         $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
         $(BASE_OSX_SRC)
-        $(BASE_MSDOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_OSX_CARBON_SRC)
         $(BASE_AND_GUI_OSX_COCOA_SRC)
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 5223197216..8067c341ab 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -30,7 +30,6 @@ GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
 MOTIFDIR = $(WXDIR)/src/motif
-MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
 MACDIR   = $(WXDIR)/src/osx
 COCOADIR = $(WXDIR)/src/cocoa
@@ -289,7 +288,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
-	mkdir $(DISTDIR)/include/wx/msdos
 	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
@@ -306,7 +304,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/src/osx
 	mkdir $(DISTDIR)/src/osx/core
 	mkdir $(DISTDIR)/src/osx/carbon
-	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 746ca6b42f..c873e4b151 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -49,7 +49,6 @@
         <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
         <cflags-dmars>-w2</cflags-dmars>
         <cflags-watcom>-wcd=124</cflags-watcom>
-        <define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
         <if cond="IS_MSVC">
             <!--
                 define this to get rid of a warning about using POSIX lfind():
diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index 403930888f..15b1251d39 100644
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -44,7 +44,7 @@ SolidCompression=yes
 
 [Files]
 ; source files
-Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [INI]
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
diff --git a/configure b/configure
index a7b969b9b4..abbe5566e8 100755
--- a/configure
+++ b/configure
@@ -781,8 +781,6 @@ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_PLATFORM_UNIX_1
 COND_PLATFORM_UNIX_0
 COND_PLATFORM_OS2_1
-COND_PLATFORM_MSDOS_1
-COND_PLATFORM_MSDOS_0
 COND_PLATFORM_MAC_1
 COND_PLATFORM_MAC_0
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
@@ -799,7 +797,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
-COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
 COND_PLATFORM_MACOSX_1
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
@@ -894,7 +891,6 @@ PLATFORM_BEOS
 PLATFORM_MACOSX
 PLATFORM_MACOS
 PLATFORM_MAC
-PLATFORM_MSDOS
 PLATFORM_WIN32
 PLATFORM_UNIX
 IF_GNU_MAKE
@@ -4032,14 +4028,6 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
-  *-pc-msdosdjgpp )
-    USE_UNIX=0
-    USE_DOS=1
-    $as_echo "#define __DOS__ 1" >>confdefs.h
-
-    PROGRAM_EXT=".exe"
-  ;;
-
   arm-apple-darwin*)
         USE_BSD=1
     USE_DARWIN=1
@@ -28790,16 +28778,6 @@ fi
 
 
 
-if test "$wxUSE_SHARED" = "yes"; then
-    case "${host}" in
-      *-pc-msdosdjgpp )
-                wxUSE_SHARED=no
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Host system doesn't support shared libraries, disabling" >&5
-$as_echo "$as_me: WARNING: Host system doesn't support shared libraries, disabling" >&2;}
-      ;;
-    esac
-fi
-
 if test "$wxUSE_SHARED" = "yes"; then
 
 
@@ -38311,7 +38289,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
 
     PLATFORM_UNIX=0
     PLATFORM_WIN32=0
-    PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOS=0
     PLATFORM_MACOSX=0
@@ -38322,9 +38299,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
             *-*-mingw32* )
                 PLATFORM_WIN32=1
             ;;
-            *-pc-msdosdjgpp )
-                PLATFORM_MSDOS=1
-            ;;
             *-*-darwin* )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -38345,9 +38319,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
             win32 )
                 PLATFORM_WIN32=1
             ;;
-            msdos )
-                PLATFORM_MSDOS=1
-            ;;
             darwin )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -38372,7 +38343,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
 
 
 
-
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
                         if test "x$GCC" = "xyes"; then
@@ -38428,11 +38398,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
             DLLPREFIX=""
             dlldir="$bindir"
         ;;
-        *-pc-msdosdjgpp )
-            EXEEXT=".exe"
-            DLLPREFIX=""
-            dlldir="$bindir"
-        ;;
         *-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
@@ -38737,8 +38702,7 @@ fi
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
-      *-*-sysv5* | \
-      *-pc-msdosdjgpp )
+      *-*-sysv5* )
               ;;
 
       *)
@@ -39632,11 +39596,6 @@ EOF
         COND_PLATFORM_MACOSX_1=""
     fi
 
-    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
-        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
-    fi
-
     COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
         COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
@@ -39717,16 +39676,6 @@ EOF
         COND_PLATFORM_MAC_1=""
     fi
 
-    COND_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MSDOS" = "x0" ; then
-        COND_PLATFORM_MSDOS_0=""
-    fi
-
-    COND_PLATFORM_MSDOS_1="#"
-    if test "x$PLATFORM_MSDOS" = "x1" ; then
-        COND_PLATFORM_MSDOS_1=""
-    fi
-
     COND_PLATFORM_OS2_1="#"
     if test "x$PLATFORM_OS2" = "x1" ; then
         COND_PLATFORM_OS2_1=""
diff --git a/configure.in b/configure.in
index 58722d25dc..ab9ea76685 100644
--- a/configure.in
+++ b/configure.in
@@ -274,13 +274,6 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
-  *-pc-msdosdjgpp )
-    USE_UNIX=0
-    USE_DOS=1
-    AC_DEFINE(__DOS__)
-    PROGRAM_EXT=".exe"
-  ;;
-
   arm-apple-darwin*)
     dnl iPhone
     USE_BSD=1
@@ -3564,16 +3557,6 @@ fi
 
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
 
-if test "$wxUSE_SHARED" = "yes"; then
-    case "${host}" in
-      *-pc-msdosdjgpp )
-        dnl only static for now
-        wxUSE_SHARED=no
-        AC_MSG_WARN([Host system doesn't support shared libraries, disabling])
-      ;;
-    esac
-fi
-
 if test "$wxUSE_SHARED" = "yes"; then
 
     dnl use versioned symbols if available on the platform
diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 7254170a1e..f459bbe908 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -267,8 +267,6 @@ public:
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
-#elif defined(__DOS__)
-    #include "wx/msdos/apptrait.h"
 #else
     #if wxUSE_GUI
         class wxGUIAppTraits : public wxGUIAppTraitsBase
diff --git a/include/wx/msdos/apptrait.h b/include/wx/msdos/apptrait.h
deleted file mode 100644
index 69216c64aa..0000000000
--- a/include/wx/msdos/apptrait.h
+++ /dev/null
@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msdos/apptrait.h
-// Author:      Michael Wetherell
-// Copyright:   (c) 2006 Michael Wetherell
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSDOS_APPTRAIT_H_
-#define _WX_MSDOS_APPTRAIT_H_
-
-class wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *) { return NULL; }
-#endif // wxUSE_TIMER
-};
-
-#if wxUSE_GUI
-
-class wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop();
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif // wxUSE_TIMER
-};
-
-#endif // wxUSE_GUI
-
-#endif // _WX_MSDOS_APPTRAIT_H_
diff --git a/include/wx/msdos/mimetype.h b/include/wx/msdos/mimetype.h
deleted file mode 100644
index 2404304704..0000000000
--- a/include/wx/msdos/mimetype.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msdos/mimetype.h
-// Purpose:     classes and functions to manage MIME types
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.09.98
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/defs.h"
-#include "wx/mimetype.h"
-
-
-class wxMimeTypesManagerImpl
-{
-public :
-    wxMimeTypesManagerImpl() { }
-
-    // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
-                    const wxString& extraDir = wxEmptyString);
-
-    // and delete the data here
-    void ClearData();
-
-    // implement containing class functions
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext) ;
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-
-    void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
-
-    // create a new filetype association
-    wxFileType *Associate(const wxFileTypeInfo& ftInfo);
-    // remove association
-    bool Unassociate(wxFileType *ft);
-
-    // create a new filetype with the given name and extension
-    wxFileType *CreateFileType(const wxString& filetype, const wxString& ext);
-
-private:
-    wxArrayFileTypeInfo m_fallbacks;
-};
-
-class wxFileTypeImpl
-{
-public:
-    // initialization functions
-    // this is used to construct a list of mimetypes which match;
-    // if built with GetFileTypeFromMimetype index 0 has the exact match and
-    // index 1 the type / * match
-    // if built with GetFileTypeFromExtension, index 0 has the mimetype for
-    // the first extension found, index 1 for the second and so on
-
-    void Init(wxMimeTypesManagerImpl *manager, size_t index)
-    { m_manager = manager; m_index.Add(index); }
-
-    // initialize us with our file type name
-    void SetFileType(const wxString& strFileType)
-        { m_strFileType = strFileType; }
-    void SetExt(const wxString& ext)
-        { m_ext = ext; }
-
-    // implement accessor functions
-    bool GetExtensions(wxArrayString& extensions);
-    bool GetMimeType(wxString *mimeType) const;
-    bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIconLocation *iconLoc) const;
-    bool GetDescription(wxString *desc) const;
-    bool GetOpenCommand(wxString *openCmd,
-                        const wxFileType::MessageParameters&) const
-        { return GetCommand(openCmd, "open"); }
-    bool GetPrintCommand(wxString *printCmd,
-                         const wxFileType::MessageParameters&) const
-        { return GetCommand(printCmd, "print"); }
-
-    size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
-                          const wxFileType::MessageParameters& params) const;
-
-    // remove the record for this file type
-    // probably a mistake to come here, use wxMimeTypesManager.Unassociate (ft) instead
-    bool Unassociate(wxFileType *ft)
-    {
-        return m_manager->Unassociate(ft);
-    }
-
-    // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is TRUE
-    bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = TRUE);
-    bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
-
- private:
-    // helper function
-    bool GetCommand(wxString *command, const char *verb) const;
-
-    wxMimeTypesManagerImpl *m_manager;
-    wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
-    wxString m_strFileType, m_ext;
-};
-
-#endif
-  //_MIMETYPE_H
-
-/* vi: set cin tw=80 ts=4 sw=4: */
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 50e5a07066..a54f0ab4cd 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -67,7 +67,6 @@ NETTEST_OBJECTS =  \
 @COND_MONOLITHIC_1@	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-@COND_PLATFORM_MSDOS_0@__nettest___depname = nettest$(EXEEXT)
 @COND_PLATFORM_MAC_0@__nettest___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL nettest$(EXEEXT)
@@ -89,10 +88,9 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	= nettest.app/Contents/PkgInfo
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_bundle___depname \
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	= nettest_bundle
+@COND_PLATFORM_MACOSX_1@__nettest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= nettest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle
 @COND_TOOLKIT_MAC@____nettest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@	$(__nettest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_CARBON@____nettest_BUNDLE_TGT_REF_DEP \
@@ -134,7 +132,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
 
 ### Targets: ###
 
-all: $(__nettest___depname) $(__nettest_bundle___depname)
+all: nettest$(EXEEXT) $(__nettest_bundle___depname)
 
 install: 
 
@@ -151,33 +149,33 @@ clean:
 distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-@COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-@COND_PLATFORM_MSDOS_0@	$(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MSDOS_0@	$(__nettest___mac_setfilecmd)
-@COND_PLATFORM_MSDOS_0@	$(__nettest___os2_emxbindcmd)
+nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
+	$(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	
+	$(__nettest___mac_setfilecmd)
+	$(__nettest___os2_emxbindcmd)
 
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents/MacOS
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents/Resources
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	-e "s/EXECUTABLE/nettest/" \
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	-e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	$(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	/bin/echo "APPL????" >nettest.app/Contents/PkgInfo
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	mkdir -p nettest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p nettest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p nettest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/nettest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	/bin/echo "APPL????" >nettest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
+@COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
 
 nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
diff --git a/samples/dialup/dialup.bkl b/samples/dialup/dialup.bkl
index c68d1d68f5..7d07706826 100644
--- a/samples/dialup/dialup.bkl
+++ b/samples/dialup/dialup.bkl
@@ -4,8 +4,7 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="nettest" template="wx_sample"
-         template_append="wx_append"
-         cond="PLATFORM_MSDOS=='0'">
+         template_append="wx_append">
         <sources>nettest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 7571f5b78c..c6904c3d3a 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -49,8 +49,6 @@
     #include "wx/msw/mimetype.h"
 #elif ( defined(__DARWIN__) )
     #include "wx/osx/mimetype.h"
-#elif defined(__DOS__)
-    #include "wx/msdos/mimetype.h"
 #else // Unix
     #include "wx/unix/mimetype.h"
 #endif
diff --git a/src/msdos/dir.cpp b/src/msdos/dir.cpp
deleted file mode 100644
index d21181bc61..0000000000
--- a/src/msdos/dir.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msdos/dir.cpp
-// Purpose:     wxDir implementation for DOS
-// Author:      derived from wxPalmOS code
-// Modified by:
-// Created:     10.13.04
-// Copyright:   (c) William Osborne
-// 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/intl.h"
-    #include "wx/log.h"
-#endif // PCH
-
-#include "wx/dir.h"
-
-// ----------------------------------------------------------------------------
-// define the types and functions used for file searching
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef MAX_PATH
-    #define MAX_PATH 260        // from VC++ headers
-#endif
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_DIR       ((wxDirData *)m_data)
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxDir construction/destruction
-// ----------------------------------------------------------------------------
-
-wxDir::wxDir(const wxString& WXUNUSED(dirname))
-{
-}
-
-bool wxDir::Open(const wxString& WXUNUSED(dirname))
-{
-    return false;
-}
-
-bool wxDir::IsOpened() const
-{
-    return false;
-}
-
-wxString wxDir::GetName() const
-{
-    return wxEmptyString;
-}
-
-wxDir::~wxDir()
-{
-}
-
-// ----------------------------------------------------------------------------
-// wxDir enumerating
-// ----------------------------------------------------------------------------
-
-bool wxDir::GetFirst(wxString *WXUNUSED(filename),
-                     const wxString& WXUNUSED(filespec),
-                     int WXUNUSED(flags)) const
-{
-    return false;
-}
-
-bool wxDir::GetNext(wxString *WXUNUSED(filename)) const
-{
-    return false;
-}
diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp
deleted file mode 100644
index 156ed239ad..0000000000
--- a/src/msdos/mimetype.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msdos/mimetype.cpp
-// Purpose:     classes and functions to manage MIME types
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.09.98
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MIMETYPE
-
-#include "wx/msdos/mimetype.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #if wxUSE_GUI
-        #include "wx/icon.h"
-    #endif
-#endif //WX_PRECOMP
-
-#include "wx/file.h"
-#include "wx/confbase.h"
-
-// other standard headers
-#include <ctype.h>
-
-// in case we're compiling in non-GUI mode
-class WXDLLEXPORT wxIcon;
-
-bool wxFileTypeImpl::SetCommand(const wxString& WXUNUSED(cmd),
-                                const wxString& WXUNUSED(verb),
-                                bool WXUNUSED(overwriteprompt))
-{
-    return false;
-}
-
-bool wxFileTypeImpl::SetDefaultIcon(const wxString& WXUNUSED(strIcon),
-                                    int WXUNUSED(index))
-{
-    return false;
-}
-
-bool wxFileTypeImpl::GetCommand(wxString *WXUNUSED(command),
-                                const char *WXUNUSED(verb)) const
-{
-    return false;
-}
-
-bool wxFileTypeImpl::GetExtensions(wxArrayString& WXUNUSED(extensions))
-{
-    return false;
-}
-
-bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
-{
-    if ( !m_strFileType.empty() )
-    {
-        *mimeType = m_strFileType ;
-        return true ;
-    }
-    else
-    return false;
-}
-
-bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
-{
-    wxString s;
-
-    if (GetMimeType(&s))
-    {
-        mimeTypes.Clear();
-        mimeTypes.Add(s);
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
-{
-    // no such file type or no value or incorrect icon entry
-    return false;
-}
-
-bool wxFileTypeImpl::GetDescription(wxString *WXUNUSED(desc)) const
-{
-    return false;
-}
-
-size_t
-wxFileTypeImpl::GetAllCommands(wxArrayString * WXUNUSED(verbs),
-                               wxArrayString * WXUNUSED(commands),
-                               const wxFileType::MessageParameters& WXUNUSED(params)) const
-{
-    wxFAIL_MSG( wxT("wxFileTypeImpl::GetAllCommands() not yet implemented") );
-    return 0;
-}
-
-void
-wxMimeTypesManagerImpl::Initialize(int WXUNUSED(mailcapStyles),
-                                   const wxString& WXUNUSED(extraDir))
-{
-    wxFAIL_MSG( wxT("wxMimeTypesManagerImpl::Initialize() not yet implemented") );
-}
-
-void
-wxMimeTypesManagerImpl::ClearData()
-{
-    wxFAIL_MSG( wxT("wxMimeTypesManagerImpl::ClearData() not yet implemented") );
-}
-
-// extension -> file type
-wxFileType *
-wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& e)
-{
-    wxString ext = e ;
-    ext = ext.Lower() ;
-    if ( ext == wxT("txt") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("text/text"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("htm") || ext == wxT("html") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("text/html"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("gif") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/gif"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("png" ))
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/png"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("jpg" )|| ext == wxT("jpeg") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/jpeg"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("bmp") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/bmp"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("tif") || ext == wxT("tiff") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/tiff"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("xpm") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/xpm"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-    else if ( ext == wxT("xbm") )
-    {
-        wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType(wxT("image/xbm"));
-        fileType->m_impl->SetExt(ext);
-        return fileType;
-    }
-
-    // unknown extension
-    return NULL;
-}
-
-// MIME type -> extension -> file type
-wxFileType *
-wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& WXUNUSED(mimeType))
-{
-    return NULL;
-}
-
-size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& WXUNUSED(mimetypes))
-{
-    // VZ: don't know anything about this for Mac
-    wxFAIL_MSG( wxT("wxMimeTypesManagerImpl::EnumAllFileTypes() not yet implemented") );
-
-    return 0;
-}
-
-wxFileType *
-wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& WXUNUSED(ftInfo))
-{
-    wxFAIL_MSG( wxT("wxMimeTypesManagerImpl::Associate() not yet implemented") );
-
-    return NULL;
-}
-
-bool
-wxMimeTypesManagerImpl::Unassociate(wxFileType *WXUNUSED(ft))
-{
-    return false;
-}
-
-#endif // wxUSE_MIMETYPE
diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
deleted file mode 100644
index 0fc0c73703..0000000000
--- a/src/msdos/utilsdos.cpp
+++ /dev/null
@@ -1,511 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msdos/utilsdos.cpp
-// Purpose:     DOS implementations of utility functions
-// Author:      Vaclav Slavik, M.J.Wetherell
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-//              (c) 2005 M.J.Wetherell
-// 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"
-    #include "wx/app.h"
-#endif
-
-#include "wx/apptrait.h"
-#include "wx/process.h"
-#include "wx/confbase.h"        // for wxExpandEnvVars()
-#include "wx/cmdline.h"
-#include "wx/filename.h"
-#include "wx/wfstream.h"
-
-#include <stdarg.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <dos.h>
-#include <process.h>
-
-//----------------------------------------------------------------------------
-// Sleep
-//----------------------------------------------------------------------------
-
-void wxSleep(int nSecs)
-{
-    wxMilliSleep(1000 * nSecs);
-}
-
-void wxMilliSleep(unsigned long milliseconds)
-{
-#if HAVE_USLEEP || defined __DJGPP__
-    usleep(milliseconds * 1000);
-#else
-    clock_t start = clock();
-    while ((clock() - start) * 1000 / CLOCKS_PER_SEC < (clock_t)milliseconds)
-    {
-        // yield if in a multitasking environment
-        // "Release Current Virtual Machine's Time Slice" in DPMI 1.0
-        REGS r;
-        memset(&r, 0, sizeof(r));
-        r.x.ax = 0x1680;
-        int386(0x2f, &r, &r);
-    }
-#endif
-}
-
-void wxMicroSleep(unsigned long microseconds)
-{
-#if HAVE_USLEEP || defined __DJGPP__
-    usleep(microseconds);
-#else
-    wxMilliSleep(microseconds/1000);
-#endif
-}
-
-//----------------------------------------------------------------------------
-// Get/Set environment variables
-//----------------------------------------------------------------------------
-
-bool wxGetEnv(const wxString& var, wxString *value)
-{
-    // wxGetenv is defined as getenv()
-    wxChar *p = wxGetenv(var);
-    if ( !p )
-        return false;
-
-    if ( value )
-        *value = p;
-
-    return true;
-}
-
-static bool wxDoSetEnv(const wxString& variable, const char *value)
-{
-    wxString s = variable;
-    if ( value )
-        s << wxT('=') << value;
-
-    // transform to ANSI
-    const char *p = s.mb_str();
-
-    // the string will be free()d by libc
-    char *buf = (char *)malloc(strlen(p) + 1);
-    strcpy(buf, p);
-
-    return putenv(buf) == 0;
-}
-
-bool wxSetEnv(const wxString& variable, const wxString& value)
-{
-    return wxDoSetEnv(variable, value.mb_str());
-}
-
-bool wxUnsetEnv(const wxString& variable)
-{
-    return wxDoSetEnv(variable, NULL);
-}
-
-
-//----------------------------------------------------------------------------
-// Hostname, username, home directory
-//----------------------------------------------------------------------------
-
-// Based on the MSW implementation
-//
-// Respects the following environment variables in this order: %HomeDrive% +
-// %HomePath%, %UserProfile%, $HOME. Otherwise takes program's directory if
-// wxApp has been initialised, otherwise returns ".".
-//
-const wxChar* wxGetHomeDir(wxString *home)
-{
-    wxString& strDir = *home;
-
-    strDir.clear();
-
-    // try HOMEDRIVE/PATH
-    const wxChar *szHome = wxGetenv(wxT("HOMEDRIVE"));
-    if ( szHome != NULL )
-        strDir << szHome;
-    szHome = wxGetenv(wxT("HOMEPATH"));
-
-    if ( szHome != NULL )
-    {
-        strDir << szHome;
-
-        // the idea is that under NT these variables have default values of
-        // "%systemdrive%:" and "\\". As we don't want to create our config
-        // files in the root directory of the system drive, we will create it
-        // in our program's dir. However, if the user took care to set
-        // HOMEPATH to something other than "\\", we suppose that he knows
-        // what he is doing and use the supplied value.
-        if ( wxStrcmp(szHome, wxT("\\")) == 0 )
-            strDir.clear();
-    }
-
-    if ( strDir.empty() )
-    {
-        // If we have a valid USERPROFILE directory, as is the case in
-        // Windows NT, 2000 and XP, we should use that as our home directory.
-        szHome = wxGetenv(wxT("USERPROFILE"));
-
-        if ( szHome != NULL )
-            strDir = szHome;
-    }
-
-    if ( strDir.empty() )
-    {
-        // If we have a valid HOME directory, as is used on many machines
-        // that have unix utilities on them, we should use that.
-        szHome = wxGetenv(wxT("HOME"));
-
-        if ( szHome != NULL )
-        {
-            strDir = szHome;
-            // when msys sets %HOME% it uses '/' (cygwin uses '\\')
-            strDir.Replace(wxT("/"), wxT("\\"));
-        }
-    }
-
-    if ( !strDir.empty() )
-    {
-        // sometimes the value of HOME may be "%USERPROFILE%", so reexpand the
-        // value once again, it shouldn't hurt anyhow
-        strDir = wxExpandEnvVars(strDir);
-    }
-    else // fall back to the program directory
-    {
-        if ( wxTheApp )
-        {
-            wxString prog(wxTheApp->argv[0]);
-#ifdef __DJGPP__
-            // djgpp startup code switches the slashes around, so restore them
-            prog.Replace(wxT("/"), wxT("\\"));
-#endif
-            // it needs to be a full path to be usable
-            if ( prog.compare(1, 2, wxT(":\\")) == 0 )
-                wxFileName::SplitPath(prog, &strDir, NULL, NULL);
-        }
-        if ( strDir.empty() )
-        {
-            strDir = wxT(".");
-        }
-    }
-
-    return strDir.c_str();
-}
-
-wxString wxGetUserHome(const wxString& user)
-{
-    wxString home;
-
-    if (user.empty() || user == wxGetUserId())
-        wxGetHomeDir(&home);
-
-    return home;
-}
-
-// returns %UserName%, $USER or just "user"
-//
-bool wxGetUserId(wxChar *buf, int n)
-{
-    const wxChar *user = wxGetenv(wxT("UserName"));
-
-    if (!user)
-        user = wxGetenv(wxT("USER"));
-
-    if (!user)
-        user = wxT("user");
-
-    wxStrlcpy(buf, user, n);
-    return true;
-}
-
-bool wxGetUserName(wxChar *buf, int n)
-{
-    return wxGetUserId(buf, n);
-}
-
-// returns %ComputerName%, or $HOSTNAME, or "host"
-//
-bool wxGetHostName(wxChar *buf, int n)
-{
-    const wxChar *host = wxGetenv(wxT("ComputerName"));
-
-    if (!host)
-        host = wxGetenv(wxT("HOSTNAME"));
-
-    if (!host)
-        host = wxT("host");
-
-    wxStrlcpy(buf, host, n);
-    return true;
-}
-
-// adds %UserDnsDomain% to wxGetHostName()
-//
-bool wxGetFullHostName(wxChar *buf, int n)
-{
-    wxGetHostName(buf, n);
-
-    const wxChar *domain = wxGetenv(wxT("UserDnsDomain"));
-
-    if (domain)
-        wxStrncat(wxStrncat(buf, wxT("."), n), domain, n);
-
-    return true;
-}
-
-//----------------------------------------------------------------------------
-// Processes
-//----------------------------------------------------------------------------
-
-unsigned long wxGetProcessId()
-{
-    return (unsigned long)getpid();
-}
-
-int wxKill(long pid, wxSignal sig, wxKillError *rc, int WXUNUSED(flags))
-{
-    int result = -1;
-
-    if (pid != (long)wxGetProcessId())
-    {
-        result = raise(sig);
-        if (rc)
-            *rc = result == 0 ? wxKILL_OK : wxKILL_BAD_SIGNAL;
-    }
-    else
-    {
-        wxLogDebug(wxT("wxKill can only send signals to the current process under MSDOS"));
-        if (rc)
-            *rc = wxKILL_NO_PROCESS;
-    }
-
-    return result;
-}
-
-bool wxShell(const wxString& command /*=wxEmptyString*/)
-{
-    // FIXME: suspend/resume gui
-    int result = system(command);
-
-    if (result == -1)
-    {
-        wxLogSysError(_("can't execute '%s'"), command.c_str());
-    }
-
-    return result == 0;
-}
-
-long wxExecute(const wxString& command, int flags, wxProcess *process,
-        const wxExecuteEnv *env)
-{
-    // FIXME: shouldn't depend on wxCmdLineParser
-    wxArrayString args(wxCmdLineParser::ConvertStringToArgs(command));
-    size_t n = args.size();
-    wxChar **argv = new wxChar*[n + 1];
-
-    argv[n] = NULL;
-    while (n-- > 0)
-        argv[n] = const_cast<wxChar*>((const char *)args[n].c_str());
-
-    long result = wxExecute(argv, flags, process);
-
-    delete [] argv;
-    return result;
-}
-
-#if wxUSE_STREAMS
-
-// A wxFFileInputStream that deletes the file in it's destructor
-//
-class wxTempFileInStream : public wxFFileInputStream
-{
-public:
-    wxTempFileInStream(const wxString& name)
-        : wxFFileInputStream(name, wxT("rt"))
-    { }
-
-    virtual ~wxTempFileInStream()
-    {
-        m_file->Close();
-        wxRemoveFile(m_file->GetName());
-    }
-};
-
-// A file descriptor that can be redirected to a file
-//
-class wxRedirectableFd
-{
-public:
-    wxRedirectableFd(int fd) : m_fd(fd), m_dup(-1) { }
-    ~wxRedirectableFd();
-
-    // Redirect the descriptor to a file, similar to ANSI C's freopen, but
-    // for low level descriptors. The desctructor un-redirects. If O_CREAT
-    // is in the flags then the destructor will delete the file unless it is
-    // given away with Release().
-    bool Reopen(const wxString& name, int flags);
-
-    // un-redirect the redirected file descriptor, closing the file, and give
-    // away the filename without deleting it
-    wxString Release();
-
-private:
-    // un-redirect the descriptor, closing the file
-    void Restore();
-
-    int m_fd;
-    int m_dup;
-    wxString m_name;
-};
-
-wxRedirectableFd::~wxRedirectableFd()
-{
-    Restore();
-    if (!m_name.empty())
-        wxRemoveFile(m_name);
-}
-
-bool wxRedirectableFd::Reopen(const wxString& name, int flags)
-{
-    wxASSERT(m_dup == -1);
-    bool result = false;
-
-    // save a duplicate so that the descriptor can be closed now and
-    // restored later
-    m_dup = dup(m_fd);
-
-    if (m_dup != -1)
-    {
-        int tmp = open(name.mb_str(), flags);
-
-        if (tmp != -1)
-        {
-            close(m_fd);
-
-            if (flags & O_CREAT)
-                m_name = name;
-
-            result = dup2(tmp, m_fd) == m_fd;
-            close(tmp);
-        }
-    }
-
-    if (!result)
-    {
-        wxLogSysError(_("error opening '%s'"), name.c_str());
-    }
-
-    return result;
-}
-
-void wxRedirectableFd::Restore()
-{
-    if (m_dup != -1)
-    {
-        close(m_fd);
-        dup2(m_dup, m_fd);
-        close(m_dup);
-        m_dup = -1;
-    }
-}
-
-wxString wxRedirectableFd::Release()
-{
-    Restore();
-    wxString name = m_name;
-    m_name.clear();
-    return name;
-}
-
-#endif // wxUSE_STREAMS
-
-// wxExecute implementation
-//
-long wxExecute(wxChar **argv, int flags, wxProcess *process,
-        const wxString* cwd, const wxEnvVariableHashMap* env)
-{
-#if wxUSE_STREAMS
-    const int STDIN = 0;
-    const int STDOUT = 1;
-    const int STDERR = 2;
-
-    wxRedirectableFd in(STDIN), out(STDOUT), err(STDERR);
-    bool redirect = process && process->IsRedirected() && (flags & wxEXEC_SYNC);
-
-    if (redirect)
-    {
-        // close stdin/out/err and reopen them as files
-        if (!in.Reopen(wxT("NUL"), O_RDONLY | O_TEXT))
-            return -1;
-
-        if (!out.Reopen(wxFileName::CreateTempFileName(wxT("out")),
-                        O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
-            return -1;
-
-        if (!err.Reopen(wxFileName::CreateTempFileName(wxT("err")),
-                        O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
-            return -1;
-    }
-#endif // wxUSE_STREAMS
-
-    // FIXME: suspend/resume gui
-    int mode = flags & wxEXEC_SYNC ? P_WAIT : P_NOWAIT;
-    int result = spawnvp(mode, argv[0], argv);
-
-    if (result == -1)
-    {
-        wxLogSysError(_("can't execute '%s'"), argv[0]);
-    }
-
-#if wxUSE_STREAMS
-    if (redirect)
-        process->SetPipeStreams(new wxTempFileInStream(out.Release()),
-                                new wxFFileOutputStream(wxT("NUL"), wxT("wt")),
-                                new wxTempFileInStream(err.Release()));
-#endif // wxUSE_STREAMS
-
-    return result;
-}
-
-
-//----------------------------------------------------------------------------
-// OS-related
-//----------------------------------------------------------------------------
-
-wxString wxGetOsDescription()
-{
-    wxString osname(wxT("DOS"));
-    return osname;
-}
-
-wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
-{
-    if ( verMaj )
-        *verMaj = _osmajor;
-    if ( verMin )
-        *verMin = _osminor;
-
-    return wxOS_DOS;
-}
-
-bool wxIsPlatform64Bit()
-{
-    return false;
-}
-