Remove wxPM, wxWidgets port to OS/2.

This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

aclocal.m4

@@ -17,7 +17,6 @@ m4_include([build/aclocal/ax_cflags_gcc_option.m4])
 m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
 m4_include([build/aclocal/ax_gcc_option.m4])
 m4_include([build/aclocal/ax_gxx_version.m4])
-m4_include([build/aclocal/bakefile-dllar.m4])
 m4_include([build/aclocal/bakefile-lang.m4])
 m4_include([build/aclocal/bakefile.m4])
 m4_include([build/aclocal/cppunit.m4])

autoconf_inc.m4

@@ -464,7 +464,7 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
         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/console/console.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/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/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,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+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/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/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
         COND_PLATFORM_OS2_1=""
@@ -866,24 +866,6 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
-    COND_TOOLKIT_PM="#"
-    if test "x$TOOLKIT" = "xPM" ; then
-        COND_TOOLKIT_PM=""
-    fi
-    AC_SUBST(COND_TOOLKIT_PM)
-dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_PM_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_PM_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_WINCE[wx.bkl] ###
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then

build/aclocal/bakefile-dllar.m4

@@ -1,483 +0,0 @@
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
-[
-dnl ===================== dllar.sh begins here =====================
-dnl    (Created by merge-scripts.py from dllar.sh
-dnl     file do not edit here!)
-D='$'
-cat <<EOF >dllar.sh
-#!/bin/sh
-#
-# dllar - a tool to build both a .dll and an .a file
-# from a set of object (.o) files for EMX/OS2.
-#
-#  Written by Andrew Zabolotny, bit@freya.etu.ru
-#  Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
-#
-#  This script will accept a set of files on the command line.
-#  All the public symbols from the .o files will be exported into
-#  a .DEF file, then linker will be run (through gcc) against them to
-#  build a shared library consisting of all given .o files. All libraries
-#  (.a) will be first decompressed into component .o files then act as
-#  described above. You can optionally give a description (-d "description")
-#  which will be put into .DLL. To see the list of accepted options (as well
-#  as command-line format) simply run this program without options. The .DLL
-#  is built to be imported by name (there is no guarantee that new versions
-#  of the library you build will have same ordinals for same symbols).
-#
-#  dllar is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  dllar is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with dllar; see the file COPYING.  If not, write to the Free
-#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-#  02111-1307, USA.
-
-# To successfuly run this program you will need:
-#  - Current drive should have LFN support (HPFS, ext2, network, etc)
-#    (Sometimes dllar generates filenames which won't fit 8.3 scheme)
-#  - gcc
-#    (used to build the .dll)
-#  - emxexp
-#    (used to create .def file from .o files)
-#  - emximp
-#    (used to create .a file from .def file)
-#  - GNU text utilites (cat, sort, uniq)
-#    used to process emxexp output
-#  - GNU file utilities (mv, rm)
-#  - GNU sed
-#  - lxlite (optional, see flag below)
-#    (used for general .dll cleanup)
-#
-
-flag_USE_LXLITE=1;
-
-#
-# helper functions
-# basnam, variant of basename, which does _not_ remove the path, _iff_
-#                              second argument (suffix to remove) is given
-basnam(){
-    case ${D}# in
-    1)
-        echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
-        ;;
-    2)
-        echo ${D}1 | sed 's/'${D}2'${D}//'
-        ;;
-    *)
-        echo "error in basnam ${D}*"
-        exit 8
-        ;;
-    esac
-}
-
-# Cleanup temporary files and output
-CleanUp() {
-    cd ${D}curDir
-    for i in ${D}inputFiles ; do
-        case ${D}i in
-        *!)
-            rm -rf \`basnam ${D}i !\`
-            ;;
-        *)
-            ;;
-        esac
-    done
-
-    # Kill result in case of failure as there is just to many stupid make/nmake
-    # things out there which doesn't do this.
-    if @<:@ ${D}# -eq 0 @:>@; then
-        rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
-    fi
-}
-
-# Print usage and exit script with rc=1.
-PrintHelp() {
- echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
- echo '       @<:@-name-mangler-script script.sh@:>@'
- echo '       @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
- echo '       @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
- echo '       @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
- echo '       @<:@*.o@:>@ @<:@*.a@:>@'
- echo '*> "output_file" should have no extension.'
- echo '   If it has the .o, .a or .dll extension, it is automatically removed.'
- echo '   The import library name is derived from this and is set to "name".a,'
- echo '   unless overridden by -import'
- echo '*> "importlib_name" should have no extension.'
- echo '   If it has the .o, or .a extension, it is automatically removed.'
- echo '   This name is used as the import library name and may be longer and'
- echo '   more descriptive than the DLL name which has to follow the old '
- echo '   8.3 convention of FAT.'
- echo '*> "script.sh may be given to override the output_file name by a'
- echo '   different name. It is mainly useful if the regular make process'
- echo '   of some package does not take into account OS/2 restriction of'
- echo '   DLL name lengths. It takes the importlib name as input and is'
- echo '   supposed to procude a shorter name as output. The script should'
- echo '   expect to get importlib_name without extension and should produce'
- echo '   a (max.) 8 letter name without extension.'
- echo '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
- echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
- echo '   These flags will be put at the start of GCC command line.'
- echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
- echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
- echo '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
- echo '   If the last character of a symbol is "*", all symbols beginning'
- echo '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
- echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
- echo '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
- echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
- echo '   C runtime DLLs.'
- echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
- echo '*> All other switches (for example -L./ or -lmylib) will be passed'
- echo '   unchanged to GCC at the end of command line.'
- echo '*> If you create a DLL from a library and you do not specify -o,'
- echo '   the basename for DLL and import library will be set to library name,'
- echo '   the initial library will be renamed to 'name'_s.a (_s for static)'
- echo '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
- echo '   library will be renamed into gcc_s.a.'
- echo '--------'
- echo 'Example:'
- echo '   dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
- echo '    -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
- CleanUp
- exit 1
-}
-
-# Execute a command.
-# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
-# @Uses    Whatever CleanUp() uses.
-doCommand() {
-    echo "${D}*"
-    eval ${D}*
-    rcCmd=${D}?
-
-    if @<:@ ${D}rcCmd -ne 0 @:>@; then
-        echo "command failed, exit code="${D}rcCmd
-        CleanUp
-        exit ${D}rcCmd
-    fi
-}
-
-# main routine
-# setup globals
-cmdLine=${D}*
-outFile=""
-outimpFile=""
-inputFiles=""
-renameScript=""
-description=""
-CC=gcc.exe
-CFLAGS="-s -Zcrtdll"
-EXTRA_CFLAGS=""
-EXPORT_BY_ORDINALS=0
-exclude_symbols=""
-library_flags=""
-curDir=\`pwd\`
-curDirS=curDir
-case ${D}curDirS in
-*/)
-  ;;
-*)
-  curDirS=${D}{curDirS}"/"
-  ;;
-esac
-# Parse commandline
-libsToLink=0
-omfLinking=0
-while @<:@ ${D}1 @:>@; do
-    case ${D}1 in
-    -ord*)
-        EXPORT_BY_ORDINALS=1;
-        ;;
-    -o*)
-	shift
-        outFile=${D}1
-	;;
-    -i*)
-        shift
-        outimpFile=${D}1
-        ;;
-    -name-mangler-script)
-        shift
-        renameScript=${D}1
-        ;;
-    -d*)
-        shift
-        description=${D}1
-        ;;
-    -f*)
-        shift
-        CFLAGS=${D}1
-        ;;
-    -c*)
-        shift
-        CC=${D}1
-        ;;
-    -h*)
-        PrintHelp
-        ;;
-    -ex*)
-        shift
-        exclude_symbols=${D}{exclude_symbols}${D}1" "
-        ;;
-    -libf*)
-        shift
-        library_flags=${D}{library_flags}${D}1" "
-        ;;
-    -nocrt*)
-        CFLAGS="-s"
-        ;;
-    -nolxl*)
-        flag_USE_LXLITE=0
-        ;;
-    -* | /*)
-        case ${D}1 in
-        -L* | -l*)
-            libsToLink=1
-            ;;
-        -Zomf)
-            omfLinking=1
-            ;;
-        *)
-            ;;
-        esac
-        EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        ;;
-    *.dll)
-        EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
-        if @<:@ ${D}omfLinking -eq 1 @:>@; then
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
-	else
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
-        fi
-        ;;
-    *)
-        found=0;
-        if @<:@ ${D}libsToLink -ne 0 @:>@; then
-            EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        else
-            for file in ${D}1 ; do
-                if @<:@ -f ${D}file @:>@; then
-                    inputFiles="${D}{inputFiles} ${D}file"
-                    found=1
-                fi
-            done
-            if @<:@ ${D}found -eq 0 @:>@; then
-                echo "ERROR: No file(s) found: "${D}1
-                exit 8
-            fi
-        fi
-      ;;
-    esac
-    shift
-done # iterate cmdline words
-
-#
-if @<:@ -z "${D}inputFiles" @:>@; then
-    echo "dllar: no input files"
-    PrintHelp
-fi
-
-# Now extract all .o files from .a files
-newInputFiles=""
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *.a | *.lib)
-        case ${D}file in
-        *.a)
-            suffix=".a"
-            AR="ar"
-            ;;
-        *.lib)
-            suffix=".lib"
-            AR="emxomfar"
-            EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
-            ;;
-        *)
-            ;;
-        esac
-        dirname=\`basnam ${D}file ${D}suffix\`"_%"
-        mkdir ${D}dirname
-        if @<:@ ${D}? -ne 0 @:>@; then
-            echo "Failed to create subdirectory ./${D}dirname"
-            CleanUp
-            exit 8;
-        fi
-        # Append '!' to indicate archive
-        newInputFiles="${D}newInputFiles ${D}{dirname}!"
-        doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
-        cd ${D}curDir
-        found=0;
-        for subfile in ${D}dirname/*.o* ; do
-            if @<:@ -f ${D}subfile @:>@; then
-                found=1
-                if @<:@ -s ${D}subfile @:>@; then
-	            # FIXME: This should be: is file size > 32 byte, _not_ > 0!
-                    newInputFiles="${D}newInputFiles ${D}subfile"
-                fi
-            fi
-        done
-        if @<:@ ${D}found -eq 0 @:>@; then
-            echo "WARNING: there are no files in archive \\'${D}file\\'"
-        fi
-        ;;
-    *)
-        newInputFiles="${D}{newInputFiles} ${D}file"
-        ;;
-    esac
-done
-inputFiles="${D}newInputFiles"
-
-# Output filename(s).
-do_backup=0;
-if @<:@ -z ${D}outFile @:>@; then
-    do_backup=1;
-    set outFile ${D}inputFiles; outFile=${D}2
-fi
-
-# If it is an archive, remove the '!' and the '_%' suffixes
-case ${D}outFile in
-*_%!)
-    outFile=\`basnam ${D}outFile _%!\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outFile in
-*.dll)
-    outFile=\`basnam ${D}outFile .dll\`
-    ;;
-*.DLL)
-    outFile=\`basnam ${D}outFile .DLL\`
-    ;;
-*.o)
-    outFile=\`basnam ${D}outFile .o\`
-    ;;
-*.obj)
-    outFile=\`basnam ${D}outFile .obj\`
-    ;;
-*.a)
-    outFile=\`basnam ${D}outFile .a\`
-    ;;
-*.lib)
-    outFile=\`basnam ${D}outFile .lib\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outimpFile in
-*.a)
-    outimpFile=\`basnam ${D}outimpFile .a\`
-    ;;
-*.lib)
-    outimpFile=\`basnam ${D}outimpFile .lib\`
-    ;;
-*)
-    ;;
-esac
-if @<:@ -z ${D}outimpFile @:>@; then
-    outimpFile=${D}outFile
-fi
-defFile="${D}{outFile}.def"
-arcFile="${D}{outimpFile}.a"
-arcFile2="${D}{outimpFile}.lib"
-
-#create ${D}dllFile as something matching 8.3 restrictions,
-if @<:@ -z ${D}renameScript @:>@ ; then
-    dllFile="${D}outFile"
-else
-    dllFile=\`${D}renameScript ${D}outimpFile\`
-fi
-
-if @<:@ ${D}do_backup -ne 0 @:>@ ; then
-    if @<:@ -f ${D}arcFile @:>@ ; then
-        doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
-    fi
-    if @<:@ -f ${D}arcFile2 @:>@ ; then
-        doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
-    fi
-fi
-
-# Extract public symbols from all the object files.
-tmpdefFile=${D}{defFile}_%
-rm -f ${D}tmpdefFile
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
-        ;;
-    esac
-done
-
-# Create the def file.
-rm -f ${D}defFile
-echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
-dllFile="${D}{dllFile}.dll"
-if @<:@ ! -z ${D}description @:>@; then
-    echo "DESCRIPTION  \\"${D}{description}\\"" >> ${D}defFile
-fi
-echo "EXPORTS" >> ${D}defFile
-
-doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
-grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
-
-# Checks if the export is ok or not.
-for word in ${D}exclude_symbols; do
-    grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
-    mv ${D}{tmpdefFile}% ${D}tmpdefFile
-done
-
-
-if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-    sed "=" < ${D}tmpdefFile | \\
-    sed '
-      N
-      : loop
-      s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
-      t loop
-    ' > ${D}{tmpdefFile}%
-    grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
-else
-    rm -f ${D}{tmpdefFile}%
-fi
-cat ${D}tmpdefFile >> ${D}defFile
-rm -f ${D}tmpdefFile
-
-# Do linking, create implib, and apply lxlite.
-gccCmdl="";
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        gccCmdl="${D}gccCmdl ${D}file"
-        ;;
-    esac
-done
-doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
-touch "${D}{outFile}.dll"
-
-doCommand "emximp -o ${D}arcFile ${D}defFile"
-if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
-    add_flags="";
-    if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-        add_flags="-ynd"
-    fi
-    doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
-fi
-doCommand "emxomf -s -l ${D}arcFile"
-
-# Successful exit.
-CleanUp 1
-exit 0
-EOF
-dnl ===================== dllar.sh ends here =====================
-])

build/aclocal/bakefile.m4

@@ -73,7 +73,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
     PLATFORM_MAC=0
     PLATFORM_MACOS=0
     PLATFORM_MACOSX=0
-    PLATFORM_OS2=0
     PLATFORM_BEOS=0
 
     if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
@@ -84,9 +83,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             *-pc-msdosdjgpp )
                 PLATFORM_MSDOS=1
             ;;
-            *-pc-os2_emx | *-pc-os2-emx )
-                PLATFORM_OS2=1
-            ;;
             *-*-darwin* )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -110,9 +106,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             msdos )
                 PLATFORM_MSDOS=1
             ;;
-            os2 )
-                PLATFORM_OS2=1
-            ;;
             darwin )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -135,7 +128,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
     AC_SUBST(PLATFORM_MAC)
     AC_SUBST(PLATFORM_MACOS)
     AC_SUBST(PLATFORM_MACOSX)
-    AC_SUBST(PLATFORM_OS2)
     AC_SUBST(PLATFORM_BEOS)
 ])
 
@@ -148,10 +140,6 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
 [
-    AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf],
-                                        [use OMF object format (OS/2)]),
-                  [bk_os2_use_omf="$enableval"])
-
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
         dnl For Unix to MacOS X porting instructions, see:
@@ -166,19 +154,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
         fi
         ;;
 
-      *-pc-os2_emx | *-pc-os2-emx )
-        if test "x$bk_os2_use_omf" = "xyes" ; then
-            AR=emxomfar
-            RANLIB=:
-            LDFLAGS="-Zomf $LDFLAGS"
-            CFLAGS="-Zomf $CFLAGS"
-            CXXFLAGS="-Zomf $CXXFLAGS"
-            OS2_LIBEXT="lib"
-        else
-            OS2_LIBEXT="a"
-        fi
-        ;;
-
       i*86-*-beos* )
         LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS"
         ;;
@@ -243,16 +218,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
             DLLPREFIX=""
             dlldir="$bindir"
         ;;
-        *-pc-os2_emx | *-pc-os2-emx )
-            SO_SUFFIX="dll"
-            SO_SUFFIX_MODULE="dll"
-            DLLIMP_SUFFIX=$OS2_LIBEXT
-            EXEEXT=".exe"
-            DLLPREFIX=""
-            LIBPREFIX=""
-            LIBEXT=".$OS2_LIBEXT"
-            dlldir="$bindir"
-        ;;
         *-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
@@ -432,14 +397,6 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         WINDOWS_IMPLIB=1
       ;;
 
-      *-pc-os2_emx | *-pc-os2-emx )
-        SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
-        SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
-        PIC_FLAG=""
-        AC_BAKEFILE_CREATE_FILE_DLLAR_SH
-        chmod +x dllar.sh
-      ;;
-
       powerpc-apple-macos* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
       *-*-mirbsd* | \

build/autogen.mk

@@ -54,7 +54,6 @@ ACLOCAL_SOURCES = \
   build/aclocal/ac_raf_func_which_getservbyname_r.m4 \
   build/aclocal/atomic_builtins.m4 \
   build/aclocal/ax_func_which_gethostbyname_r.m4 \
-  build/aclocal/bakefile-dllar.m4 \
   build/aclocal/bakefile-lang.m4 \
   build/aclocal/bakefile.m4 \
   build/aclocal/cppunit.m4 \

build/bakefiles/common.bkl

@@ -558,13 +558,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
-        <!-- system libraries on os2: -->
-        <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
-            <if cond="FORMAT=='watcom'">
-                <sys-lib>upm32</sys-lib>
-            </if>
-        </if>
-
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>

build/bakefiles/common_samples_intree.bkl

@@ -31,9 +31,6 @@
         </if>
 
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
-        <if cond="FORMAT=='autoconf'">
-            <wx-os2-lib-resource/>
-        </if>
 
         <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
         <if cond="FORMAT!='autoconf'">
@@ -104,20 +101,6 @@
 
     <if cond="FORMAT=='autoconf'">
         <include file="mac_bundles.bkl"/>
-
-        <!--
-        A hack to include precompiled OS/2 resource file in apps instead of
-        compiling it from .rc file (gcc on OS/2 doesn't ship with resource
-        compiler):
-        -->
-        <define-tag name="wx-os2-lib-resource" rules="exe">
-            <set var="os2_lib_res">
-                <if cond="PLATFORM_OS2=='1'">
-                    $(TOP_SRCDIR)include/wx/os2/wx.res
-                </if>
-            </set>
-            <set var="__objects" append="1">$(os2_lib_res)</set>
-        </define-tag>
     </if>
 
 </makefile>

build/bakefiles/config.bkl

@@ -445,7 +445,7 @@ to run the tests, include CppUnit library here.
 
 
     <!-- ================================================================== -->
-    <!--                     windows/dos/os2 compilers                      -->
+    <!--                     windows/dos compilers                          -->
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
@@ -477,7 +477,6 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
             <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
-            <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">
             <if cond="FORMAT=='msevc4prj'">wince</if>
@@ -486,7 +485,6 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if>
             <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
-            <if cond="PLATFORM_OS2=='1'">pm</if>
         </set>
         <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
             <set var="TOOLKIT_VERSION">

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_OS2=='1'">
-            OS2_32
-        </define>
         <define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
             __MSDOS__
         </define>

build/bakefiles/files.bkl

@@ -241,38 +241,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(BASE_COREFOUNDATION_HDR)
 </set>
 
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!--                               OS/2                                     -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_OS2_SRC" hints="files">
-    src/common/fdiodispatcher.cpp
-    src/common/selectdispatcher.cpp
-    src/unix/appunix.cpp
-    src/unix/evtloopunix.cpp
-    src/unix/timerunx.cpp
-    src/os2/dir.cpp
-    src/os2/mimetype.cpp
-    src/os2/snglinst.cpp
-    src/os2/stdpaths.cpp
-    src/os2/thread.cpp
-    src/os2/utils.cpp
-    src/os2/utilsexc.cpp
-</set>
-<set var="BASE_AND_GUI_OS2_SRC" hints="files">
-</set>
-<set var="BASE_OS2_HDR" hints="files">
-    wx/unix/app.h
-    wx/os2/apptbase.h
-    wx/os2/apptrait.h
-    wx/unix/evtloop.h
-    wx/os2/mimetype.h
-    wx/os2/private.h
-    wx/os2/stdpaths.h
-    wx/os2/chkconf.h
-    wx/os2/wxrsc.h
-</set>
-
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                               MSDOS                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -581,10 +549,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
 </set>
 
-<set var="NET_OS2_SRC" hints="files">
-    src/unix/sockunix.cpp
-</set>
-
 <set var="NET_CMN_SRC" hints="files">
     src/common/fs_inet.cpp
     src/common/ftp.cpp
@@ -2060,183 +2024,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
-<!-- ====================================================================== -->
-<!--                               wxOS/2                                   -->
-<!-- ====================================================================== -->
-
-<set var="OS2_LOWLEVEL_SRC" hints="files">
-    <!-- wxUniv builds not supported under OS/2 -->
-</set>
-<set var="OS2_LOWLEVEL_HDR" hints="files">
-</set>
-<set var="OS2_SRC" hints="files">
-    <!-- Generic implementations used by wxOS2: -->
-    src/generic/caret.cpp
-    src/generic/clrpickerg.cpp
-    src/generic/collpaneg.cpp
-    src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
-    src/generic/fdrepdlg.cpp
-    src/generic/filepickerg.cpp
-    src/generic/fontpickerg.cpp
-    src/generic/imaglist.cpp
-    src/generic/listctrl.cpp
-    src/generic/mdig.cpp
-    src/generic/prntdlgg.cpp
-    src/generic/statusbr.cpp
-    src/generic/textmeasure.cpp
-    <!-- OS/2 specific files: -->
-    src/os2/accel.cpp
-    src/os2/app.cpp
-    src/os2/bitmap.cpp
-    src/os2/bmpbuttn.cpp
-    src/os2/brush.cpp
-    src/os2/button.cpp
-    src/os2/checkbox.cpp
-    src/os2/checklst.cpp
-    src/os2/choice.cpp
-    src/os2/clipbrd.cpp
-    src/os2/colour.cpp
-    src/os2/combobox.cpp
-    src/os2/control.cpp
-    src/os2/cursor.cpp
-    src/os2/data.cpp
-    src/os2/dataobj.cpp
-    src/os2/dc.cpp
-    src/os2/dcclient.cpp
-    src/os2/dcmemory.cpp
-    src/os2/dcprint.cpp
-    src/os2/dcscreen.cpp
-    src/os2/dialog.cpp
-    src/os2/dnd.cpp
-    src/os2/evtloop.cpp
-    src/os2/filedlg.cpp
-    src/os2/font.cpp
-    src/os2/fontdlg.cpp
-    src/os2/fontenum.cpp
-    src/os2/fontutil.cpp
-    src/os2/frame.cpp
-    src/os2/gauge.cpp
-    src/os2/gdiimage.cpp
-    src/os2/sockpm.cpp
-    src/os2/helpwin.cpp
-    src/os2/icon.cpp
-    src/os2/iniconf.cpp
-    src/os2/listbox.cpp
-    src/os2/main.cpp
-    src/os2/menu.cpp
-    src/os2/menuitem.cpp
-    src/os2/metafile.cpp
-    src/os2/minifram.cpp
-    src/os2/msgdlg.cpp
-    src/os2/nativdlg.cpp
-    src/os2/notebook.cpp
-    src/os2/ownerdrw.cpp
-    src/os2/palette.cpp
-    src/os2/pen.cpp
-    src/os2/popupwin.cpp
-    src/os2/print.cpp
-    src/os2/radiobox.cpp
-    src/os2/radiobut.cpp
-    src/os2/region.cpp
-    src/os2/scrolbar.cpp
-    src/os2/settings.cpp
-    src/os2/slider.cpp
-    src/os2/spinbutt.cpp
-    src/os2/spinctrl.cpp
-    src/os2/statbmp.cpp
-    src/os2/statbox.cpp
-    src/os2/statline.cpp
-    src/os2/stattext.cpp
-    src/os2/textctrl.cpp
-    src/os2/textentry.cpp
-    src/os2/tglbtn.cpp
-    src/os2/timer.cpp
-    src/os2/toolbar.cpp
-    src/os2/tooltip.cpp
-    src/os2/toplevel.cpp
-    src/os2/utilsgui.cpp
-    src/os2/window.cpp
-</set>
-<set var="OS2_HDR" hints="files">
-    wx/generic/caret.h
-    wx/generic/clrpickerg.h
-    wx/generic/collpaneg.h
-    wx/generic/colrdlgg.h
-    wx/generic/dirdlgg.h
-    wx/generic/fdrepdlg.h
-    wx/generic/listctrl.h
-    wx/generic/mdig.h
-    wx/generic/statusbr.h
-    wx/os2/accel.h
-    wx/os2/app.h
-    wx/os2/bitmap.h
-    wx/os2/bmpbuttn.h
-    wx/os2/brush.h
-    wx/os2/button.h
-    wx/os2/checkbox.h
-    wx/os2/checklst.h
-    wx/os2/choice.h
-    wx/os2/clipbrd.h
-    wx/os2/colour.h
-    wx/os2/combobox.h
-    wx/os2/control.h
-    wx/os2/cursor.h
-    wx/os2/dataform.h
-    wx/os2/dataobj.h
-    wx/os2/dataobj2.h
-    wx/os2/dc.h
-    wx/os2/dcclient.h
-    wx/os2/dcmemory.h
-    wx/os2/dcprint.h
-    wx/os2/dcscreen.h
-    wx/os2/dialog.h
-    wx/os2/dnd.h
-    wx/os2/filedlg.h
-    wx/os2/font.h
-    wx/os2/fontdlg.h
-    wx/os2/frame.h
-    wx/os2/gauge.h
-    wx/os2/gdiimage.h
-    wx/os2/helpwin.h
-    wx/os2/icon.h
-    wx/os2/iniconf.h
-    wx/os2/listbox.h
-    wx/os2/menu.h
-    wx/os2/menuitem.h
-    wx/os2/metafile.h
-    wx/os2/minifram.h
-    wx/os2/msgdlg.h
-    wx/os2/notebook.h
-    wx/os2/ownerdrw.h
-    wx/os2/palette.h
-    wx/os2/pen.h
-    wx/os2/pnghand.h
-    wx/os2/pngread.h
-    wx/os2/print.h
-    wx/os2/radiobox.h
-    wx/os2/radiobut.h
-    wx/os2/region.h
-    wx/os2/scrolbar.h
-    wx/os2/settings.h
-    wx/os2/slider.h
-    wx/os2/spinbutt.h
-    wx/os2/spinctrl.h
-    wx/os2/statbmp.h
-    wx/os2/statbox.h
-    wx/os2/statline.h
-    wx/os2/stattext.h
-    wx/os2/textctrl.h
-    wx/os2/textentry.h
-    wx/os2/tglbtn.h
-    wx/os2/toolbar.h
-    wx/os2/tooltip.h
-    wx/os2/toplevel.h
-    wx/os2/window.h
-</set>
-
-
-
 <!-- ====================================================================== -->
 <!--                                wxOSX Common                            -->
 <!-- ====================================================================== -->
@@ -3152,17 +2939,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/joystick.h
 </set>
 
-<set var="ADVANCED_OS2_SRC" hints="files">
-    src/generic/animateg.cpp
-    src/os2/joystick.cpp
-    src/os2/sound.cpp
-</set>
-<set var="ADVANCED_OS2_HDR" hints="files">
-    wx/generic/animate.h
-    wx/os2/joystick.h
-    wx/os2/sound.h
-</set>
-
 <set var="ADVANCED_UNIX_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/unix/joystick.cpp
@@ -3321,11 +3097,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_COCOA_HDR" hints="files">
 </set>
 
-<set var="MEDIA_OS2_SRC" hints="files">
-</set>
-<set var="MEDIA_OS2_HDR" hints="files">
-</set>
-
 <set var="MEDIA_UNIX_SRC" hints="files">
     src/unix/mediactrl.cpp
 </set>
@@ -3626,7 +3397,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
     <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
-    <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
 <set var="OPENGL_SRC" hints="files">
@@ -3850,7 +3620,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_OS2=='1'">$(BASE_OS2_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
@@ -3884,7 +3653,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
-        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">
@@ -3901,7 +3669,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_SRC)</if>
-        <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
@@ -3925,7 +3692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if>
         <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=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
     </set>
@@ -3940,7 +3706,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if>
         <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=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
@@ -3961,7 +3726,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
-        <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
@@ -3974,7 +3738,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
-        <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
     </set>
 
     <set var="CORE_SRC" hints="files">
@@ -3999,7 +3762,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
@@ -4013,7 +3775,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
     <!-- wxAdv files not used by wxUniv -->
@@ -4050,7 +3811,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
     </set>
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
@@ -4062,7 +3822,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
     </set>
     <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
     <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
@@ -4111,7 +3870,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_OS2_SRC)
         $(BASE_MSDOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_OSX_CARBON_SRC)

build/bakefiles/make_dist.mk

@@ -32,7 +32,6 @@ X11INC   = $(WXDIR)/include/wx/x11
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
-PMDIR    = $(WXDIR)/src/os2
 MACDIR   = $(WXDIR)/src/osx
 COCOADIR = $(WXDIR)/src/cocoa
 FTDIR    = $(WXDIR)/src/freetype
@@ -303,14 +302,12 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/osx
 	mkdir $(DISTDIR)/include/wx/osx/carbon
 	mkdir $(DISTDIR)/include/wx/osx/core
-	mkdir $(DISTDIR)/include/wx/os2
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/osx
 	mkdir $(DISTDIR)/src/osx/core
 	mkdir $(DISTDIR)/src/osx/carbon
 	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
-	mkdir $(DISTDIR)/src/os2
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \

build/bakefiles/tiff.bkl

@@ -36,7 +36,6 @@
     <set var="TIFF_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">src/tiff/libtiff/tif_unix.c</if>
         <if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
         <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
     </set>
 
@@ -50,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_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
         <define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
         <if cond="IS_MSVC">
             <!--

build/bakefiles/wx.bkl

@@ -176,7 +176,7 @@
     </if>
 
 
-    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
+    <!-- copy setup.h on DOS/Windows if the format supports it: -->
     <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
@@ -193,8 +193,7 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
-            <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
         </set>
 
         <copy-file-to-file-if-not-exist id="master_setup.h">

build/bakefiles/wxpresets/presets/wx.bkl

@@ -414,7 +414,7 @@
                     <command cond="TOOLSET=='unix'">
                         @mkdir -p $(_DIRNAME)
                     </command>
-                    <command cond="TOOLSET in ['win32','os2','dos']">
+                    <command cond="TOOLSET in ['win32','dos']">
                         if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
                     </command>
                 </modify-target>

build/buildbot/config/push.xml

@@ -17,70 +17,6 @@
 
 <xi:include href="include/push.xml"/>
 
-<build>
-    <name>wxOS2 Stable GCC</name>
-    <builddir>psh_os2_stable_gcc</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="compiler"/>
-        <show log="update"/>
-        <show log="configure"/>
-        <show log="compile"/>
-        <show log="demos"/>
-        <show log="samples"/>
-        <show log="utils"/>
-        <show log="tests"/>
-    </steps>
-</build>
-
-<build>
-    <name>wxOS2 Stable OpenWatcom</name>
-    <builddir>psh_os2_stable_ow</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="compiler"/>
-        <show log="update"/>
-        <show log="configure"/>
-        <show log="compile"/>
-        <show log="demos"/>
-        <show log="samples"/>
-    </steps>
-</build>
-
-<build>
-    <name>wxOS2 Trunk GCC</name>
-    <builddir>psh_os2_trunk_gcc</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="compiler"/>
-        <show log="update"/>
-        <show log="configure"/>
-        <show log="compile"/>
-        <show log="demos"/>
-        <show log="samples"/>
-        <show log="utils"/>
-        <show log="tests"/>
-    </steps>
-</build>
-
-<build>
-    <name>wxOS2 Trunk OpenWatcom</name>
-    <builddir>psh_os2_trunk_ow</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="compiler"/>
-        <show log="update"/>
-        <show log="configure"/>
-        <show log="compile"/>
-        <show log="demos"/>
-        <show log="samples"/>
-    </steps>
-</build>
-
 <build>
     <name>Solaris HEAD GTK1</name>
     <builddir>psh_solaris_hd_gtk1</builddir>

build/os2/Bakefiles.os2.bkgen

@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-
-<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
-
-    <add-flags formats="watcom">
-        -DPLATFORM_OS2=1
-    </add-flags>
-
-    <include file="../bakefiles/Bakefiles.bkgen"/>
-
-    <add-flags files="wx.bkl" formats="watcom">
-        -o../os2/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/os2/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../build/os2/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../build/os2/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../../build/os2/config.wat
-    </add-flags>
-
-</bakefile-gen>

build/os2/config.wat

@@ -1,133 +0,0 @@
-# =========================================================================
-#     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
-#     Beware that all changes made to this file will be overwritten next
-#     time you run Bakefile!
-# =========================================================================
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# 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
-
-# Build wxUniversal instead of native port? [0,1]
-#   1 - Universal
-WXUNIV = 0
-
-# Compile Unicode build of wxWidgets? [0,1]
-#   1 - Unicode
-UNICODE = 1
-
-# 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 wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC = 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
-
-# Enable threading in compiled code. [0,1]
-USE_THREADS = 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 = 
-
-# Version of C runtime library to use. You can change this to
-# static if SHARED=0, but it is highly recommended to not do
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]
-RUNTIME_LIBS = dynamic
-

build/script/rebuild-makefiles.sh

@@ -63,8 +63,6 @@ package_makefiles()
     do_package zip msvc6prj  '*.dsp' '*.dsw'
     do_package zip msvc7-8prj  '*.vcproj' '*.sln'    
     do_package zip evcprj    '*.vcp' '*.vcw'
-  (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen)
-  do_package zip watcom_os2    makefile.wat config.wat
 }
 
 copy_files ()

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,os2,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [INI]
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"

build/update-setup-h

@@ -100,7 +100,6 @@ update_common_setup_h include/wx/msw/setup0.h
 update_common_setup_h include/wx/msw/wince/setup.h
 update_common_setup_h include/wx/gtk/setup0.h
 update_common_setup_h include/wx/osx/setup0.h
-update_common_setup_h include/wx/os2/setup0.h
 update_common_setup_h include/wx/univ/setup0.h
 update_common_setup_h setup.h.in
 

configure.in

@@ -62,7 +62,6 @@ dnl ------------------------------------------------------------------------
 
 dnl OS (assume Unix)
 USE_UNIX=1
-USE_OS2=0
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
@@ -100,7 +99,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 MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW 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 +111,6 @@ DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
-DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
 
@@ -127,7 +125,6 @@ DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
-DEFAULT_DEFAULT_wxUSE_PM=0
 DEFAULT_DEFAULT_wxUSE_X11=0
 DEFAULT_DEFAULT_wxUSE_DFB=0
 
@@ -283,40 +280,6 @@ case "${host}" in
     PROGRAM_EXT=".exe"
   ;;
 
-  *-pc-os2_emx | *-pc-os2-emx )
-    AC_DEFINE(__EMX__)
-    USE_OS2=1
-    AC_DEFINE(__OS2__)
-    PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_PM=1
-    dnl "c++" wrapper is not always available, so always use plain gcc.
-    CXX=gcc
-    LDFLAGS="$LDFLAGS -Zcrtdll"
-    dnl
-    dnl Some special code that's automatically added by autoconf-2.57 for OS/2
-    dnl and hopefully also by autoconf-2.58 and newer on all other platforms.
-    dnl For now however, we still need it to make sure the configure script
-    dnl works on OS/2 no matter what platform it is generated on.
-    ac_executable_extensions=".exe"
-    export ac_executable_extensions
-    dnl This strange code is necessary to deal with handling of
-    dnl backslashes by ksh and pdksh's sh variant.
-    ac_save_IFS="$IFS"
-    IFS='\\'
-    ac_TEMP_PATH=
-    for ac_dir in $PATH; do
-      IFS=$ac_save_IFS
-      if test -z "$ac_TEMP_PATH"; then
-        ac_TEMP_PATH="$ac_dir"
-      else
-        ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir"
-      fi
-    done
-    export PATH="$ac_TEMP_PATH"
-    unset ac_TEMP_PATH
-    DEFAULT_STD_FLAG=no
-  ;;
-
   arm-apple-darwin*)
     dnl iPhone
     USE_BSD=1
@@ -476,7 +439,6 @@ AC_ARG_WITH(mac,           [  --with-mac              same as --with-osx], [wxUS
 AC_ARG_WITH(old_cocoa,     [  --with-old_cocoa        use old, deprecated, Cocoa port], [wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1])
 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(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])
@@ -536,12 +498,6 @@ if test "$wxUSE_GUI" = "yes"; then
                   + ${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.
-    case "${host}" in
-      *-pc-os2_emx | *-pc-os2-emx )
-        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    esac
-
     case "$NUM_TOOLKITS" in
       1)
       ;;
@@ -698,10 +654,6 @@ WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode
 WX_ARG_ENABLE_PARAM(utf8,    [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
 WX_ARG_ENABLE(utf8only,      [  --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
 WX_ARG_ENABLE(extended_rtti, [  --enable-extended_rtti  use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI)
-if test "$USE_OS2" = 1; then
-    DEFAULT_wxUSE_OMF=no
-    WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
-fi
 
 WX_ARG_DISABLE(optimise,   [  --disable-optimise      compile without optimisations], wxUSE_OPTIMISE)
 
@@ -1446,77 +1398,6 @@ if test "$USE_UNIX" = 1 ; then
     AC_DEFINE(__UNIX__)
 fi
 
-dnl This case is for OS/2 vs. everything else
-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl ---------------------------------------------------------------------
-      dnl When we are using gcc on OS/2, we want to be either using resources
-      dnl (PM) or a more complete POSIX emulation for Motif/GTK+/X11.
-      dnl Moreover we need to link explicitly against either stdcpp.a or
-      dnl stdcxx.a (depending on compiler version), since we are using "gcc",
-      dnl not "g++/c++".
-      dnl ---------------------------------------------------------------------
-      dnl (OS/2-only piece)
-      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
-          dnl More complete Unix emulation for unix-like ports
-          dnl by linking in POSIX/2's cExt (if available).
-          AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
-      fi
-      dnl Check for the gcc version (and thereby for the C runtime library).
-      dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
-      dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1
-      dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5
-      dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6.
-      AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[
-          AC_TRY_RUN(
-              dnl Check the gcc version macro.
-              [
-                  #include <stdio.h>
-
-                  int main()
-                  {
-                      FILE *f=fopen("conftestval", "w");
-                      if (!f) exit(1);
-                      fprintf(f,
-                  #if (__GNUC__ < 3)
-                              "EMX2"
-                  #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
-                              "EMX3"
-                  #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2)
-                              "Innotek5"
-                  #else
-                              "Innotek6"
-                  #endif
-                      );
-                      exit(0);
-                  }
-              ],
-              wx_cv_gccversion=`cat conftestval`,
-              wx_cv_gccversion="EMX2",
-              dnl Compilation error: Assuming standard EMX environment
-              wx_cv_gccversion="EMX2"
-          )
-      ])
-      if test "$wx_cv_gccversion" = "EMX2"; then
-          LIBS="$LIBS -lstdcpp"
-          LDFLAGS="$LDFLAGS -Zsysv-signals"
-      else
-          if test "$wx_cv_gccversion" = "EMX3"; then
-              LIBS="$LIBS -lstdcxx -lgcc"
-              LDFLAGS="$LDFLAGS -Zsysv-signals"
-          else
-              LIBS="$LIBS -lstdc++"
-          fi
-      fi
-      if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
-        AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
-        wxUSE_OMF=yes
-        enable_omf=yes
-      fi
-      dnl (end of OS/2-only piece)
-  ;;
-esac
-
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -1530,19 +1411,6 @@ if test "$ac_cv_header_wchar_h" != "yes"; then
     AC_CHECK_HEADERS([wcstr.h],,, [AC_INCLUDES_DEFAULT()])
 fi
 
-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lintl if langinfo.h is available
-      dnl and intl not yet included in libc
-      if test $ac_cv_header_langinfo_h = "yes" \
-                -a \(   "$wx_cv_gccversion" = "EMX2" \
-                     -o "$wx_cv_gccversion" = "EMX3" \
-                     -o "$wx_cv_gccversion" = "Innotek5" \); then
-          LIBS="$LIBS -lintl"
-      fi
-  ;;
-esac
-
 if test "$USE_UNIX" = 1 ; then
     dnl POSIX needs this for select(), but old systems don't have it
     AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
@@ -3440,37 +3308,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         GUIDIST=COCOA_DIST
     fi
 
-    if test "$wxUSE_PM" = 1; then
-        TOOLKIT=PM
-        GUIDIST=PM_DIST
-        AC_CACHE_CHECK([for type SPBCDATA],
-            wx_cv_spbcdata,
-            [
-                AC_TRY_COMPILE(
-                    [
-                        #define INCL_PM
-                        #include <os2.h>
-                    ],
-                    [
-                        SPBCDATA test;
-                    ],
-                    wx_cv_spbcdata=yes,
-                    wx_cv_spbcdata=no
-                )
-            ]
-        )
-
-        if test $wx_cv_spbcdata = "yes"; then
-            AC_DEFINE(HAVE_SPBCDATA)
-        fi
-    fi
-
     dnl the name of the directory where the files for this toolkit live
-    if test "$TOOLKIT" = "PM" ; then
+    TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
-        TOOLKIT_DIR="os2"
-    else
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
-    fi
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
@@ -3506,7 +3345,7 @@ dnl ---------------------------------------------------------------------------
 
 dnl do this after test for X11 above so that we have a chance of finding Xlib.h
 if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
+    if test "$wxUSE_UNIX" = "yes"; then
         dnl defines HAVE_X11_XKBLIB_H
         AC_CHECK_HEADERS([X11/Xlib.h],,, [ ])
         AC_CHECK_HEADERS([X11/XKBlib.h],,,
@@ -3861,11 +3700,7 @@ if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA"
 else
     WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 fi
-if test "${TOOLKIT_DIR}" = "os2"; then
+WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
-else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
-fi
 
 
 
@@ -4679,7 +4514,7 @@ dnl                          the next matching "else")
 dnl ---------------------------------------------------------------------------
 
 dnl under MSW (except mingw32) we always have thread support
-if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
+if test "$TOOLKIT" != "MSW"; then
 
     dnl the code below:
     dnl
@@ -5144,10 +4979,6 @@ else
                 CFLAGS="$CFLAGS_OLD"
             fi
         ;;
-        *-pc-os2*emx )
-            WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
-            LDFLAGS="$LDFLAGS -Zmt"
-        ;;
       esac
     fi
 fi
@@ -5326,19 +5157,10 @@ else
         fi
     else
         if test "$GCC" = yes ; then
-            case "${host}" in
+            dnl Switch on optimisation but keep strict-aliasing off for
-                *-pc-os2_emx | *-pc-os2-emx )
+            dnl now (see -fstrict-aliasing in the gcc manual). When it is
-                    dnl Not all of the supported gcc versions understand
+            dnl switched back on consider using -Wstrict-aliasing=2.
-                    dnl -fstrict-aliasing and none actually needs it (yet).
+            OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-                    OPTIMISE_CFLAGS="-O2"
-                ;;
-                *)
-                    dnl Switch on optimisation but keep strict-aliasing off for
-                    dnl now (see -fstrict-aliasing in the gcc manual). When it is
-                    dnl switched back on consider using -Wstrict-aliasing=2.
-                    OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-                ;;
-            esac
         else
             OPTIMISE_CFLAGS="-O"
         fi
@@ -5392,7 +5214,7 @@ dnl DLL support
 dnl ------------------------------------------------------------------------
 
 dnl under MSW we always have LoadLibrary/GetProcAddress
-if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
+if test "$TOOLKIT" != "MSW"; then
 
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
@@ -6489,12 +6311,12 @@ dnl wxMetafile
 dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_METAFILE" = "yes"; then
-    if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
+    if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1; then
         AC_MSG_WARN([wxMetafile is not available on this system... disabled])
         wxUSE_METAFILE=no
     fi
 elif test "$wxUSE_METAFILE" = "auto"; then
-    if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
+    if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1; then
         wxUSE_METAFILE=yes
     fi
 fi
@@ -7011,14 +6833,10 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_OLD_COCOA" = 1 ; then
         AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else
-        if test "$wxUSE_PM" = 1; then
+        AC_DEFINE(wxUSE_POPUPWIN)
-            AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
-        else
-            AC_DEFINE(wxUSE_POPUPWIN)
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
 
-            USES_CONTROLS=1
+        USES_CONTROLS=1
-        fi
     fi
 fi
 
@@ -7037,11 +6855,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
 fi
 
 if test "$wxUSE_TIPWINDOW" = "yes"; then
-    if test "$wxUSE_PM" = 1; then
+    AC_DEFINE(wxUSE_TIPWINDOW)
-        AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
-    else
-        AC_DEFINE(wxUSE_TIPWINDOW)
-    fi
 fi
 
 if test "$USES_CONTROLS" = 1; then
@@ -7400,7 +7214,7 @@ dnl ---------------------------------------------------------------------------
 dnl options used under wxMSW and wxPM
 dnl ---------------------------------------------------------------------------
 
-if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+if test "$wxUSE_MSW" = 1; then
     if test "$wxUSE_OWNER_DRAWN" = "yes"; then
         AC_DEFINE(wxUSE_OWNER_DRAWN)
     fi
@@ -7775,9 +7589,6 @@ if test "$wxUSE_GUI" = "yes"; then
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll"
         fi
     fi
-    if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw"
-    fi
 else
     SAMPLES_SUBDIRS="console"
     if test "$wxUSE_SOCKETS" = "yes" ; then
@@ -8145,16 +7956,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
 else
     dnl default value is to (silently) do nothing in the makefile
     MACSETFILE="@true"
-
+    POSTLINK_COMMAND="@true"
-    if test "$wxUSE_PM" = 1; then
-        RESCOMP="emxbind"
-        WXCONFIG_RESFLAGS="-ep"
-
-        dnl Is this one really used anywhere for pm?
-        POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
-    else
-        POSTLINK_COMMAND="@true"
-    fi
 fi
 
 fi
@@ -8195,29 +7997,6 @@ if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then
     fi
 fi
 
-if test "$wxUSE_SHARED" = "yes"; then
-    dnl Need addtional flag on OS/2, so override bakefiles value
-    dnl (there currently is no suitable variable to which the
-    dnl  missing flags could be added, AFAICS. SN, 18.12.2004. )
-    case "${host}" in
-      *-pc-os2_emx | *-pc-os2-emx )
-        SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
-        SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
-        cp -p ${srcdir}/src/os2/dllnames.sh .
-        cp -p ${srcdir}/src/os2/dllar.sh .
-      ;;
-    esac
-fi
-if test "$wxUSE_OMF" = "yes"; then
-    case "${host}" in
-      *-pc-os2_emx | *-pc-os2-emx )
-        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
-        LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
-        WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
-      ;;
-    esac
-fi
-
 dnl TOOLCHAIN_DEFS should be used for both wx and client code
 WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
 

demos/bombs/Makefile.in

@@ -48,7 +48,6 @@ BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 BOMBS_OBJECTS =  \
-	$(__bombs_os2_lib_res) \
 	bombs_bombs.o \
 	bombs_bombs1.o \
 	bombs_game.o \
@@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__bombs_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__bombs_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= bombs.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle

demos/forty/Makefile.in

@@ -50,7 +50,6 @@ FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 FORTY_OBJECTS =  \
-	$(__forty_os2_lib_res) \
 	forty_forty.o \
 	forty_canvas.o \
 	forty_card.o \
@@ -97,8 +96,6 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__forty_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= forty.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle

demos/fractal/Makefile.in

@@ -48,7 +48,6 @@ FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 FRACTAL_OBJECTS =  \
-	$(__fractal_os2_lib_res) \
 	fractal_fractal.o \
 	$(__fractal___win32rc)
 
@@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__fractal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__fractal_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__fractal_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= fractal.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle

demos/life/Makefile.in

@@ -48,7 +48,6 @@ LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
-	$(__life_os2_lib_res) \
 	life_life.o \
 	life_dialogs.o \
 	life_game.o \
@@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__life_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__life_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= life.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle

demos/poem/Makefile.in

@@ -49,7 +49,6 @@ WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 WXPOEM_OBJECTS =  \
-	$(__wxpoem_os2_lib_res) \
 	wxpoem_wxpoem.o \
 	$(__wxpoem___win32rc)
 
@@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__wxpoem___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__wxpoem_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__wxpoem_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= wxpoem.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle

docs/doxygen/mainpages/const_cpp.h

@@ -47,7 +47,7 @@ while @c __WINDOWS__ should be used for the platform tests.}
 @itemdef{__WXOSX_MAC__, Mac OS X (Carbon or Cocoa)}
 @itemdef{__WXOSX_OR_COCOA__, Any Mac OS X port (wxOSX-Carbon, wxOSX-Cocoa or 
                         wxCocoa)}
-@itemdef{__WXPM__, OS/2 native Presentation Manager}
+@itemdef{__WXPM__, OS/2 native Presentation Manager (not used any longer).}
 @itemdef{__WXSTUBS__, Stubbed version ('template' wxWin implementation)}
 @itemdef{__WXXT__, Xt; mutually exclusive with WX_MOTIF, not implemented in wxWidgets 2.x}
 @itemdef{__WXX11__, wxX11 (__WXUNIVERSAL__ will be also defined)}
@@ -157,7 +157,7 @@ compiler used.
 @itemdef{__MINGW64_TOOLCHAIN__, MinGW-w64 in either 32 or 64 bit builds}
 @itemdef{__SUNCC__, Sun CC, see also wxCHECK_SUNCC_VERSION}
 @itemdef{__SYMANTECC__, Symantec C++}
-@itemdef{__VISAGECPP__, IBM Visual Age (OS/2)}
+@itemdef{__VISAGECPP__, IBM Visual Age (OS/2) (not used any more).}
 @itemdef{__VISUALC__, Microsoft Visual C++, see also ::wxCHECK_VISUALC_VERSION.
                     The value of this macro corresponds to the compiler version:
                     @c 1020 for @c 4.2 (the first supported version), @c 1100 for

docs/doxygen/mainpages/const_wxusedef.h

@@ -312,18 +312,6 @@ library:
 @endDefList
 
 
-@section page_wxusedef_os2 OS2 Symbols
-
-@beginDefList
-@itemdef{wxUSE_CONSOLEDEBUG, See src/os2/app.cpp file.}
-@itemdef{wxUSE_DDE, See src/os2/mimetype.cpp file.}
-@itemdef{wxUSE_IMAGE_LOADING_IN_MSW, See src/os2/clipbrd.cpp file.}
-@itemdef{wxUSE_IMAGE_LOADING_IN_OS2, See src/os2/gdiimage.cpp file.}
-@itemdef{wxUSE_NET_API, Use NetBios32GetInfo API call.}
-@itemdef{wxUSE_RESOURCE_LOADING_IN_OS2, See src/os2/gdiimage.cpp file.}
-@endDefList
-
-
 @section page_wxusedef_msw wxMSW Symbols
 
 @beginDefList

docs/doxygen/mainpages/platdetails.h

@@ -101,16 +101,6 @@ docs for it are available in @c docs/cocoa in the distribution.
 
 
 
-@section page_port_wxos2 wxOS2
-
-wxOS2 is a port of wxWidgets for the IBM OS/2 Warp3 and Warp4 platforms.
-This port is currently under construction and in beta phase.
-
-For further information, please see the files in @c docs/os2
-in the distribution.
-
-
-
 @section page_port_wxx11 wxX11
 
 wxX11 is a port of wxWidgets using X11 (The X Window System) as the underlying

docs/doxygen/overviews/bitmap.h

@@ -54,7 +54,7 @@ wxIcon icon(wxICON(sample));
 
 There is also a corresponding wxBITMAP() macro which allows to create the
 bitmaps in much the same way as wxICON() creates icons. It assumes that bitmaps
-live in resources under Windows or OS2 and XPM files under all other platforms
+live in resources under Windows and XPM files under all other platforms
 (for XPMs, the corresponding file must be included before this macro is used,
 of course, and the name of the bitmap should be the same as the resource name
 under Windows with @c _xpm suffix). For example:
@@ -64,7 +64,7 @@ under Windows with @c _xpm suffix). For example:
 wxBitmap bmp(wxBITMAP(bmpname));
 
 // which is roughly equivalent to the following
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__)
     wxBitmap bmp("bmpname", wxBITMAP_TYPE_BMP_RESOURCE);
 #else // Unix
     wxBitmap bmp(bmpname_xpm, wxBITMAP_TYPE_XPM);

docs/doxygen/overviews/xrc_format.h

@@ -2415,7 +2415,6 @@ Possible elemental values are:
 @itemdef{ @c win, Windows }
 @itemdef{ @c mac, Mac OS X (or Mac Classic in wxWidgets version supporting it) }
 @itemdef{ @c unix, Any Unix platform @em except OS X }
-@itemdef{ @c os2, OS/2 }
 @endDefList
 
 Examples:

docs/index.htm

@@ -57,7 +57,6 @@
       <a href="x11/install.txt">wxX11</a>,
       <a href="mac/install.txt">wxMac</a>,
       <a href="cocoa/install.txt">wxCocoa</a>,
-      <a href="os2/install.txt">wxOS2</a>
     </li>
     <li><a href="changes.txt"><b>General change log</b></a></li>
     <li>Licence:

docs/os2/install.txt

@@ -1,224 +0,0 @@
-Installing wxWidgets
---------------------
-
-This is wxWidgets for IBM OS/2 Warp3 and Warp4. This is an unstable
-development release and OS/2 is considered to be in beta.
-
-IMPORTANT NOTE: If you experience problems installing, please
-re-read this instructions and other related files (changes.txt,
-readme.txt, notes on the Web site) carefully before mailing
-wx-users or the author. Preferably, try to fix the problem first and
-then send a patch to the author. Please report bugs using the
-bug report form on the wxWidgets web site.
-
-Unarchiving
------------
-
-At this time there is no comprehensive setup.exe type installation program.
-wxWidgets for OS/2 requires you download various .zip files and unpack them
-to your desired location on your system.  Pick a location say,
-C:\wx\wxWidgets-2.8.0, copy the .zip files to there and unzip them ensuring you
-unzip the subdirectories as well.  You will need:
-
-- All common, generic and OS2-specific wxWidgets source;
-- samples;
-- documentation in HTML Help format;
-- makefiles for VisualAge V3.0 (possibly for EMX and Watcom C++);
-- JPEG, TIFF, PNG, ZLIB, wxSTC, REGEX, EXPAT library sources.
-
-All but the documentation is included in wxOS2-2.8.0.zip, documentation
-must be downloaded separately from the wxWidgets Web site.
-
-
-General installation notes
---------------------------
-
-After unzipping everything your directory tree should look something like
-this:
-
-x:\wx\wxWidgets-2.8.0\docs (your HTML reference manual)
-x:\wx\wxWidgets-2.8.0\include\wx
-x:\wx\wxWidgets-2.8.0\include\wx\generic
-x:\wx\wxWidgets-2.8.0\include\wx\html
-x:\wx\wxWidgets-2.8.0\include\wx\os2
-x:\wx\wxWidgets-2.8.0\samples\....  (all the sample directories)
-x:\wx\wxWidgets-2.8.0\src
-x:\wx\wxWidgets-2.8.0\src\common
-x:\wx\wxWidgets-2.8.0\src\generic
-x:\wx\wxWidgets-2.8.0\src\html
-x:\wx\wxWidgets-2.8.0\src\jpeg
-x:\wx\wxWidgets-2.8.0\src\os2
-x:\wx\wxWidgets-2.8.0\src\png
-x:\wx\wxWidgets-2.8.0\src\tiff
-x:\wx\wxWidgets-2.8.0\src\zlib
-
-If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWidgets-2.8.0\lib
-and you will have to set a WXWIN environment variable in your
-config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.8.0;
-
-Compilation
------------
-
-For now, only VisualAge V3.0 FP 8 and EMX-0.9d (with fix4) are supported.
-However, the library has been successfully compiled with Watcom C++ as
-well. As those build environments get a bit more "formalized", I will add
-them here.
-
-Compilation with VisualAge on the one hand and EMX on the other hand are
-rather different, VisualAge is essentially following Windows' way of doing
-it, EMX is following the example of the unix ports.
-
-Compilation with VisualAge
---------------------------
-
-In addition to VisualAge V3.0 Fixpack 8 you will need the following in order
-to successfully build and use wxWidgets for OS/2:
-
-1.  IBM OS/2 Toolkit Version 4.5 or later
-2.  IBM TCPIP V4.0 or later
-3.  You will need the IBMLAN Lan Requester service and UPM if you wish to use
-    network based components of the library (generally a standard part of any
-    Warp Connect 3.0 or Warp 4.0 installation.
-4.  I strongly suggest that you have the latest IBM fixpacks installed for
-    all your components.
-
-Go to the \src directory and open the file, makeva.env (there should be a
-.env for each supported compiler when they are fully supported), for edit.
-This is where the "make" environment for wxOS2 is set.  Locate UMPLIB, NETLIB,
-and TCPIP environment variables about 20 lines down.  Set these to match
-your system.
-
-There are number of possible outputs you can produce.  There is a static
-lib and a dynamically linked lib, and both can be built in debug or release
-mode.  Since wxOS2 is a beta and a rough one at that, I suggest, for now,
-you stick to the debug builds.  The resultant linkable binaries will be
-output to the \lib directory as will the .dll files.  The statically linked
-lib will be named wx.lib.  Each of the third party libs will be there as well,
-including png.lib, jpeg.lib, tiff.lib, and zlib.lib.  For DLL builds the
-import libs will have the same name, only with a 'd' appended.  Thus the
-import library for the main lib in a dll build is wxd.lib.
-
-Object modules will be output into paths dictated by the build mode.  For
-example, for debug static the outputs will be in DebugOS2, for DLLs in
-DebugOS2DLL.
-
-For your first build, you can directly build the library.  For subsequent
-builds you will want to "clean" the output paths.  To build the static library
-go to \src and execute nmake all -f makefile.va.  To clean out the outputs
-execute nmake clean -f makefile.va.
-
-To build the wx.dll execut nmake all -f makefile.va WXMAKINGDLL=1.  To clean
-the outputs execute namek clean -f makefile.va WXMAKINGDLL=1.  For
-VisualAge 3.0 we use the module definition file method.
-
-If, for some reason you encounter linking problems with your dll build you may
-need to rebuild the module definition file, wx23.def, found in \src\os2.  To
-do this you need to have a static version built.  Go to the \lib directoy and
-execute CPPFILT /B /P wx.lib>temp.def.  Copy this file to \src\os2.  Delete
-the temp.def from your \lib directory.
-
-I find the following to be the easiest to reconstruct the .def file.  Open
-both the wx23.def and the temp.def file.  Copy the header of the wx23.def to
-the clipboard and paste it into the top of the temp.def file.  If you have
-a valid SQL database client with its SDK on your system you can skip the next
-step.  wxWidgets included some ODBC and SQL modules.  They expect the standard
-sql.h and such to available.  If you do not have a database client with its
-SDK (such as DB/2) then for the .dll build you need to delete the exports for
-the following three modules from your temp.def file, db.cpp, dbgrid.cpp and
-dbtable.cpp.  save you changes to temp.def.  Delete wx23.def and rename your
-temp.def to wx23.def and you are ready to go.
-
-I hope to clean up the .dll builds at some point before the library is
-a full fledged production caliber product.  Fortunately EMX and Watcom can use
-the import and export pragmas successfully negating the need for manual .def
-files.  VA 3.0, unfortunately in C++ does not properly export the mangled
-names so we are stuck with the CPPFILT .def file method of .dll builds for
-now.
-
-When building an application that uses the wx.dll you need to build it using
-the WXUSINGDLL=1 macro.  For example to build the minimal sample you would
-go to \samples\minimal and execute nmake all -f makefile.va WXUSINGDLL=1.
-
-I strongly suggest when developing apps using wxWidgets for OS/2 under old
-VisualAge 3.0, that you use the dynamically linked library. The library is
-very large and even the most trivial statically linked .exe can be very
-large and take a long time to link.  The release builds are much smaller,
-however.  Fortunately, EMX seems to build much smaller static executables.
-
-Compilation using EMX
----------------------
-
-In addition to EMX-0.9d you will need a rather complete Unix-like
-environment, starting with a shell (e.g. ash) and most of the
-GNU file/text/shell utilities, but also flex, bison, sed, grep, awk
-and GNU make. Particularly note that uname is relevant to get the
-configure script working - the one from GNU shell utilities 1.12
-does work (check that uname -s returns "OS/2" and uname -m returns "i386"
-and you should be mostly fine.
-
-The first thing to do is to decide on a build directory. You can either
-do in-tree builds or you can do the build in a directory separated from
-the source directory. The later has the advantage, that it is much easier
-to compile and maintain several ports of wxWidgets on OS/2 - if you are
-developping cross-platform applications you might want to compile (and
-update) e.g. wxGTK or wxX11 as well.
-
-In the following, let's assume you decided to build in
-\wx\wxWidgets-2.8.0\build\pm. Now we need to set some environment
-variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
-and INSTALL (to point to the install script. If you omit this, configure
-might find something like the system's tcpip\pcomos\install.exe which will
-not do the thing you want), e.g.
-SET MAKESHELL=ash
-SET INSTALL=/wx/wxWidgets-2.8.0/install-sh -c
-
-Be warned that depending on the precise version of your make, the
-variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
-If you have a really deficient version of GNU make, it might even be
-necessary to set SHELL or even COMSPEC to a unix like shell as well.
-
-Now run the provided configure script by executing e.g.
-`ash -c "../../configure \
-   --prefix=directory_where_you_want_wxWidgets_to_be_installed"'
-from within the build directory (the relative path might be different
-depending on the build directory you selected).
-If you are already running some unix-like shell and not cmd, you may
-of course ommit the `ash -c' part in the above command.
-This will create a whole directory structure containing lib and sample
-directories which each essentially contain a suitable makefile.
-
-Calling `make' now should start a compile run which hopefully ends
-with a library being placed in the lib subdirectory.
-
-Now you can change in the samples subdirectory and call make to compile
-all samples, however currently not all will work on OS/2, so you might
-prefer to change into the directory of a specific sample
-(e.g. samples\minimal) and call make there to just build this one example.
-Essentially, each sample that's not working indicates an area, where help
-in porting wxWidgets to OS/2 would be appreciated.
-
-Finally, you can run `make install' which should install wxWidgets to
-the desired place.
-Note that we also install the wx-config script which wants to help you
-compiling your own applications, e.g. `wx-config --cxxflags` will emit the
-flags that are needed for compiling source code which includes wxWidgets
-headers, `wx-config --libs` will emit the flags needed for linking against
-wxWidgets (wx-config is assuming you are calling it from a unix-like shell!).
-
-For building a DLL, the only supported way currently is to first build the
-static library and then use Andrew Zabolotny's dllar.cmd. However, this
-works quite nicely.
-
-Finally, if you also want to build a different port, e.g. wxGTK, you
-essentially have to use the procedure described above, the only difference
-being that you have to pass a switch to configure indicating which port
-to build. If you do not do this in a separate build directory (e.g.
-\wxWidgets-2.8.0\build\gtk), you'll have to do a `make clean' first.
-The magical switches that have to be passed to configure for the various
-ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
-and --disable-gui (wxBase). Note that contrary to the native, PM based
-OS/2 port, all of those ports work slightly better with POSIX/2's cExt
-library. If include and library path include the suitable paths, -lcExt
-is automatically appended to the linker flags by the configure script.

docs/tech/tn0012.txt

@@ -43,8 +43,6 @@ $toolkit must currently be one of the following:
 	gtk
 	base
 	mac
-	os2
-	pm
 	motif
 
 --------------------------------------------------------------------

include/wx/accel.h

@@ -166,8 +166,6 @@ private:
     #include "wx/osx/accel.h"
 #elif defined(__WXCOCOA__)
     #include "wx/generic/accel.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/accel.h"
 #endif
 
 extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;

include/wx/anybutton.h

@@ -188,8 +188,6 @@ protected:
     #include "wx/osx/anybutton.h"
 //#elif defined(__WXCOCOA__)
 //    #include "wx/cocoa/anybutton.h"
-//#elif defined(__WXPM__)
-//    #include "wx/os2/anybutton.h"
 #else
     typedef wxAnyButtonBase wxAnyButton;
 #endif

include/wx/app.h

@@ -708,8 +708,6 @@ protected:
     #include "wx/osx/app.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/app.h"
 #endif
 
 #else // !GUI

include/wx/apptrait.h

@@ -172,10 +172,8 @@ private:
 // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
 #if defined(__WIN32__)
     #include "wx/msw/apptbase.h"
-#elif defined(__UNIX__) && !defined(__EMX__)
+#elif defined(__UNIX__)
     #include "wx/unix/apptbase.h"
-#elif defined(__OS2__)
-    #include "wx/os2/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
@@ -267,8 +265,6 @@ public:
 // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
 #if defined(__WIN32__)
     #include "wx/msw/apptrait.h"
-#elif defined(__OS2__)
-    #include "wx/os2/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
 #elif defined(__DOS__)

include/wx/bitmap.h

@@ -100,8 +100,8 @@ public:
 };
 
 
-// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as
+// All ports except wxMSW use wxBitmapHandler and wxBitmapBase as
-// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as
+// base class for wxBitmapHandler; wxMSW uses wxGDIImageHandler as
 // base class since it allows some code reuse there.
 #if wxUSE_BITMAP_BASE
 
@@ -290,9 +290,6 @@ protected:
 #elif defined(__WXCOCOA__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
     #include "wx/cocoa/bitmap.h"
-#elif defined(__WXPM__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
-    #include "wx/os2/bitmap.h"
 #endif
 
 #if wxUSE_IMAGE

include/wx/bmpbuttn.h

@@ -125,8 +125,6 @@ protected:
     #include "wx/osx/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bmpbuttn.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/bmpbuttn.h"
 #endif
 
 #endif // wxUSE_BMPBUTTON

include/wx/brush.h

@@ -83,8 +83,6 @@ public:
     #include "wx/osx/brush.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/brush.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase

include/wx/button.h

@@ -60,8 +60,6 @@ protected:
     #include "wx/osx/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/button.h"
 #endif
 
 #endif // wxUSE_BUTTON

include/wx/chartype.h

@@ -28,8 +28,6 @@
         #define wxUSE_WCHAR_T 0
     #elif defined(__WATCOMC__)
         #define wxUSE_WCHAR_T 0
-    #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
-        #define wxUSE_WCHAR_T 0
     #else
         /* add additional compiler checks if this fails */
         #define wxUSE_WCHAR_T 1
@@ -47,7 +45,7 @@
 
    Actually MinGW has tchar.h, but it does not include wchar.h
  */
-#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(__WATCOMC__)
     #ifndef HAVE_WCHAR_H
         #define HAVE_WCHAR_H
     #endif
@@ -74,7 +72,7 @@
 #elif defined(HAVE_WCSTR_H)
     /* old compilers have relevant declarations here */
     #include <wcstr.h>
-#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+#elif defined(__FreeBSD__) || defined(__DARWIN__)
     /* include stdlib.h for wchar_t */
     #include <stdlib.h>
 #endif /* HAVE_WCHAR_H */
@@ -104,15 +102,6 @@
     #include <stddef.h>
     #include <string.h>
     #include <ctype.h>
-#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
-    /* VZ: the old VisualAge definitions were completely wrong and had no    */
-    /*     chance at all to work in Unicode build anyhow so let's pretend    */
-    /*     that VisualAge does _not_ support TCHAR for the moment (as        */
-    /*     indicated by "0 &&" above) until someone really has time to delve */
-    /*     into Unicode issues under OS/2 */
-
-    /* VisualAge 4.0+ supports TCHAR */
-    #define wxHAVE_TCHAR_SUPPORT
 #endif /* compilers with (good) TCHAR support */
 
 #ifdef wxHAVE_TCHAR_SUPPORT

include/wx/checkbox.h

@@ -180,9 +180,6 @@ private:
     #include "wx/osx/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
-#elif defined(__WXPM__)
-    #undef wxHAS_3STATE_CHECKBOX
-    #include "wx/os2/checkbox.h"
 #endif
 
 #endif // wxUSE_CHECKBOX

include/wx/checklst.h

@@ -57,8 +57,6 @@ public:
     #include "wx/osx/checklst.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/checklst.h"
 #endif
 
 #endif // wxUSE_CHECKLISTBOX

include/wx/chkconf.h

@@ -1229,8 +1229,6 @@
 #  include "wx/cocoa/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/osx/chkconf.h"
-#elif defined(__OS2__)
-#  include "wx/os2/chkconf.h"
 #elif defined(__WXDFB__)
 #  include "wx/dfb/chkconf.h"
 #elif defined(__WXMOTIF__)

include/wx/choice.h

@@ -88,8 +88,6 @@ private:
     #include "wx/osx/choice.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/choice.h"
 #endif
 
 #endif // wxUSE_CHOICE

include/wx/clipbrd.h

@@ -163,8 +163,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/clipbrd.h"
 #endif
 
 // ----------------------------------------------------------------------------

include/wx/colour.h

@@ -65,7 +65,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
     not need the wxGDIObject machinery to handle colors, please add it to the
     list of ports which do not need it.
  */
-#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXPM__ ) || defined( __WXCOCOA__ )
+#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXCOCOA__ )
 #define wxCOLOUR_IS_GDIOBJECT 0
 #else
 #define wxCOLOUR_IS_GDIOBJECT 1
@@ -221,8 +221,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
     #include "wx/osx/colour.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/colour.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/colour.h"
 #endif
 
 #define wxColor wxColour

include/wx/combobox.h

@@ -83,8 +83,6 @@ public:
     #include "wx/osx/combobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/combobox.h"
 #endif
 
 #endif // wxUSE_COMBOBOX

include/wx/config.h

@@ -24,9 +24,6 @@
 #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE
     #include "wx/msw/regconf.h"
     #define wxConfig  wxRegConfig
-#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
-    #include "wx/os2/iniconf.h"
-    #define wxConfig wxIniConfig
 #else // either we're under Unix or wish to always use config files
     #include "wx/fileconf.h"
     #define wxConfig wxFileConfig

include/wx/control.h

@@ -238,8 +238,6 @@ protected:
     #include "wx/osx/control.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/control.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/control.h"
 #endif
 
 #endif // wxUSE_CONTROLS

include/wx/cursor.h

@@ -61,9 +61,6 @@ public:
 #elif defined(__WXCOCOA__)
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
     #include "wx/cocoa/cursor.h"
-#elif defined(__WXPM__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
-    #include "wx/os2/cursor.h"
 #endif
 
 #include "wx/utils.h"

include/wx/dataobj.h

@@ -85,8 +85,6 @@ public:
     #include "wx/osx/dataform.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataform.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dataform.h"
 #endif
 
 // the value for default argument to some functions (corresponds to
@@ -173,8 +171,6 @@ public:
     #include "wx/osx/dataobj.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataobj.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dataobj.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -566,8 +562,6 @@ private:
         #include "wx/osx/dataobj2.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dataobj2.h"
-    #elif defined(__WXPM__)
-        #include "wx/os2/dataobj2.h"
     #endif
 
     // wxURLDataObject is simply wxTextDataObject with a different name

include/wx/datetime.h

@@ -462,10 +462,7 @@ public:
     wxDateTime() { m_time = wxLongLong(wxINT32_MIN, 0); }
 
         // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
-#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
-// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration
     inline wxDateTime(time_t timet);
-#endif
         // from broken down time/date (only for standard Unix range)
     inline wxDateTime(const struct tm& tm);
         // from broken down time/date (any range)
@@ -506,11 +503,8 @@ public:
         // set to the current time
     inline wxDateTime& SetToCurrent();
 
-#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
-// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration
         // set to given time_t value
     inline wxDateTime& Set(time_t timet);
-#endif
 
         // set to given broken down time/date
     wxDateTime& Set(const struct tm& tm);
@@ -1636,7 +1630,6 @@ inline wxDateTime wxDateTime::Today()
     return dt;
 }
 
-#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 inline wxDateTime& wxDateTime::Set(time_t timet)
 {
     if ( timet == (time_t)-1 )
@@ -1652,7 +1645,6 @@ inline wxDateTime& wxDateTime::Set(time_t timet)
 
     return *this;
 }
-#endif
 
 inline wxDateTime& wxDateTime::SetToCurrent()
 {
@@ -1660,12 +1652,10 @@ inline wxDateTime& wxDateTime::SetToCurrent()
     return *this;
 }
 
-#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 inline wxDateTime::wxDateTime(time_t timet)
 {
     Set(timet);
 }
-#endif
 
 inline wxDateTime::wxDateTime(const struct tm& tm)
 {

include/wx/defs.h

@@ -26,7 +26,6 @@
 #   elif !defined(__WXMOTIF__) && \
          !defined(__WXMSW__)   && \
          !defined(__WXGTK__)   && \
-         !defined(__WXPM__)    && \
          !defined(__WXOSX_CARBON__)   && \
          !defined(__WXOSX_COCOA__)   && \
          !defined(__WXOSX_IPHONE__)   && \
@@ -533,8 +532,6 @@ typedef short int WXTYPE;
 
 #if defined(__VISUALC__)
   #define   wxC_CALLING_CONV    _cdecl
-#elif defined(__VISAGECPP__)
-  #define   wxC_CALLING_CONV    _Optlink
 #else   /*  !Visual C++ */
   #define   wxC_CALLING_CONV
 #endif  /*  compiler */
@@ -1131,7 +1128,7 @@ typedef wxUint32 wxDword;
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec "L"
-#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
       #define wxLongLongFmtSpec "L"
@@ -1143,8 +1140,6 @@ typedef wxUint32 wxDword;
     #define wxLongLong_t long long
     #define wxLongLongSuffix ll
     #define wxLongLongFmtSpec "I64"
-#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
-    #define wxLongLong_t long long
 #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
         defined(__GNUC__) || \
         defined(__CYGWIN__) || \
@@ -2895,7 +2890,7 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 #endif
 
 /*  macro to specify "All Files" on different platforms */
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__)
 #   define wxALL_FILES_PATTERN   wxT("*.*")
 #   define wxALL_FILES           gettext_noop("All files (*.*)|*.*")
 #else
@@ -3209,115 +3204,6 @@ typedef int             (__stdcall *WXFARPROC)();
 #endif /*  __WIN32__ */
 
 
-#if defined(__OS2__)
-typedef unsigned long   DWORD;
-typedef unsigned short  WORD;
-#endif
-
-#if defined(__WXPM__) || defined(__EMX__)
-#ifdef __WXPM__
-/*  Stand-ins for OS/2 types, to avoid #including all of os2.h */
-typedef unsigned long   WXHWND;
-typedef unsigned long   WXHANDLE;
-typedef unsigned long   WXHICON;
-typedef unsigned long   WXHFONT;
-typedef unsigned long   WXHMENU;
-typedef unsigned long   WXHPEN;
-typedef unsigned long   WXHBRUSH;
-typedef unsigned long   WXHPALETTE;
-typedef unsigned long   WXHCURSOR;
-typedef unsigned long   WXHRGN;
-typedef unsigned long   WXHACCEL;
-typedef unsigned long   WXHINSTANCE;
-typedef unsigned long   WXHMODULE;
-typedef unsigned long   WXHBITMAP;
-typedef unsigned long   WXHDC;
-typedef unsigned int    WXUINT;
-typedef unsigned long   WXDWORD;
-typedef unsigned short  WXWORD;
-
-typedef unsigned long   WXCOLORREF;
-typedef void *          WXMSG;
-typedef unsigned long   WXHTREEITEM;
-
-typedef void *          WXDRAWITEMSTRUCT;
-typedef void *          WXMEASUREITEMSTRUCT;
-typedef void *          WXLPCREATESTRUCT;
-
-typedef WXHWND          WXWidget;
-#endif
-#ifdef __EMX__
-/* Need a well-known type for WXFARPROC
-   below. MPARAM is typedef'ed too late. */
-#define WXWPARAM        void *
-#define WXLPARAM        void *
-#else
-#define WXWPARAM        MPARAM
-#define WXLPARAM        MPARAM
-#endif
-#define RECT            RECTL
-#define LOGFONT         FATTRS
-#define LOWORD          SHORT1FROMMP
-#define HIWORD          SHORT2FROMMP
-
-typedef unsigned long   WXMPARAM;
-typedef unsigned long   WXMSGID;
-typedef void*           WXRESULT;
-/* typedef int             (*WXFARPROC)(); */
-/*  some windows handles not defined by PM */
-typedef unsigned long   HANDLE;
-typedef unsigned long   HICON;
-typedef unsigned long   HFONT;
-typedef unsigned long   HMENU;
-typedef unsigned long   HPEN;
-typedef unsigned long   HBRUSH;
-typedef unsigned long   HPALETTE;
-typedef unsigned long   HCURSOR;
-typedef unsigned long   HINSTANCE;
-typedef unsigned long   HIMAGELIST;
-typedef unsigned long   HGLOBAL;
-#endif /*  WXPM || EMX */
-
-#if defined (__WXPM__)
-/*  WIN32 graphics types for OS/2 GPI */
-
-/*  RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def */
-#define OS2RGB(r,g,b) ((DWORD)((unsigned char)(b) | ((unsigned char)(g) << 8)) | ((unsigned char)(r) << 16))
-
-typedef unsigned long COLORREF;
-#define GetRValue(rgb) ((unsigned char)((rgb) >> 16))
-#define GetGValue(rgb) ((unsigned char)(((unsigned short)(rgb)) >> 8))
-#define GetBValue(rgb) ((unsigned char)(rgb))
-#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i)))
-#define PALETTERGB(r,g,b) (0x02000000 | OS2RGB(r,g,b))
-/*  OS2's RGB/RGB2 is backwards from this */
-typedef struct tagPALETTEENTRY
-{
-    char bRed;
-    char bGreen;
-    char bBlue;
-    char bFlags;
-} PALETTEENTRY;
-typedef struct tagLOGPALETTE
-{
-    WORD palVersion;
-    WORD palNumentries;
-    WORD PALETTEENTRY[1];
-} LOGPALETTE;
-
-#if (defined(__VISAGECPP__) && (__IBMCPP__ < 400)) || defined (__WATCOMC__)
-    /*  VA 3.0 for some reason needs base data types when typedefing a proc proto??? */
-typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
-#else
-#if defined(__EMX__) && !defined(_System)
-#define _System
-#endif
-typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
-#endif
-
-#endif /* __WXPM__ */
-
-
 #if defined(__WXMOTIF__) || defined(__WXX11__)
 /* Stand-ins for X/Xt/Motif types */
 typedef void*           WXWindow;

include/wx/dialog.h

@@ -362,8 +362,6 @@ public:
         #include "wx/osx/dialog.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
-    #elif defined(__WXPM__)
-        #include "wx/os2/dialog.h"
     #endif
 #endif
 

include/wx/dirdlg.h

@@ -108,8 +108,7 @@ protected:
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
-      defined(__WXCOCOA__) || \
+      defined(__WXCOCOA__)
-      defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
     #define wxDirDialog wxGenericDirDialog
 #endif

include/wx/dlimpexp.h

@@ -41,21 +41,6 @@
 #       define WXEXPORT __attribute__((dllexport))
 #       define WXIMPORT __attribute__((dllimport))
 #    endif
-#elif defined(__WXPM__)
-#    if defined (__WATCOMC__)
-#        define WXEXPORT __declspec(dllexport)
-        /*
-           __declspec(dllimport) prepends __imp to imported symbols. We do NOT
-           want that!
-         */
-#        define WXIMPORT
-#    elif defined(__EMX__)
-#        define WXEXPORT
-#        define WXIMPORT
-#    elif (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
-#        define WXEXPORT _Export
-#        define WXIMPORT _Export
-#    endif
 #elif defined(__CYGWIN__)
 #    define WXEXPORT __declspec(dllexport)
 #    define WXIMPORT __declspec(dllimport)

include/wx/dnd.h

@@ -222,8 +222,6 @@ protected:
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dnd.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dnd.h"
 #endif
 
 // ----------------------------------------------------------------------------

include/wx/dragimag.h

@@ -41,10 +41,6 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 #   include "wx/generic/dragimgg.h"
 #   define wxDragImage wxGenericDragImage
 
-#elif defined(__WXPM__)
-#   include "wx/generic/dragimgg.h"
-#   define wxDragImage wxGenericDragImage
-
 #endif
 
 #endif // wxUSE_DRAGIMAGE

include/wx/dynlib.h

@@ -19,7 +19,7 @@
 #include "wx/dynarray.h"
 
 // note that we have our own dlerror() implementation under Darwin
-#if (defined(HAVE_DLERROR) && !defined(__EMX__)) || defined(__DARWIN__)
+#if defined(HAVE_DLERROR) || defined(__DARWIN__)
     #define wxHAVE_DYNLIB_ERROR
 #endif
 
@@ -29,9 +29,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
-// Note: __OS2__/EMX has to be tested first, since we want to use
+#if defined(__WINDOWS__)
-// native version, even if configure detected presence of DLOPEN.
-#if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
     typedef WXHMODULE           wxDllType;
 #elif defined(__DARWIN__)
     // Don't include dlfcn.h on Darwin, we may be using our own replacements.
@@ -296,11 +294,7 @@ public:
     static void *RawGetSymbol(wxDllType handle, const wxString& name);
     void *RawGetSymbol(const wxString& name) const
     {
-#if defined (__WXPM__) || defined(__EMX__)
-        return GetSymbol(name);
-#else
         return RawGetSymbol(m_handle, name);
-#endif
     }
 
 #ifdef __WINDOWS__

include/wx/encconv.h

@@ -33,7 +33,6 @@ enum
 
     wxPLATFORM_UNIX = 0,
     wxPLATFORM_WINDOWS,
-    wxPLATFORM_OS2,
     wxPLATFORM_MAC
 };
 

include/wx/encinfo.h

@@ -37,7 +37,6 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || \
-    defined(__WXPM__)  || \
     defined(__WXMAC__) || \
     defined(__WXCOCOA__) // FIXME: __WXCOCOA__
 

include/wx/event.h

@@ -2101,10 +2101,10 @@ private:
  wxEVT_NC_PAINT
  */
 
-#if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__))
+#if wxDEBUG_LEVEL && defined(__WXMSW__)
     #define wxHAS_PAINT_DEBUG
 
-    // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined
+    // see comments in src/msw/dcclient.cpp where g_isPainting is defined
     extern WXDLLIMPEXP_CORE int g_isPainting;
 #endif // debug
 

include/wx/filedlg.h

@@ -220,8 +220,6 @@ wxSaveFileSelector(const wxString& what,
     #include "wx/osx/filedlg.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/filedlg.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/filedlg.h"
 #endif
 
 #endif // wxUSE_FILEDLG

include/wx/filefn.h

@@ -26,19 +26,7 @@
     #include <sys/stat.h>
 #endif
 
-#ifdef __OS2__
+#if defined(__UNIX__)
-// need to check for __OS2__ first since currently both
-// __OS2__ and __UNIX__ are defined.
-    #include <process.h>
-    #include "wx/os2/private.h"
-    #ifdef __WATCOMC__
-        #include <direct.h>
-    #endif
-    #include <io.h>
-    #ifdef __EMX__
-        #include <unistd.h>
-    #endif
-#elif defined(__UNIX__)
     #include <unistd.h>
     #include <dirent.h>
 #endif
@@ -185,7 +173,7 @@ enum wxPosixPermissions
     #define   wxCRT_RmDir      _wrmdir
     #define   wxCRT_Stat       _wstat
     #define   wxStructStat struct _stat
-#elif (defined(__WINDOWS__) || defined(__OS2__)) && \
+#elif defined(__WINDOWS__) && \
       ( \
         defined(__VISUALC__) || \
         defined(__MINGW64__) || \
@@ -343,12 +331,7 @@ enum wxPosixPermissions
             #define   wxCRT_StatA       wxPOSIX_IDENT(stati64)
         #endif
     #else
-        // Unfortunately Watcom is not consistent
+        #define   wxCRT_StatA       wxPOSIX_IDENT(stat)
-        #if defined(__OS2__) && defined(__WATCOMC__)
-            #define   wxCRT_StatA       _stat
-        #else
-            #define   wxCRT_StatA       wxPOSIX_IDENT(stat)
-        #endif
     #endif
 
     // then wide char ones
@@ -522,8 +505,7 @@ inline int wxLstat(const wxString& path, wxStructStat *buf)
     { return wxCRT_Lstat(path.fn_str(), buf); }
 inline int wxRmDir(const wxString& path)
     { return wxCRT_RmDir(path.fn_str()); }
-#if (defined(__WINDOWS__) && !defined(__CYGWIN__)) \
+#if (defined(__WINDOWS__) && !defined(__CYGWIN__))
-        || (defined(__OS2__) && defined(__WATCOMC__))
 inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0)
     { return wxCRT_MkDir(path.fn_str()); }
 #else
@@ -538,15 +520,7 @@ inline int wxMkDir(const wxString& path, mode_t mode)
     #define wxO_BINARY 0
 #endif
 
-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-//
-// VisualAge C++ V4.0 cannot have any external linkage const decs
-// in headers included by more than one primary source
-//
-extern const int wxInvalidOffset;
-#else
 const int wxInvalidOffset = -1;
-#endif
 
 // ----------------------------------------------------------------------------
 // functions
@@ -686,7 +660,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path);
 #define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions
-#if defined(__UNIX__) && !defined(__OS2__)
+#if defined(__UNIX__)
   // CYGWIN also uses UNIX settings
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
@@ -700,7 +674,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path);
 
 // this is useful for wxString::IsSameAs(): to compare two file names use
 // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
-#if defined(__UNIX__) && !defined(__DARWIN__) && !defined(__OS2__)
+#if defined(__UNIX__) && !defined(__DARWIN__)
   #define wxARE_FILENAMES_CASE_SENSITIVE  true
 #else   // Windows, Mac OS and OS/2
   #define wxARE_FILENAMES_CASE_SENSITIVE  false
@@ -710,7 +684,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path);
 inline bool wxIsPathSeparator(wxChar c)
 {
     // under DOS/Windows we should understand both Unix and DOS file separators
-#if ( defined(__UNIX__) && !defined(__OS2__) )|| defined(__MAC__)
+#if defined(__UNIX__) || defined(__MAC__)
     return c == wxFILE_SEP_PATH;
 #else
     return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX;

include/wx/filename.h

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_BASE wxFFile;
 
 // this symbol is defined for the platforms where file systems use volumes in
 // paths
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__DOS__)
     #define wxHAS_FILESYSTEM_VOLUMES
 #endif
 

include/wx/font.h

@@ -532,8 +532,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
     #include "wx/osx/font.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/font.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/font.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase

include/wx/fontdlg.h

@@ -77,8 +77,6 @@ protected:
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/fontdlg.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/fontdlg.h"
 #endif

include/wx/fontutil.h

@@ -113,11 +113,6 @@ public:
     wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { }
 
     LOGFONT      lf;
-#elif defined(__WXPM__)
-    // OS/2 native structures that define a font
-    FATTRS       fa;
-    FONTMETRICS  fm;
-    FACENAMEDESC fn;
 #elif defined(__WXOSX__)
 public:
     wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }

include/wx/frame.h

@@ -266,8 +266,6 @@ protected:
         #include "wx/osx/frame.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
-    #elif defined(__WXPM__)
-        #include "wx/os2/frame.h"
     #endif
 #endif
 

include/wx/gauge.h

@@ -111,8 +111,6 @@ protected:
     #include "wx/osx/gauge.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/gauge.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/gauge.h"
 #endif
 
 #endif // wxUSE_GAUGE

include/wx/gdicmn.h

@@ -159,7 +159,7 @@ enum wxStockCursor
 // macros
 // ---------------------------------------------------------------------------
 
-#if defined(__WINDOWS__) || defined(__WXPM__)
+#if defined(__WINDOWS__)
     #define wxHAS_IMAGES_IN_RESOURCES
 #endif
 
@@ -176,9 +176,6 @@ enum wxStockCursor
 #ifdef __WINDOWS__
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
-#elif defined(__WXPM__)
-    // Load from a resource
-    #define wxICON(X) wxIcon(wxT(#X))
 #elif defined(__WXDFB__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
@@ -203,7 +200,7 @@ enum wxStockCursor
    under Unix bitmaps live in XPMs and under Windows they're in ressources.
  */
 
-#if defined(__WINDOWS__) || defined(__WXPM__)
+#if defined(__WINDOWS__)
     #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
 #elif defined(__WXGTK__)   || \
       defined(__WXMOTIF__) || \
@@ -889,12 +886,6 @@ public:
     // add a new colour to the database
     void AddColour(const wxString& name, const wxColour& colour);
 
-#ifdef __WXPM__
-    // PM keeps its own type of colour table
-    long*                           m_palTable;
-    size_t                          m_nSize;
-#endif
-
 private:
     // load the database with the built in colour values when called for the
     // first time, do nothing after this

include/wx/gdiobj.h

@@ -56,7 +56,7 @@ public:
     // because it's still widely used)
     bool Ok() const { return IsOk(); }
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__)
     // Creates the resource
     virtual bool RealizeResource() { return false; }
 
@@ -67,7 +67,7 @@ public:
 
     // Returns handle.
     virtual WXHANDLE GetResourceHandle() const { return 0; }
-#endif // defined(__WXMSW__) || defined(__WXPM__)
+#endif // defined(__WXMSW__)
 
 protected:
     // replace base class functions using wxObjectRefData with our own which

include/wx/generic/combo.h

@@ -93,8 +93,6 @@ protected:
 #endif
 #elif defined(__WXMAC__)
     // Looks like there's nothing we need to override here
-#elif defined(__WXPM__)
-    virtual WXHWND GetEditHWND() const { return NULL; }
 #endif
 
     // For better transparent background rendering

include/wx/generic/dirctrlg.h

@@ -258,7 +258,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);
 };
 
-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
     #define wxDirCtrl wxGenericDirCtrl
 #endif
 

include/wx/generic/progdlgg.h

@@ -134,7 +134,7 @@ protected:
     // the maximum value
     int m_maximum;
 
-#if defined(__WXMSW__ ) || defined(__WXPM__)
+#if defined(__WXMSW__)
     // the factor we use to always keep the value in 16 bit range as the native
     // control only supports ranges from 0 to 65,535
     size_t m_factor;

include/wx/helpwin.h

@@ -13,8 +13,6 @@
 
 #if defined(__WXMSW__)
 #include "wx/msw/helpwin.h"
-#elif defined(__WXPM__)
-#include "wx/os2/helpwin.h"
 #endif
 
 #endif

include/wx/icon.h

@@ -55,9 +55,6 @@
 #elif defined(__WXCOCOA__)
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
   #include "wx/cocoa/icon.h"
-#elif defined(__WXPM__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
-  #include "wx/os2/icon.h"
 #endif
 
 //-----------------------------------------------------------------------------

include/wx/joystick.h

@@ -27,8 +27,6 @@
 #include "wx/osx/core/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/joystick.h"
-#elif defined(__WXPM__)
-#include "wx/os2/joystick.h"
 #endif
 
 #endif // wxUSE_JOYSTICK

include/wx/listbase.h

@@ -83,11 +83,11 @@ int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sor
 #define wxLIST_STATE_FOCUSED        0x0002
 #define wxLIST_STATE_SELECTED       0x0004
 #define wxLIST_STATE_CUT            0x0008      // MSW only
-#define wxLIST_STATE_DISABLED       0x0010      // OS2 only
+#define wxLIST_STATE_DISABLED       0x0010      // Not used
-#define wxLIST_STATE_FILTERED       0x0020      // OS2 only
+#define wxLIST_STATE_FILTERED       0x0020      // Not used
-#define wxLIST_STATE_INUSE          0x0040      // OS2 only
+#define wxLIST_STATE_INUSE          0x0040      // Not used
-#define wxLIST_STATE_PICKED         0x0080      // OS2 only
+#define wxLIST_STATE_PICKED         0x0080      // Not used
-#define wxLIST_STATE_SOURCE         0x0100      // OS2 only
+#define wxLIST_STATE_SOURCE         0x0100      // Not used
 
 // Hit test flags, used in HitTest
 #define wxLIST_HITTEST_ABOVE            0x0001  // Above the client area.
@@ -339,10 +339,6 @@ public:
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 
-#ifdef __WXPM__
-    int             m_miniImage; // handle to the mini image for OS/2
-#endif
-
 protected:
     // creates m_attr if we don't have it yet
     wxListItemAttr& Attributes()

include/wx/listbox.h

@@ -153,8 +153,6 @@ private:
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/listbox.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/listbox.h"
 #endif

include/wx/longlong.h

@@ -46,7 +46,7 @@
                  "integers, using emulation class instead.\n" \
                  "Please report your compiler version to " \
                  "wx-dev@lists.wxwidgets.org!"
-    #elif !(defined(__WATCOMC__) || defined(__VISAGECPP__))
+    #elif !defined(__WATCOMC__)
         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \

include/wx/mdi.h

@@ -350,7 +350,6 @@ public:
     // probably not functional?)
     #if defined(__WXCOCOA__) || \
         defined(__WXMOTIF__) || \
-        defined(__WXPM__) || \
         defined(__WXUNIVERSAL__)
         #define wxUSE_GENERIC_MDI_AS_NATIVE   1
     #else

include/wx/menu.h

@@ -591,8 +591,6 @@ protected:
     #include "wx/osx/menu.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/menu.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 

include/wx/menuitem.h

@@ -206,8 +206,6 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
     #include "wx/osx/menuitem.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/menuitem.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 

include/wx/metafile.h

@@ -42,8 +42,6 @@
     #else // !wxUSE_ENH_METAFILE
         #include "wx/msw/metafile.h"
     #endif
-#elif defined(__WXPM__)
-    #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/metafile.h"
 #endif

include/wx/minifram.h

@@ -27,8 +27,6 @@
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/minifram.h"
-#elif defined(__WXPM__)
-#include "wx/os2/minifram.h"
 #else
 // TODO: it seems that wxMiniFrame could be just defined here generically
 //       instead of having all the above port-specific headers

include/wx/msgdlg.h

@@ -302,8 +302,6 @@ private:
     #include "wx/gtk/msgdlg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/msgdlg.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/msgdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------

include/wx/notebook.h

@@ -195,8 +195,6 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBook
     #include  "wx/osx/notebook.h"
 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
-#elif defined(__WXPM__)
-    #include  "wx/os2/notebook.h"
 #endif
 
 // old wxEVT_COMMAND_* constants

include/wx/object.h

@@ -170,7 +170,6 @@ inline T *wxCheckCast(const void *ptr)
 
     _WX_WANT_NEW_SIZET_WXCHAR_INT             = void *operator new (size_t size, wxChar *fileName = 0, int lineNum = 0)
     _WX_WANT_DELETE_VOID                      = void operator delete (void * buf)
-    _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET      = void operator delete (void *buf, const char *_fname, size_t _line)
     _WX_WANT_DELETE_VOID_WXCHAR_INT           = void operator delete(void *buf, wxChar*, int)
     _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT       = void *operator new[] (size_t size, wxChar *fileName , int lineNum = 0)
     _WX_WANT_ARRAY_DELETE_VOID                = void operator delete[] (void *buf)
@@ -179,18 +178,9 @@ inline T *wxCheckCast(const void *ptr)
 
 #if wxUSE_MEMORY_TRACING
 
-// All compilers get this one
+// All compilers get these ones
 #define _WX_WANT_NEW_SIZET_WXCHAR_INT
-
+#define _WX_WANT_DELETE_VOID
-// Everyone except Visage gets the next one
-#ifndef __VISAGECPP__
-    #define _WX_WANT_DELETE_VOID
-#endif
-
-// Only visage gets this one under the correct circumstances
-#if defined(__VISAGECPP__) && __DEBUG_ALLOC__
-    #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
-#endif
 
 #if defined(__VISUALC__)
     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
@@ -386,10 +376,6 @@ public:
     void operator delete ( void * buf );
 #endif
 
-#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
-    void operator delete ( void *buf, const char *_fname, size_t _line );
-#endif
-
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
     void operator delete ( void *buf, const wxChar*, int );
 #endif

include/wx/os2/accel.h

@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#include "wx/object.h"
-
-class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
-
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no key down
-#define wxACCEL_NORMAL  0x00
-
-class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
-    wxAcceleratorTable( int                n
-                       ,const wxAcceleratorEntry vaEntries[]
-                      ); // Load from array
-
-    virtual ~wxAcceleratorTable();
-
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-    void SetHACCEL(WXHACCEL hAccel);
-    WXHACCEL GetHACCEL(void) const;
-
-    // translate the accelerator, return TRUE if done
-    bool Translate( WXHWND hWnd
-                   ,WXMSG* pMsg
-                  ) const;
-};
-
-WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
-
-WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle);
-#endif
-    // _WX_ACCEL_H_

include/wx/os2/app.h

@@ -1,121 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/app.h
-// Purpose:     wxApp class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#ifdef __WATCOMC__
-
-#include <types.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-
-#else
-
-#include <sys/time.h>
-#include <sys/types.h>
-
-#ifdef __EMX__
-#include <unistd.h>
-#else
-#include <utils.h>
-#undef BYTE_ORDER
-#include <types.h>
-#define INCL_ORDERS
-#endif
-
-#endif
-
-#include "wx/event.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-
-WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
-WXDLLIMPEXP_DATA_CORE(extern HAB)    vHabmain;
-
-// Force an exit from main loop
-void WXDLLIMPEXP_CORE wxExit(void);
-
-// Yield to other apps/messages
-bool WXDLLIMPEXP_CORE wxYield(void);
-
-extern MRESULT EXPENTRY wxWndProc( HWND
-                                  ,ULONG
-                                  ,MPARAM
-                                  ,MPARAM
-                                 );
-
-
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLIMPEXP_CORE wxApp : public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-public:
-    wxApp();
-    virtual ~wxApp();
-
-    // override base class (pure) virtuals
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp(void);
-
-    virtual bool OnInitGui(void);
-
-    virtual void WakeUpIdle(void);
-
-    virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
-    virtual int  GetPrintMode(void) const { return m_nPrintMode; }
-
-    // implementation only
-    void OnIdle(wxIdleEvent& rEvent);
-    void OnEndSession(wxCloseEvent& rEvent);
-    void OnQueryEndSession(wxCloseEvent& rEvent);
-
-    int AddSocketHandler(int handle, int mask,
-                         void (*callback)(void*), void * gsock);
-    void RemoveSocketHandler(int handle);
-    void HandleSockets();
-
-protected:
-    bool                            m_bShowOnInit;
-    int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-
-    //
-    // PM-specific wxApp definitions */
-    //
-private:
-    int                             m_maxSocketHandles;
-    int                             m_maxSocketNr;
-    int                             m_lastUsedHandle;
-    fd_set                          m_readfds;
-    fd_set                          m_writefds;
-    void*                           m_sockCallbackInfo;
-
-public:
-
-    // Implementation
-    static bool  RegisterWindowClasses(HAB vHab);
-
-public:
-    int                             m_nCmdShow;
-    HMQ                             m_hMq;
-
-protected:
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxApp);
-};
-#endif
-    // _WX_APP_H_

include/wx/os2/apptbase.h

@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/apptbase.h
-// Purpose:     declaration of wxAppTraits for OS2
-// Author:      Stefan Neis
-// Modified by:
-// Created:     22.09.2003
-// Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_APPTBASE_H_
-#define _WX_OS2_APPTBASE_H_
-
-// ----------------------------------------------------------------------------
-// wxAppTraits: the OS2 version adds extra hooks needed by OS2-only code
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
-{
-public:
-    // wxThread helpers
-    // ----------------
-
-    // Initialize PM facilities to enable GUI access
-    virtual void InitializeGui(unsigned long &ulHab);
-
-    // Clean up message queue.
-    virtual void TerminateGui(unsigned long ulHab);
-
-#if wxUSE_SOCKETS
-    virtual wxFDIOManager *GetFDIOManager();
-#endif
-};
-
-#endif // _WX_OS2_APPTBASE_H_

include/wx/os2/apptrait.h

@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/apptrait.h
-// Purpose:     class implementing wxAppTraits for OS/2
-// Author:      Stefan Neis
-// Modified by:
-// Created:     22.09.2003
-// Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_APPTRAIT_H_
-#define _WX_OS2_APPTRAIT_H_
-
-// ----------------------------------------------------------------------------
-// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-#if wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop();
-#endif // wxUSE_CONSOLE_EVENTLOOP
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-};
-
-#if wxUSE_GUI
-
-class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop();
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-
-    // wxThread helpers
-    // ----------------
-
-    // Initialize PM facilities to enable GUI access
-    virtual void InitializeGui(unsigned long &ulHab);
-
-    // Clean up message queue.
-    virtual void TerminateGui(unsigned long ulHab);
-#ifdef __WXGTK__
-    virtual wxString GetDesktopEnvironment() const;
-#endif
-#if wxUSE_SOCKETS
-    virtual wxFDIOManager *GetFDIOManager();
-#endif
-};
-
-#ifndef __WXPM__
-inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
-{
-}
-
-inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
-{
-}
-#endif
-
-#endif // wxUSE_GUI
-
-#endif // _WX_OS2_APPTRAIT_H_

include/wx/os2/bitmap.h

@@ -1,374 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/bitmap.h
-// Purpose:     wxBitmap class
-// Author:      David Webster
-// Modified by:
-// Created:     11/28/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BITMAP_H_
-#define _WX_BITMAP_H_
-
-#include "wx/os2/private.h"
-#include "wx/os2/gdiimage.h"
-#include "wx/gdicmn.h"
-#include "wx/palette.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
-// ----------------------------------------------------------------------------
-// Bitmap data
-//
-// NB: this class is private, but declared here to make it possible inline
-//     wxBitmap functions accessing it
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapRefData : public wxGDIImageRefData
-{
-public:
-    wxBitmapRefData();
-    wxBitmapRefData(const wxBitmapRefData &tocopy);
-    virtual ~wxBitmapRefData() { Free(); }
-
-    virtual void Free();
-
-public:
-    int                             m_nNumColors;
-    wxPalette                       m_vBitmapPalette;
-    int                             m_nQuality;
-
-    // OS2-specific
-    // ------------
-
-    wxDC*                           m_pSelectedInto;
-
-    //
-    // Optional mask for transparent drawing
-    //
-    wxMask*                         m_pBitmapMask;
-}; // end of CLASS wxBitmapRefData
-
-// ----------------------------------------------------------------------------
-// wxBitmap: a mono or colour bitmap
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage,
-                                  public wxBitmapHelpers
-{
-public:
-    // default ctor creates an invalid bitmap, you must Create() it later
-    wxBitmap() { Init(); }
-
-    // Copy constructors
-    inline wxBitmap(const wxBitmap& rBitmap)
-        : wxGDIImage(rBitmap)
-    {
-        Init();
-        SetHandle(rBitmap.GetHandle());
-    }
-
-    // Initialize with raw data
-    wxBitmap( const char bits[]
-             ,int        nWidth
-             ,int        nHeight
-             ,int        nDepth = 1
-            );
-
-    // Initialize with XPM data
-    wxBitmap(const char* const* bits);
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
-
-    // Load a resource
-    wxBitmap( int             nId
-             ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-            );
-
-    // For compatiability with other ports, under OS/2 does same as default ctor
-    inline wxBitmap( const wxString& WXUNUSED(rFilename)
-                    ,wxBitmapType    WXUNUSED(lType)
-                   )
-    { Init(); }
-    // New constructor for generalised creation from data
-    wxBitmap( const void* pData
-             ,wxBitmapType lType
-             ,int   nWidth
-             ,int   nHeight
-             ,int   nDepth = 1
-            );
-
-    // If depth is omitted, will create a bitmap compatible with the display
-    wxBitmap( int nWidth, int nHeight, int nDepth = -1 )
-    {
-        Init();
-        (void)Create(nWidth, nHeight, nDepth);
-    }
-    wxBitmap( const wxSize& sz, int nDepth = -1 )
-    {
-        Init();
-        (void)Create(sz, nDepth);
-    }
-
-    wxBitmap( const wxImage& image, int depth = -1 )
-                         { (void)CreateFromImage(image, depth); }
-
-    // we must have this, otherwise icons are silently copied into bitmaps using
-    // the copy ctor but the resulting bitmap is invalid!
-    inline wxBitmap(const wxIcon& rIcon)
-      { Init(); CopyFromIcon(rIcon); }
-
-    wxBitmap& operator=(const wxIcon& rIcon)
-    {
-        (void)CopyFromIcon(rIcon);
-
-        return(*this);
-    }
-
-    wxBitmap& operator=(const wxCursor& rCursor)
-    {
-        (void)CopyFromCursor(rCursor);
-        return (*this);
-    }
-
-    virtual ~wxBitmap();
-
-    wxImage ConvertToImage() const;
-    wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
-
-    // get the given part of bitmap
-    wxBitmap GetSubBitmap(const wxRect& rRect) const;
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    bool CopyFromIcon(const wxIcon& rIcon);
-
-    // copies the contents and mask of the given cursor to the bitmap
-    bool CopyFromCursor(const wxCursor& rCursor);
-
-    virtual bool Create( int nWidth
-                        ,int nHeight
-                        ,int nDepth = wxBITMAP_SCREEN_DEPTH
-                       );
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-    virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc))
-        { return Create(width,height); }
-
-    virtual bool Create( const void* pData
-                        ,wxBitmapType lType
-                        ,int   nWidth
-                        ,int   nHeight
-                        ,int   nDepth = 1
-                       );
-    virtual bool LoadFile( int             nId
-                          ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-                         );
-    virtual bool LoadFile( const wxString& rName
-                          ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-                         );
-    virtual bool SaveFile( const wxString&  rName
-                          ,wxBitmapType     lType
-                          ,const wxPalette* pCmap = NULL
-                         );
-
-    inline wxBitmapRefData* GetBitmapData() const
-      { return (wxBitmapRefData *)m_refData; }
-
-    // raw bitmap access support functions
-    void *GetRawData(wxPixelDataBase& data, int bpp);
-    void UngetRawData(wxPixelDataBase& data);
-
-    inline int GetQuality() const
-      { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }
-
-    void SetQuality(int nQ);
-
-    wxPalette* GetPalette() const
-      { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : NULL); }
-
-    void       SetPalette(const wxPalette& rPalette);
-
-    inline wxMask* GetMask() const
-      { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : NULL); }
-
-    void SetMask(wxMask* pMask) ;
-
-    // Implementation
-public:
-    inline void SetHBITMAP(WXHBITMAP hBmp)
-      { SetHandle((WXHANDLE)hBmp); }
-
-    inline WXHBITMAP GetHBITMAP() const
-      { return (WXHBITMAP)GetHandle(); }
-
-    inline void  SetSelectedInto(wxDC* pDc)
-      { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }
-
-    inline wxDC* GetSelectedInto() const
-      { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : NULL); }
-
-    inline bool IsMono(void) const { return m_bIsMono; }
-
-    // An OS/2 version that probably doesn't do anything like the msw version
-    wxBitmap GetBitmapForDC(wxDC& rDc) const;
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    inline virtual wxGDIImageRefData* CreateData() const
-        { return new wxBitmapRefData; }
-
-    bool CreateFromImage(const wxImage& image, int depth);
-
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
-
-    bool                            m_bIsMono;
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-}; // end of CLASS wxBitmap
-
-// ----------------------------------------------------------------------------
-// wxMask: a mono bitmap used for drawing bitmaps transparently.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask : public wxObject
-{
-public:
-    wxMask();
-    wxMask( const wxMask& tocopy);
-
-    // Construct a mask from a bitmap and a colour indicating the transparent
-    // area
-    wxMask( const wxBitmap& rBitmap
-           ,const wxColour& rColour
-          );
-
-    // Construct a mask from a bitmap and a palette index indicating the
-    // transparent area
-    wxMask( const wxBitmap& rBitmap
-           ,int             nPaletteIndex
-          );
-
-    // Construct a mask from a mono bitmap (copies the bitmap).
-    wxMask(const wxBitmap& rBitmap);
-
-    // construct a mask from the givne bitmap handle
-    wxMask(WXHBITMAP hBmp)
-      { m_hMaskBitmap = hBmp; }
-
-    virtual ~wxMask();
-
-    bool Create( const wxBitmap& bitmap
-                ,const wxColour& rColour
-               );
-    bool Create( const wxBitmap& rBitmap
-                ,int             nPaletteIndex
-               );
-    bool Create(const wxBitmap& rBitmap);
-
-    // Implementation
-    WXHBITMAP GetMaskBitmap() const
-      { return m_hMaskBitmap; }
-    void SetMaskBitmap(WXHBITMAP hBmp)
-      { m_hMaskBitmap = hBmp; }
-
-protected:
-    WXHBITMAP                       m_hMaskBitmap;
-    DECLARE_DYNAMIC_CLASS(wxMask)
-}; // end of CLASS wxMask
-
-// ----------------------------------------------------------------------------
-// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler
-{
-public:
-    inline wxBitmapHandler()
-      { m_lType = wxBITMAP_TYPE_INVALID; }
-
-    inline wxBitmapHandler( const wxString& rName
-                    ,const wxString& rExt
-                    ,wxBitmapType lType
-                   )
-                   : wxGDIImageHandler( rName
-                                       ,rExt
-                                       ,lType)
-    {
-    }
-
-    // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
-    // old class which worked only with bitmaps
-    virtual bool Create( wxBitmap* pBitmap
-                        ,const void* pData
-                        ,wxBitmapType lType
-                        ,int       nWidth
-                        ,int       nHeight
-                        ,int       nDepth = 1
-                       );
-    virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,int             nId
-                          ,wxBitmapType    lType
-                          ,int             nDesiredWidth
-                          ,int             nDesiredHeight
-                         );
-    virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,const wxString& rName
-                          ,wxBitmapType    lType
-                          ,int             nDesiredWidth
-                          ,int             nDesiredHeight
-                         );
-    virtual bool SaveFile( wxBitmap*        pBitmap
-                          ,const wxString&  rName
-                          ,wxBitmapType     lType
-                          ,const wxPalette* pPalette = NULL
-                         ) const;
-
-    virtual bool Create( wxGDIImage* pImage
-                        ,const void* pData
-                        ,wxBitmapType lFlags
-                        ,int         nWidth
-                        ,int         nHeight
-                        ,int         nDepth = 1
-                       );
-    virtual bool Load( wxGDIImage*     pImage
-                      ,int             nId
-                      ,wxBitmapType    lFlags
-                      ,int             nDesiredWidth
-                      ,int             nDesiredHeight
-                     );
-    virtual bool Save( const wxGDIImage* pImage
-                      ,const wxString&   rName
-                      ,wxBitmapType      lType
-                     ) const;
-private:
-    inline virtual bool Load( wxGDIImage*     WXUNUSED(pImage)
-                             ,const wxString& WXUNUSED(rName)
-                             ,WXHANDLE        WXUNUSED(hPs)
-                             ,wxBitmapType    WXUNUSED(lFlags)
-                             ,int             WXUNUSED(nDesiredWidth)
-                             ,int             WXUNUSED(nDesiredHeight)
-                            )
-    { return false; }
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-}; // end of CLASS wxBitmapHandler
-
-#endif
-  // _WX_BITMAP_H_