Remove wxMGL port.

The company behind MGL toolkit (SciTech) doesn't exist since several years and this port is not used by anybody, so remove it to ease maintenance burden. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 14:46:41 +00:00 · 2012-01-15 14:46:41 +00:00 · 0e1f8ea4a3
commit 0e1f8ea4a3
parent 4ff56dd152
210 changed files with 394 additions and 19282 deletions
--- a/Makefile.in
+++ b/Makefile.in
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@ -548,18 +548,6 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../de
        COND_PLATFORM_UNIX_1=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
    COND_PLATFORM_UNIX_1_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@ -764,18 +752,6 @@ dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/
        COND_TOOLKIT_MAC=""
    fi
    AC_SUBST(COND_TOOLKIT_MAC)
 dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
    COND_TOOLKIT_MGL="#"
    if test "x$TOOLKIT" = "xMGL" ; then
        COND_TOOLKIT_MGL=""
    fi
    AC_SUBST(COND_TOOLKIT_MGL)
 dnl ### begin block 20_COND_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
    COND_TOOLKIT_MGL_USE_GUI_1="#"
    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
        COND_TOOLKIT_MGL_USE_GUI_1=""
    fi
    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
    COND_TOOLKIT_MOTIF="#"
    if test "x$TOOLKIT" = "xMOTIF" ; then
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@ -9,7 +9,7 @@
    -->
    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
-              TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+              TOOLKIT in ['PM','MSW','MOTIF']">
        <set var="BUILD_CFG_FILE" make_var="1">
            $(SETUPHDIR)$(DIRSEP)build.cfg
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@ -493,13 +493,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
    </set>
    <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
        <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
        <set var="MGLPMLIBPATH">
            <if cond="DOS32=='DOS4GW'">dos4gw</if>
        </set>
    </if>
    <template id="wx" template="common_settings">
        <set var="wxid">$(wxwin.mk_wxid(id))</set>
        <define>__WX$(TOOLKIT)__</define>
@ -515,10 +508,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
        <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
        <lib-path>$(LIBDIRNAME)</lib-path>
        <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
            <lib-path>$(MGLLIBPATH)</lib-path>
            <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
        </if>
        <warnings>max</warnings>
        <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
@ -549,13 +538,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
            </if>
        </if>
        <!-- system libraries on mgl: -->
        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
            <sys-lib>mgl</sys-lib>
            <sys-lib>mglcpp</sys-lib>
            <sys-lib>pm</sys-lib>
        </if>
        <!-- system libraries on windows: -->
        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
            <sys-lib>$(UNICOWS_LIB)</sys-lib>
@ -632,7 +614,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <define>WXBUILDING</define>
        <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
                <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                <precomp-headers-gen>
                    $(WXTOPDIR)src/common/dummy.cpp
@ -705,9 +687,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
    </template>
    <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
            <include>$(DOLLAR)(%SCITECH)/include</include>
        </if>
        <include>$(INC_TIFF_BUILD)</include>
        <include>$(INC_TIFF)</include>
        <include>$(INC_JPEG)</include>
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@ -430,7 +430,6 @@ it if SHARED=1 unless you know what you are doing.
            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
            <if cond="PLATFORM_MSDOS=='1'">MGL</if>
            <if cond="PLATFORM_OS2=='1'">PM</if>
        </set>
        <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
@ -532,11 +531,4 @@ Set the version of your Mingw installation here.
        </if>
    </if>
    <!-- Need for wxUniv within wxMGL: -->
    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
        <set var="WXUNIV">1</set>
        <set var="USE_THREADS">0</set>
        <set var="RUNTIME_LIBS">static</set>
    </if>
 </makefile>
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@ -1935,69 +1935,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <!-- ====================================================================== -->
 <!--                                wxMGL                                   -->
 <!-- ====================================================================== -->
 <set var="MGL_LOWLEVEL_SRC" hints="files">
    src/common/fontmgrcmn.cpp
    src/generic/caret.cpp
    src/generic/colour.cpp
    src/generic/icon.cpp
    src/generic/imaglist.cpp
    src/generic/mask.cpp
    src/generic/timer.cpp
    src/mgl/app.cpp
    src/mgl/bitmap.cpp
    src/mgl/brush.cpp
    src/mgl/clipbrd.cpp
    src/mgl/cursor.cpp
    src/mgl/data.cpp
    src/mgl/dc.cpp
    src/mgl/dcclient.cpp
    src/mgl/dcmemory.cpp
    src/mgl/dcscreen.cpp
    src/mgl/dirmgl.cpp
    src/mgl/evtloop.cpp
    src/mgl/font.cpp
    src/mgl/fontenum.cpp
    src/mgl/fontmgr.cpp
    src/mgl/fontutil.cpp
    src/mgl/palette.cpp
    src/mgl/pen.cpp
    src/mgl/region.cpp
    src/mgl/settings.cpp
    src/mgl/toplevel.cpp
    src/mgl/utils.cpp
    src/mgl/window.cpp
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
    wx/generic/caret.h
    wx/generic/colour.h
    wx/generic/icon.h
    wx/generic/imaglist.h
    wx/generic/mask.h
    wx/mgl/app.h
    wx/mgl/bitmap.h
    wx/mgl/brush.h
    wx/mgl/chkconf.h
    wx/mgl/clipbrd.h
    wx/mgl/cursor.h
    wx/mgl/dc.h
    wx/mgl/dcclient.h
    wx/mgl/dcmemory.h
    wx/mgl/dcscreen.h
    wx/mgl/font.h
    wx/mgl/palette.h
    wx/mgl/pen.h
    wx/mgl/popupwin.h
    wx/mgl/private.h
    wx/mgl/region.h
    wx/mgl/toplevel.h
    wx/mgl/window.h
 </set>
 <!-- ====================================================================== -->
 <!--                                wxDFB                                   -->
 <!-- ====================================================================== -->
@ -3840,7 +3777,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
        <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
        <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
        <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
    </set>
    <set var="LOWLEVEL_HDR" hints="files">
@ -3855,7 +3791,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
        <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
        <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
        <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
    </set>
@ -3910,7 +3845,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
    </set>
    <set var="ADVANCED_PLATFORM_HDR" hints="files">
@ -3924,7 +3858,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
    </set>
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@ -29,7 +29,6 @@ GTKDIR   = $(WXDIR)/src/gtk
 GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
 MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
@ -497,16 +496,6 @@ UNIV_DIST: ALL_GUI_DIST
 	$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
 MGL_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
 	$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
 	mkdir $(DISTDIR)/include/wx/msdos
 	$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
 	$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
 	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
 	mkdir $(DISTDIR)/src/msdos
 	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@ -40,7 +40,7 @@
    <subproject id="samples">
        <installable>no</installable>
        <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MOTIF']">../../samples</dir>
    </subproject>
    <if cond="FORMAT=='autoconf'">
@ -178,7 +178,7 @@
    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
-    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MOTIF']">
        <mkdir id="libdir">
            <dir>$(LIBDIRNAME)</dir>
        </mkdir>
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@ -80,7 +80,7 @@ Format-specific notes:
            $(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
        </set>
        <option name="WX_PORT">
-            <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
+            <values>gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb</values>
            <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
            <description>
                Port of the wx library to build against
--- a/build/mgl/Bakefiles.mgl.bkgen
+++ b/build/mgl/Bakefiles.mgl.bkgen
@ -1,62 +0,0 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <bakefile-gen>
    <!--
    This file contains eperimental build specification for wxMGL port
    build with Open Watcom for DOS extenders. In order to get complete
    build, please setup:
      1. wxWidgets CVS Head
      2. SCITECH/MGL toolkit
      3. OpenWatcom compiler
      4. Bakefile later than 0.1.9.1 (CVS at time of writing this)
    To get Open Watcom makefiles for wxMGL port: open console under Windows,
    setup environment for toolkits listed above and then run:
      cd %WXWIN%\build\bakefiles
      bakefile_gen -f watcom -d ../mgl/Bakefiles.mgl.bkgen
      cd %WXWIN%\build\mgl
      wmake -h -f makefile.wat
      cd %WXWIN%\samples\minimal
      wmake -h -f makefile.wat
    Default build settings are located in %WXWIN%\build\mgl\config.wat
    Note that currently you can't have watcom makefiles for building samples
    for different platforms in the same tree.
    -->
    <add-flags formats="watcom">
        -DPLATFORM_MSDOS=1
    </add-flags>
    <include file="../bakefiles/Bakefiles.bkgen"/>
    <add-flags files="wx.bkl" formats="watcom">
        -o../mgl/makefile.wat
    </add-flags>
    <add-flags files="../bakefiles/wx.bkl" formats="watcom">
        -DOPTIONS_FILE=config.wat
    </add-flags>
    <add-flags files="../../*/*" formats="watcom">
        -DOPTIONS_FILE=../build/mgl/config.wat
    </add-flags>
    <add-flags files="../../*/*/*" formats="watcom">
        -DOPTIONS_FILE=../../build/mgl/config.wat
    </add-flags>
    <add-flags files="../../*/*/*/*" formats="watcom">
        -DOPTIONS_FILE=../../../build/mgl/config.wat
    </add-flags>
    <add-flags files="../../*/*/*/*/*" formats="watcom">
        -DOPTIONS_FILE=../../../../build/mgl/config.wat
    </add-flags>
 </bakefile-gen>
--- a/build/mgl/config.wat
+++ b/build/mgl/config.wat
@ -1,127 +0,0 @@
 # =========================================================================
 #     This configuration file was generated by
 #     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
 # -------------------------------------------------------------------------
 # These are configurable options:
 # -------------------------------------------------------------------------
 # DOS32 mode/extender [X32VM,X32,PMODEW,CAUSEWAY,DOS32A,DOS4GW]
 #   X32VM - FlashTek X-32VM DOS extender
 #   X32 - FlashTek X-32 DOS extender
 #   PMODEW - PMODE/W
 #   CAUSEWAY - CauseWay DOS extender
 #   DOS32A - DOS32/A
 #   DOS4GW - Tenberry/Watcom 32-bit DOS extender
 DOS32 = DOS4GW
 # C compiler 
 CC = wcc386
 # C++ compiler 
 CXX = wpp386
 # Standard flags for CC 
 CFLAGS = 
 # Standard flags for C++ 
 CXXFLAGS = 
 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 
 # Standard linker flags 
 LDFLAGS = 
 # The C preprocessor 
 CPP = $(CC) -p
 # What type of library to build? [0,1]
 #   1 - DLL
 SHARED = 0
 # Compile Unicode build of wxWidgets? [0,1]
 #   1 - Unicode
 UNICODE = 0
 # Type of compiled binaries [debug,release]
 BUILD = debug
 # Should debugging info be included in the executables? The default value
 # "default" means that debug info will be included if BUILD=debug
 # and not included if BUILD=release. [0,1,default]
 DEBUG_INFO = default
 # Should __WXDEBUG__ be defined? The default value "default" means that it will
 # be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
 DEBUG_FLAG = default
 # Multiple libraries or single huge monolithic one? [0,1]
 #   0 - Multilib
 #   1 - Monolithic
 MONOLITHIC = 1
 # Build GUI libraries? [0,1]
 #   0 - Base
 #   1 - GUI
 USE_GUI = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 # Build multimedia library (USE_GUI must be 1)? [0,1]
 USE_MEDIA = 1
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 USE_XRC = 1
 # Build wxAUI library (USE_GUI must be 1)? [0,1]
 USE_AUI = 1
 # Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
 USE_RICHTEXT = 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0
 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
 # Enable run-time type information (RTTI) in compiled code. [0,1]
 USE_RTTI = 1
 # Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
 USE_GDIPLUS = 0
 # Is this official build by wxWidgets developers? [0,1]
 OFFICIAL_BUILD = 0
 # Use this to name your customized DLLs differently 
 VENDOR = custom
 #  
 WX_FLAVOUR = 
 #  
 WX_LIB_FLAVOUR = 
 # Name of your custom configuration. This affects directory
 # where object files are stored as well as the location of
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG = 
 # Compiler flags needed to compile test suite in tests directory. If you want
 # to run the tests, set it so that the compiler can find CppUnit headers. 
 CPPUNIT_CFLAGS = 
 # Linker flags needed to link test suite in tests directory. If you want
 # to run the tests, include CppUnit library here. 
 CPPUNIT_LIBS = 
--- a/build/mgl/makefile.wat
+++ b/build/mgl/makefile.wat
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@ -38,7 +38,7 @@ SolidCompression=yes
 [Files]
 ; source files
-Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,wxWindows.xcod*,x11,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,motif,msdos,os2,wxWindows.xcod*,x11,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; docs and helpfile
 Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
--- a/344
+++ b/344
@ -918,8 +918,6 @@ COND_PLATFORM_MSDOS_1
 COND_PLATFORM_OS2_1
 COND_PLATFORM_UNIX_0
 COND_PLATFORM_UNIX_1
 COND_PLATFORM_UNIX_1_TOOLKIT_MGL
 COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1
 COND_PLATFORM_UNIX_1_USE_GUI_1
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_WIN32_0
@ -954,8 +952,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_USE_GUI_1
 COND_TOOLKIT_MAC
 COND_TOOLKIT_MGL
 COND_TOOLKIT_MGL_USE_GUI_1
 COND_TOOLKIT_MOTIF
 COND_TOOLKIT_MOTIF_USE_GUI_1
 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
@ -1980,7 +1976,6 @@ Optional Packages:
  --with-wine             use Wine
  --with-msw              use MS-Windows
  --with-pm               use OS/2 Presentation Manager
  --with-mgl              use SciTech MGL
  --with-directfb         use DirectFB
  --with-microwin         use MicroWindows
  --with-x11              use X11
@ -2679,14 +2674,13 @@ USE_ALPHA=
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
 DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
@ -2699,7 +2693,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
@ -2936,7 +2929,6 @@ _ACEOF
 _ACEOF
    PROGRAM_EXT=".exe"
    DEFAULT_DEFAULT_wxUSE_MGL=1
  ;;
  *-pc-os2_emx | *-pc-os2-emx )
@ -3488,12 +3480,6 @@ if test "${with_pm+set}" = set; then
 fi
 # Check whether --with-mgl was given.
 if test "${with_mgl+set}" = set; then
  withval=$with_mgl; wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1
 fi
 # Check whether --with-directfb was given.
 if test "${with_directfb+set}" = set; then
  withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1
@ -3653,7 +3639,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
    fi
            NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
        case "${host}" in
@ -28373,27 +28359,20 @@ if test "$wxUSE_LIBPNG" != "no" ; then
 _ACEOF
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
+            if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&5
 echo "$as_me: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&2;}
        wxUSE_LIBPNG=sys
    fi
                if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
        { echo "$as_me:$LINENO: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5
 echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;}
        wxUSE_LIBPNG=builtin
    fi
-    if test "$wxUSE_MGL" != 1 ; then
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-                if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+                        { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
                                    { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
 echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6; }
 if test "${ac_cv_header_png_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test "$cross_compiling" = yes; then
-                      unset ac_cv_header_png_h
+                  unset ac_cv_header_png_h
 else
  cat >conftest.$ac_ext <<_ACEOF
@ -28403,17 +28382,17 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                        #include <png.h>
+                    #include <png.h>
-                        #include <stdio.h>
+                    #include <stdio.h>
-                        int main()
+                    int main()
-                        {
+                    {
-                            FILE *f=fopen("conftestval", "w");
+                        FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
+                        if (!f) exit(1);
-                            fprintf(f, "%s",
+                        fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
+                        exit(0);
-                        }
+                    }
 _ACEOF
 rm -f conftest$ac_exeext
@ -28453,7 +28432,7 @@ fi
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
 echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-            { echo "$as_me:$LINENO: checking for png.h" >&5
+        { echo "$as_me:$LINENO: checking for png.h" >&5
 echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_png_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -28500,8 +28479,8 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-            if test "$ac_cv_header_png_h" = "yes"; then
+        if test "$ac_cv_header_png_h" = "yes"; then
-                { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
+            { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
 echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -28566,21 +28545,20 @@ if test $ac_cv_lib_png_png_sig_cmp = yes; then
  PNG_LINK=" -lpng -lz"
 fi
-            fi
+        fi
-            if test "x$PNG_LINK" = "x" ; then
+        if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5
+                { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5
 echo "$as_me: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&2;}
   { (exit 1); exit 1; }; }
                else
                    { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5
 echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
                    wxUSE_LIBPNG=builtin
                fi
            else
-                                wxUSE_LIBPNG=sys
+                { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5
 echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
                wxUSE_LIBPNG=builtin
            fi
        else
                        wxUSE_LIBPNG=sys
        fi
    fi
 fi
@ -28593,17 +28571,10 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
 _ACEOF
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5
+                                { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
 echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;}
        wxUSE_LIBJPEG=sys
    fi
    if test "$wxUSE_MGL" != 1 ; then
                if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
                                                { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
 echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
-            if test "${ac_cv_header_jpeglib_h+set}" = set; then
+        if test "${ac_cv_header_jpeglib_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
@ -28613,9 +28584,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                        #undef HAVE_STDLIB_H
+                    #undef HAVE_STDLIB_H
-                        #include <stdio.h>
+                    #include <stdio.h>
-                        #include <jpeglib.h>
+                    #include <jpeglib.h>
 int
 main ()
@ -28656,11 +28627,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-            { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+        { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
 echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
+            { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
 echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; }
 if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -28725,23 +28696,23 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
  JPEG_LINK=" -ljpeg"
 fi
-            fi
+        fi
-            if test "x$JPEG_LINK" = "x" ; then
+        if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5
+                { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5
 echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;}
   { (exit 1); exit 1; }; }
                else
                    { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5
 echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
                    wxUSE_LIBJPEG=builtin
                fi
            else
-                                wxUSE_LIBJPEG=sys
+                { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5
 echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
                wxUSE_LIBJPEG=builtin
            fi
        else
                        wxUSE_LIBJPEG=sys
-                if test "$wxUSE_MSW" = 1; then
+            if test "$wxUSE_MSW" = 1; then
-                                                                                                    { echo "$as_me:$LINENO: checking for boolean" >&5
+                                                                                { echo "$as_me:$LINENO: checking for boolean" >&5
 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
 if test "${ac_cv_type_boolean+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -28802,7 +28773,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
-                            { echo "$as_me:$LINENO: checking for boolean" >&5
+                        { echo "$as_me:$LINENO: checking for boolean" >&5
 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
 if test "${ac_cv_type_boolean+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -28814,9 +28785,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
 typedef boolean ac__type_new_;
@ -28879,9 +28850,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -28921,9 +28892,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -28980,9 +28951,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -29022,9 +28993,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -29091,9 +29062,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -29154,9 +29125,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
   typedef boolean ac__type_sizeof_;
@ -29242,14 +29213,13 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
-                            cat >>confdefs.h <<_ACEOF
+                        cat >>confdefs.h <<_ACEOF
 #define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean`
 _ACEOF
 fi
                fi
            fi
        fi
    fi
@ -31414,81 +31384,6 @@ echo "${ECHO_T}not found" >&6; }
                                                                                                                    fi
    fi
    if test "$wxUSE_MGL" = 1; then
       { echo "$as_me:$LINENO: checking for SciTech MGL library" >&5
 echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6; }
        if test "x$MGL_ROOT" = x ; then
            { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
            { { echo "$as_me:$LINENO: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&5
 echo "$as_me: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&2;}
   { (exit 1); exit 1; }; }
        else
            { echo "$as_me:$LINENO: result: $MGL_ROOT" >&5
 echo "${ECHO_T}$MGL_ROOT" >&6; }
        fi
        { echo "$as_me:$LINENO: checking for libmgl location" >&5
 echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6; }
                                case "${host}" in
            *-*-linux* )
                                          if test "x$wxUSE_SHARED" = xyes ; then
                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
              else
                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
              fi
              ;;
            *-pc-msdosdjgpp )
              mgl_os_candidates="dos32/dj2"
              ;;
            *)
              { { echo "$as_me:$LINENO: error: This system type ${host} is not yet supported by wxMGL." >&5
 echo "$as_me: error: This system type ${host} is not yet supported by wxMGL." >&2;}
   { (exit 1); exit 1; }; }
        esac
        mgl_lib_type=""
        mgl_os=""
        for mgl_os_i in $mgl_os_candidates ; do
            if test "x$mgl_os" = x ; then
                if test "$wxUSE_DEBUG_FLAG" = yes ; then
                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
                        mgl_lib_type=debug
                        mgl_os=$mgl_os_i
                    fi
                fi
                if test "x$mgl_lib_type" = x ; then
                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
                        mgl_lib_type=release
                        mgl_os=$mgl_os_i
                    fi
                fi
            fi
        done
        if test "x$mgl_os" = x ; then
            { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
            { { echo "$as_me:$LINENO: error: Cannot find MGL libraries, make sure they are compiled." >&5
 echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&2;}
   { (exit 1); exit 1; }; }
        fi
        { echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5
 echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6; }
        wxUSE_UNIVERSAL="yes"
        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
        AFMINSTALL=afminstall
        TOOLKIT=MGL
        GUIDIST=MGL_DIST
    fi
    if test "$wxUSE_DFB" = 1; then
@ -46358,28 +46253,27 @@ _ACEOF
 fi
 if test "$USE_UNIX" = 1 ; then
-        if test "$wxUSE_MGL" != 1; then
+                { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
                                { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_soundcard+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-            cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                    #include <sys/ioctl.h>
+                #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
+                #include <sys/soundcard.h>
 int
 main ()
 {
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
  ;
  return 0;
@ -46409,23 +46303,23 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
-                    saveLibs="$LIBS"
+                saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
+                LIBS="$saveLibs -lossaudio"
-                    cat >conftest.$ac_ext <<_ACEOF
+                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-                            #include <sys/ioctl.h>
+                        #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
+                        #include <sys/soundcard.h>
 int
 main ()
 {
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
  ;
  return 0;
@ -46455,8 +46349,8 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
-                            LIBS="$saveLibs"
+                        LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
+                        ac_cv_header_sys_soundcard=no
 fi
@ -46473,7 +46367,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
 echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; }
    fi
    if test "$ac_cv_header_sys_soundcard" = "yes"; then
        cat >>confdefs.h <<\_ACEOF
@ -46805,12 +46698,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        WITH_PLUGIN_SDL=1
      fi
    fi
  else
        if test "$wxUSE_MGL" = 1; then
        { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5
 echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;}
        wxUSE_SOUND="no"
    fi
  fi
 fi
@ -48485,14 +48372,6 @@ _ACEOF
 fi
 if test "$wxUSE_SOCKETS" = "yes"; then
    if test "$wxUSE_MGL" = 1; then
        { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
        wxUSE_SOCKETS="no"
    fi
 fi
 if test "$wxUSE_SOCKETS" = "yes"; then
        if test "$TOOLKIT" != "MSW"; then
                { echo "$as_me:$LINENO: checking for socket" >&5
@ -49247,7 +49126,6 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
        fi
        else
                if test "$wxUSE_MGL" != 1; then
 for ac_header in linux/joystick.h
 do
@ -49306,7 +49184,6 @@ fi
 done
        fi
    fi
    if test "$wxUSE_JOYSTICK" = "yes"; then
@ -49705,16 +49582,10 @@ _ACEOF
 fi
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    cat >>confdefs.h <<\_ACEOF
        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_DATAOBJ=no
    else
        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DATAOBJ 1
 _ACEOF
    fi
 else
    { echo "$as_me:$LINENO: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
 echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}
@ -49723,7 +49594,7 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab
 fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_DFB" = 1; then
        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_CLIPBOARD=no
@ -49738,8 +49609,7 @@ _ACEOF
 fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
            "$wxUSE_DFB" = 1; then
        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_DRAG_AND_DROP=no
@ -49976,7 +49846,7 @@ _ACEOF
 fi
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_DFB" = 1; then
        { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
 echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
        wxUSE_DISPLAY=no
@ -50402,7 +50272,7 @@ _ACEOF
 fi
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
        { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5
 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
    else
@ -54838,16 +54708,6 @@ EOF
        COND_PLATFORM_UNIX_1=""
    fi
    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
    fi
    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
    fi
    COND_PLATFORM_UNIX_1_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
        COND_PLATFORM_UNIX_1_USE_GUI_1=""
@ -55018,16 +54878,6 @@ EOF
        COND_TOOLKIT_MAC=""
    fi
    COND_TOOLKIT_MGL="#"
    if test "x$TOOLKIT" = "xMGL" ; then
        COND_TOOLKIT_MGL=""
    fi
    COND_TOOLKIT_MGL_USE_GUI_1="#"
    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
        COND_TOOLKIT_MGL_USE_GUI_1=""
    fi
    COND_TOOLKIT_MOTIF="#"
    if test "x$TOOLKIT" = "xMOTIF" ; then
        COND_TOOLKIT_MOTIF=""
@ -56926,8 +56776,6 @@ COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
 COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
 COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
 COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim
 COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$ac_delim
 COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
@ -56962,8 +56810,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__U
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
 COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
 COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
 COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
 COND_TOOLKIT_MOTIF_USE_GUI_1!$COND_TOOLKIT_MOTIF_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0$ac_delim
@ -57012,6 +56858,10 @@ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$a
 COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
 COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
 COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_STC_1!$COND_USE_STC_1$ac_delim
 COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
 COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -57053,10 +56903,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_STC_1!$COND_USE_STC_1$ac_delim
 COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
 COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim
 COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim
 COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim
 COND_WITH_PLUGIN_SDL_1!$COND_WITH_PLUGIN_SDL_1$ac_delim
@ -57121,7 +56967,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
    break
  elif $ac_last_try; then
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.in
+++ b/configure.in
@ -103,7 +103,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 dnl the list of all available toolkits
 dnl
 dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
@ -112,7 +112,6 @@ DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
@ -128,7 +127,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
@ -286,7 +284,6 @@ case "${host}" in
    USE_DOS=1
    AC_DEFINE(__DOS__)
    PROGRAM_EXT=".exe"
    DEFAULT_DEFAULT_wxUSE_MGL=1
  ;;
  *-pc-os2_emx | *-pc-os2-emx )
@ -487,7 +484,6 @@ AC_ARG_WITH(old_cocoa,     [  --with-old_cocoa        use old, deprecated, Cocoa
 AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
 AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
@ -546,7 +542,7 @@ if test "$wxUSE_GUI" = "yes"; then
    dnl we suppose that expr is available (maybe there is a better way to do
    dnl this? what about using ALL_TOOLKITS? TODO)
    NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
    dnl Allow wxUSE_PM only for OS/2 with EMX.
@ -2592,63 +2588,54 @@ PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
    AC_DEFINE(wxUSE_LIBPNG)
    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
        AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
        wxUSE_LIBPNG=sys
    fi
    dnl for the check below to have a chance to succeed, we must already have
-    dnl libz somewhere (don't do this when bulding wxMGL since its libpng
+    dnl libz somewhere
-    dnl doesn't depend on zlib)
+    if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
    if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
        AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
        wxUSE_LIBPNG=builtin
    fi
-    if test "$wxUSE_MGL" != 1 ; then
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-        dnl Don't check for libpng when building wxMGL, libmgl contains it
+        dnl libpng version 0.9 is known to not work, if an even newer
-        if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        dnl version is required, just bump it up in the test below
-            dnl libpng version 0.9 is known to not work, if an even newer
+        AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-            dnl version is required, just bump it up in the test below
+            [AC_TRY_RUN(
-            AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
+                dnl png.h defines PNG_LIBPNG_VER=number
-                [AC_TRY_RUN(
+                [
-                    dnl png.h defines PNG_LIBPNG_VER=number
+                    #include <png.h>
-                    [
+                    #include <stdio.h>
                        #include <png.h>
                        #include <stdio.h>
-                        int main()
+                    int main()
-                        {
+                    {
-                            FILE *f=fopen("conftestval", "w");
+                        FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
+                        if (!f) exit(1);
-                            fprintf(f, "%s",
+                        fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
+                        exit(0);
-                        }
+                    }
-                    ],
+                ],
-                    ac_cv_header_png_h=`cat conftestval`,
+                ac_cv_header_png_h=`cat conftestval`,
-                    ac_cv_header_png_h=no,
+                ac_cv_header_png_h=no,
-                    dnl cross-compiling: test (later) if we have any png.h
+                dnl cross-compiling: test (later) if we have any png.h
-                    unset ac_cv_header_png_h
+                unset ac_cv_header_png_h
-                )]
+            )]
-            )
+        )
-            AC_CHECK_HEADER(png.h,,, [ ])
+        AC_CHECK_HEADER(png.h,,, [ ])
-            if test "$ac_cv_header_png_h" = "yes"; then
+        if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
+            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
-            fi
+        fi
-            if test "x$PNG_LINK" = "x" ; then
+        if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
-                    AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
+                AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
                else
                    AC_MSG_WARN([system png library not found or too old, will use built-in instead])
                    wxUSE_LIBPNG=builtin
                fi
            else
-                dnl we are using the system library
+                AC_MSG_WARN([system png library not found or too old, will use built-in instead])
-                wxUSE_LIBPNG=sys
+                wxUSE_LIBPNG=builtin
            fi
        else
            dnl we are using the system library
            wxUSE_LIBPNG=sys
        fi
    fi
 fi
@ -2663,71 +2650,63 @@ JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
    AC_DEFINE(wxUSE_LIBJPEG)
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
+        dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
-        wxUSE_LIBJPEG=sys
+        dnl HAVE_STDLIB_H which are already defined and this provokes
-    fi
+        dnl a compiler warning which configure considers as an error...
-
+        AC_MSG_CHECKING(for jpeglib.h)
-    if test "$wxUSE_MGL" != 1 ; then
+        AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-        dnl Don't check for libjpeg when building wxMGL, libmgl contains it
+            AC_TRY_COMPILE(
-        if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+                [
-            dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+                    #undef HAVE_STDLIB_H
-            dnl HAVE_STDLIB_H which are already defined and this provokes
+                    #include <stdio.h>
-            dnl a compiler warning which configure considers as an error...
+                    #include <jpeglib.h>
-            AC_MSG_CHECKING(for jpeglib.h)
+                ],
-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+                [
-                AC_TRY_COMPILE(
+                ],
-                    [
+                ac_cv_header_jpeglib_h=yes,
-                        #undef HAVE_STDLIB_H
+                ac_cv_header_jpeglib_h=no
                        #include <stdio.h>
                        #include <jpeglib.h>
                    ],
                    [
                    ],
                    ac_cv_header_jpeglib_h=yes,
                    ac_cv_header_jpeglib_h=no
                )
            )
-            AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+        )
        AC_MSG_RESULT($ac_cv_header_jpeglib_h)
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
-            fi
+        fi
-            if test "x$JPEG_LINK" = "x" ; then
+        if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
+                AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
                else
                    AC_MSG_WARN([system jpeg library not found, will use built-in instead])
                    wxUSE_LIBJPEG=builtin
                fi
            else
-                dnl we are using the system library
+                AC_MSG_WARN([system jpeg library not found, will use built-in instead])
-                wxUSE_LIBJPEG=sys
+                wxUSE_LIBJPEG=builtin
            fi
        else
            dnl we are using the system library
            wxUSE_LIBJPEG=sys
-                if test "$wxUSE_MSW" = 1; then
+            if test "$wxUSE_MSW" = 1; then
-                    dnl boolean is defined by the jpeg headers and also by the
+                dnl boolean is defined by the jpeg headers and also by the
-                    dnl Windows headers of some compilers. This type has been
+                dnl Windows headers of some compilers. This type has been
-                    dnl renamed in the builtin, so it is only an issue when
+                dnl renamed in the builtin, so it is only an issue when
-                    dnl using an external jpeg lib on Windows.
+                dnl using an external jpeg lib on Windows.
-                    AC_CHECK_TYPES(
+                AC_CHECK_TYPES(
-                        [boolean],
+                    [boolean],
-                        [
+                    [
-                            AC_CHECK_SIZEOF(
+                        AC_CHECK_SIZEOF(
-                                [boolean],
+                            [boolean],
-                                [],
+                            [],
-                                [
+                            [
-                                    #undef HAVE_BOOLEAN
+                                #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
+                                #include <stdio.h>
-                                    #include <jpeglib.h>
+                                #include <jpeglib.h>
-                                ])
+                            ])
-                            AC_DEFINE_UNQUOTED(
+                        AC_DEFINE_UNQUOTED(
-                                [wxHACK_BOOLEAN],
+                            [wxHACK_BOOLEAN],
-                                [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
+                            [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
-                        ],
+                    ],
-                        [],
+                    [],
-                        [#include <windows.h>])
+                    [#include <windows.h>])
                fi
            fi
        fi
    fi
@ -3153,74 +3132,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
        fi
    fi
    if test "$wxUSE_MGL" = 1; then
       AC_MSG_CHECKING(for SciTech MGL library)
        if test "x$MGL_ROOT" = x ; then
            AC_MSG_RESULT(not found)
            AC_MSG_ERROR([Cannot find MGL library. Make sure MGL_ROOT is set.])
        else
            AC_MSG_RESULT($MGL_ROOT)
        fi
        AC_MSG_CHECKING(for libmgl location)
        dnl Find MGL library that we want
        dnl FIXME_MGL - test for MGL variants for freebsd etc.;
        dnl             and for non-x86 versions
        case "${host}" in
            *-*-linux* )
              dnl glibc.so, glibc are for older versions of MGL,
              dnl x86/a, x86/so are used by >= 5.0 R11
              if test "x$wxUSE_SHARED" = xyes ; then
                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
              else
                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
              fi
              ;;
            *-pc-msdosdjgpp )
              mgl_os_candidates="dos32/dj2"
              ;;
            *)
              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
        esac
        mgl_lib_type=""
        mgl_os=""
        for mgl_os_i in $mgl_os_candidates ; do
            if test "x$mgl_os" = x ; then
                if test "$wxUSE_DEBUG_FLAG" = yes ; then
                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
                        mgl_lib_type=debug
                        mgl_os=$mgl_os_i
                    fi
                fi
                if test "x$mgl_lib_type" = x ; then
                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
                        mgl_lib_type=release
                        mgl_os=$mgl_os_i
                    fi
                fi
            fi
        done
        if test "x$mgl_os" = x ; then
            AC_MSG_RESULT(not found)
            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
        fi
        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
        wxUSE_UNIVERSAL="yes"
        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
        AFMINSTALL=afminstall
        TOOLKIT=MGL
        GUIDIST=MGL_DIST
    fi
    if test "$wxUSE_DFB" = 1; then
       PKG_PROG_PKG_CONFIG()
@ -5710,40 +5621,37 @@ fi
 dnl Unix implementation needs additional checks because audio support
 dnl comes in many favours:
 if test "$USE_UNIX" = 1 ; then
-    dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
+    dnl it's not enough to check for just the header because OSS under NetBSD
-    if test "$wxUSE_MGL" != 1; then
+    dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
-        dnl it's not enough to check for just the header because OSS under NetBSD
+    dnl whether we need -lossaudio at link-time
-        dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
-        dnl whether we need -lossaudio at link-time
+        AC_TRY_LINK([
-        AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+                #include <sys/ioctl.h>
-            AC_TRY_LINK([
+                #include <sys/soundcard.h>
-                    #include <sys/ioctl.h>
+            ],
-                    #include <sys/soundcard.h>
+            [
-                ],
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
-                [
+            ],
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
+            ac_cv_header_sys_soundcard=yes,
-                ],
+            [
-                ac_cv_header_sys_soundcard=yes,
+                saveLibs="$LIBS"
-                [
+                LIBS="$saveLibs -lossaudio"
-                    saveLibs="$LIBS"
+                AC_TRY_LINK([
-                    LIBS="$saveLibs -lossaudio"
+                        #include <sys/ioctl.h>
-                    AC_TRY_LINK([
+                        #include <sys/soundcard.h>
-                            #include <sys/ioctl.h>
+                    ],
-                            #include <sys/soundcard.h>
+                    [
-                        ],
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
-                        [
+                    ],
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
+                    ac_cv_header_sys_soundcard=yes,
-                        ],
+                    [
-                        ac_cv_header_sys_soundcard=yes,
+                        LIBS="$saveLibs"
-                        [
+                        ac_cv_header_sys_soundcard=no
-                            LIBS="$saveLibs"
+                    ]
-                            ac_cv_header_sys_soundcard=no
+                )
-                        ]
+            ]
-                    )
+        )
-                ]
+    ])
            )
        ])
    fi
    if test "$ac_cv_header_sys_soundcard" = "yes"; then
        AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
@ -5766,12 +5674,6 @@ if test "$wxUSE_SOUND" = "yes"; then
        WITH_PLUGIN_SDL=1
      fi
    fi
  else
    dnl wxMGL doesn't support sound under DOS, only under Unix
    if test "$wxUSE_MGL" = 1; then
        AC_MSG_WARN([wxSound not supported in MGL under DOS... disabled])
        wxUSE_SOUND="no"
    fi
  fi
 fi
@ -6264,14 +6166,6 @@ dnl ------------------------------------------------------------------------
 dnl wxSocket
 dnl ------------------------------------------------------------------------
 dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
 if test "$wxUSE_SOCKETS" = "yes"; then
    if test "$wxUSE_MGL" = 1; then
        AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
        wxUSE_SOCKETS="no"
    fi
 fi
 if test "$wxUSE_SOCKETS" = "yes"; then
    dnl under MSW we always have sockets
    if test "$TOOLKIT" != "MSW"; then
@ -6526,16 +6420,13 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
    dnl joystick support is only for Linux 2.1.x or greater
    else
-        dnl wxJoystick not supported by wxMGL at all
+        dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
-        if test "$wxUSE_MGL" != 1; then
+        dnl checks only whether the header can be preprocessed, not that it
-            dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
+        dnl can be compiled and in Linux 2.6.16 joystick.h is present but
-            dnl checks only whether the header can be preprocessed, not that it
+        dnl can't be compiled because of an error and with the default
-            dnl can be compiled and in Linux 2.6.16 joystick.h is present but
+        dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
-            dnl can't be compiled because of an error and with the default
+        dnl build would fail later
-            dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
+        AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
            dnl build would fail later
            AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
        fi
    fi
    if test "$wxUSE_JOYSTICK" = "yes"; then
@ -6725,12 +6616,7 @@ if test "$wxUSE_IPC" = "yes"; then
 fi
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    AC_DEFINE(wxUSE_DATAOBJ)
        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
        wxUSE_DATAOBJ=no
    else
        AC_DEFINE(wxUSE_DATAOBJ)
    fi
 else
    AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
    wxUSE_CLIPBOARD=no
@ -6738,7 +6624,7 @@ else
 fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_DFB" = 1; then
        AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
        wxUSE_CLIPBOARD=no
    fi
@ -6749,8 +6635,7 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
 fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
            "$wxUSE_DFB" = 1; then
        AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
        wxUSE_DRAG_AND_DROP=no
    fi
@ -6908,7 +6793,7 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
 fi
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_DFB" = 1; then
        AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
        wxUSE_DISPLAY=no
    else
@ -7185,7 +7070,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
        AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
    else
        AC_DEFINE(wxUSE_DIALUP_MANAGER)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@ -30,7 +30,7 @@
 #endif
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__) || defined(__WXMGL__)
+    || defined(__WXMAC__)
 #   include "bombs.xpm"
 #endif
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@ -38,7 +38,7 @@
 // resources
 // --------------------------------------------------------------------------
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
    // application icon
    #include "mondrian.xpm"
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@ -48,7 +48,6 @@ always tested using @ifdef_ and not @if_.
@itemdef{__WXMAC__, old define for Mac OS X}
@itemdef{__WXMOTIF__, Motif}
@itemdef{__WXMOTIF20__, Motif 2.0 or higher}
@itemdef{__WXMGL__, SciTech Soft MGL (__WXUNIVERSAL__ will be also defined)}
@itemdef{__WXMSW__, Any Windows}
@itemdef{__WXOSX__, any OS X}
@itemdef{__WXOSX_IPHONE__, OS X iPhone}
@ -95,7 +94,6 @@ symbols, although this has not always been followed.
@itemdef{__DARWIN__, Mac OS X using the BSD Unix C library
                    (as opposed to using the Metrowerks MSL C/C++ library)}
@itemdef{__DATA_GENERAL__, DG-UX}
@itemdef{__DOS_GENERAL__, DOS (used with wxMGL only)}
@itemdef{__FREEBSD__, FreeBSD}
@itemdef{__HPUX__, HP-UX (Unix)}
@itemdef{__GNU__, GNU Hurd}
--- a/docs/doxygen/mainpages/platdetails.h
+++ b/docs/doxygen/mainpages/platdetails.h
@ -21,7 +21,6 @@ and ports.
@li @ref page_port_wxgtk
@li @ref page_port_wxosx
@li @ref page_port_wxos2
@li @ref page_port_wxmgl
@li @ref page_port_wxx11
@li @ref page_port_wxmotif
@li @ref page_port_wxmsw
@ -122,32 +121,6 @@ developed, docs for it are available in @c docs/cocoa in the distribution.
@section page_port_wxmgl wxMGL
 wxMGL is a port of wxWidgets using the MGL library available
 from SciTech as the underlying graphics backend. wxMGL draws
 its widgets using the wxUniversal widget set which is part
 of wxWidgets. MGL itself runs on a variety of platforms
 including DOS, Linux hardware (similar to the Linux framebuffer)
 and various graphics systems such as Win32, X11 and OS/2.
 Note that currently MGL for Linux runs only on x86-based systems.
 You will MGL 5.0 or higher which is available from
 http://www.scitechsoft.com/products/product_download.html
 In order to configure wxWidgets to compile wxMGL you will
 need to type:
@verbatim configure --with-mgl --with-universal @endverbatim
 Under DOS, wxMGL uses a dmake based make system.
 For further information, please see the files in @c docs/mgl
 in the distribution.
@section page_port_wxos2 wxOS2
 wxOS2 is a port of wxWidgets for the IBM OS/2 Warp3 and Warp4 platforms.
--- a/docs/doxygen/overviews/envvars.h
+++ b/docs/doxygen/overviews/envvars.h
@ -27,13 +27,5 @@ wxWidgets programs.
        @c /usr/local or @c /usr). You can set WXPREFIX if you are for example
        distributing a binary version of an application and you don't know in advance
        where it will be installed.}
@itemdef{WXMODE,
        (wxMGL only.)
        Sets MGL video mode. The value must be in form
        @e widthx@e height-@e depth. The default is @c 640x480-16.}
@itemdef{WXSTDERR,
        (wxMGL only.)
        Redirects stderr output to a file.}
 */
--- a/docs/index.htm
+++ b/docs/index.htm
@ -47,7 +47,6 @@
      <a href="gtk/readme.txt">wxGTK</a>,
      <a href="mac/readme.txt">wxMac</a>,
      <a href="cocoa/readme.txt">wxCocoa</a>,
      <a href="mgl/readme.txt">wxMGL</a>,
      <a href="motif/readme.txt">wxMotif</a>,
      <a href="x11/readme.txt">wxX11</a>,
      <a href="univ/readme.txt">Univ</a>
@ -59,7 +58,6 @@
      <a href="x11/install.txt">wxX11</a>,
      <a href="mac/install.txt">wxMac</a>,
      <a href="cocoa/install.txt">wxCocoa</a>,
      <a href="mgl/install.txt">wxMGL</a>,
      <a href="os2/install.txt">wxOS2</a>
    </li>
    <li><a href="changes.txt"><b>General change log</b></a></li>
--- a/docs/mgl/install.txt
+++ b/docs/mgl/install.txt
@ -1,252 +0,0 @@
 wxWidgets for MGL installation
 ------------------------------
 IMPORTANT NOTE:
  wxMGL is currently in need of some work to bring it up to the
  standard of some of the other wxWidgets ports.
  If you experience problems installing, please re-read these
  instructions and other related files (todo.txt, bugs.txt and
  osname.txt for your platform if it exists) carefully before
  mailing wxwin-users or the author. Preferably, try to fix the
  problem first and then send a patch to the author.
  When sending bug reports tell us what version of wxWidgets you are
  using (including the beta) and what compiler on what system. One
  example: wxMGL 2.8.0, gcc 2.95.3, Redhat 7.0
 First steps
 -----------
 - Download SciTech MGL library from http://www.scitechsoft.com. The
  downloads page is here (you need MGL version 5.0beta7 or newer):
  http://scitechsoft.com/products/dev/mgl_download/mgl_down.html
  Install MGL according to provided instructions. In particular, make sure that
  MGL_ROOT and NUCLEUS_PATH environment variables are set before attempting to
  build wxMGL.
  Make sure you installed all MGL components, including the "fonts" package
  (it's called mgl_<ver>-font.tar.gz in Linux version). It is important to have
  SciTech's basic fonts in $(MGL_ROOT)/fonts directory (you may want to add
  Arial TrueType font for better output quality) and basic cursors in
  $(MGL_ROOT)/cursors. wxMGL depends on their presence.
 - Download wxMGL-x.y.z.tgz, where x.y.z is the version number.
  Download documentation in a preferred format, such as
  wxWidgets-HTML.zip or wxWidgets-PDF.zip.
 - Make a directory such as ~/wx and unarchive the files into this
  directory.
 - You can now use configure or makefiles to build wxWidgets and the samples.
  In case of problems, please use GNU make.
 COMPILING
 =========
 Following systems are supported by wxMGL so far:
 - Unix (Linux etc.)
 - MS-DOS (DJGPP and Watcom compilers)
 * Compiling using configure
 ----------------------------
 These instructions apply to installation on a Unix system (such as Linux). Please
 see below for information on using configure on non-Unix platforms.
 If you compile wxWidgets on Linux for the first time and don't like to read
 install instructions just do (in the base dir):
 > ./configure --with-mgl
 > make
 > su <type root password>
 > make install
 > ldconfig
 > exit
 Afterwards you can continue with
 > make
 > su <type root password>
 > make install
 > ldconfig
 > exit
 If you want to remove wxWidgets on Unix you can do this:
 > su <type root password>
 > make uninstall
 > ldconfig
 > exit
 You can set many options to configure. Type
 > ./configure --help
 and you will get a list of supported options.
 * Using wxMGL library built with configure
 -------------------------------------------
 'make install' will install wx-config script that can (and should) be used
 to get compiler flags that are needed to build your program. wx-config --cxxflags
 will output necessary C++ compiler flags and wx-config --libs will list all
 needed libraries. See an example of wxWidgets application makefile:
 minimal: minimal.o
 	$(CXX) -o minimal minimal.o `wx-config --libs`
 minimal.o: minimal.cpp
 	$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 * Using configure to build MS-DOS version
 ------------------------------------------
 Even though configure is a Unix script, you can use it to build MS-DOS version
 of the wxMGL library. There are two possible ways to achieve this: you can
 either cross-compile from Unix or compile natively. Either way you will needed
 the DJGPP port of GCC compiler freely available from:
    http://www.delorie.com/djgpp/getting.html
 Scitech MGL must be compiled natively, and to do this you will need to download
 the following files (from the current/v2 and current/v2gnu directories). You
 should get the latest versions available rather than the exact versions shown
 below, they are just an example of what to look for:
 djdev203.zip B   1,530,778 020811 DJGPP development kit 2.03
 bnu2161b.zip B   3,483,132 050708 GNU Binutils 2.16.1 for DJGPP V2
 gcc344b.zip  B   3,772,211 050527 GNU GCC 3.4.4 for DJGPP V2
 gpp344b.zip  B   4,026,725 050527 GNU C++ Compiler 3.4.4 for DJGPP V2
 If you want to build wxMGL natively using the DJGPP compiler, you will have to
 install a couple of Unix utilities. I think the following is the minimum that
 will work:
 bsh204b.zip  B     454,308 020106 GNU Bash shell 2.04 for DJGPP V2
 fil41b.zip   B   1,738,170 030830 GNU fileutils 4.1 for DJGPP V2
 find41b.zip  B     306,826 010505 GNU findutils 4.1 for DJGPP V2
 grep24b.zip  B     254,997 000116 GNU Grep 2.4 for DJGPP V2
 mak3791b.zip B     272,798 020106 GNU Make 3.79.1 for DJGPP V2
 sed414b.zip  B     159,920 050331 GNU Sed 4.1.4 for DJGPP V2
 shl2011b.zip B   1,195,021 020419 GNU sh-utils 2.01 for DJGPP V2
 You'll probably also want a debugger:
 gdb611b.zip  B   1,585,648 040629 GNU GDB Debugger 6.1.1 for DJGPP V2
 And maybe some of these:
 faq230b.zip  B     679,865 000203 FAQ 2.30 for DJGPP v2.03
 dif281b.zip  B     402,859 040911 GNU Diffutils 2.8.1 for DJGPP V2
 gwk314b.zip  B     968,667 050321 GNU Awk 3.1.4 for DJGPP V2
 gzip135b.zip B     146,138 041215 GNU gzip 1.3.5 for DJGPP V2
 lss374b.zip  B     199,805 020405 GNU Less 374 for DJGPP V2
 pat254b.zip  B     114,250 040326 GNU Patch 2.5.4 for DJGPP V2
 tar112ab.zip B     236,427 000305 GNU Tar 1.12a for DJGPP V2
 whic211b.zip B      86,296 000911 GNU which 2.11 for DJGPP V2
 The system you compile on must support long file names. You can use Windows 9x
 or an x86 version of Windows 2000/XP or later. For example:
 C:\>set MGL_ROOT=c:/scitech
 C:\>set DJGPP=c:/djgpp/djgpp.env
 C:\>PATH=c:\djgpp\bin
 C:\>set PS1=\w\$
 C:\>bash
 c:/$ mkdir build
 c:/$ cd build
 c:/build$ ../wxWidgets/configure
 c:/build$ make
 c:/build$ cd samples/minimal
 c:/build/samples/minimal$ make
 Cross-compilation is very easy. It works like ordinary compilation with
 configure, you only have to specify the target:
 > ./configure --with-mgl --build=i586-linux --host=i586-pc-msdosdjgpp
 > make
 For this to work, you must have installed a cross compiler on your system.
 Linux rpms are available here:
    http://ap1.pp.fi/djgpp/gcc/cross-compiler/index.html
 NetBSD has a binary package which can be installed with:
    # pkg_add cross-i386-msdosdjgpp
 For other systems you will need to obtain the djgpp sources and compile them
 yourself.
 * Building wxMGL for MS-DOS using Watcom C/C++
 -----------------------------------------------
 <Note: this section is currently out of date>
 You will need Watcom C/C++ compiler version 11 or newer (Watcom is going to be
 OpenSourced by SciTech, check out http://www.openwatcom.org).
 1. Edit $(WXDIR)\include\wx\univ\setup.h to suit your needs (in same way as you
   do when compiling wxMSW).
 2. Go to $(WXDIR)\src\mgl and run
   > wmake -f makefile.wat all
 3. You can compile the samples by typing 'wmake -f makefile.mgl all' in sample
   directory if this file is available. If it is not, copy makefile.wat to
   makefile.mgl and replace the line that says
       !include $(WXDIR)\src\makeprog.wat
   with
       !include $(WXDIR)\src\mgl\makeprog.wat
 Compilation notes for MGL with gcc
 ----------------------------------
 The mvis library doesn't compile with current versions of gcc. However wxMGL
 does not use this part of MGL, so it can be taken out of the compile, e.g.:
 --- scitech/src/makefile.orig	2004-04-15 20:36:32.000000000 +0100
 +++ scitech/src/makefile	2005-04-26 01:50:12.000000000 +0100
@@ -88,7 +88,7 @@
 # Target to build libraries for one compiler for SciTech MGL Graphics Library
 -all_mgl:    $(T_PM) $(T_GCONSOLE) $(T_SNAP) $(T_TECH) $(T_MVIS) $(T_FIXED) \
 +all_mgl:    $(T_PM) $(T_GCONSOLE) $(T_SNAP) $(T_TECH) $(T_FIXED) \
             $(T_GM) $(T_GLUT) $(T_MGL)
     @$(ECHO) =============================================================================
     @$(ECHO) DONE: Single compiler MGL build completed successfully!
 The following small change is also required to include/tcl/hashmap.hpp:
 --- scitech/include/tcl/hashtab.hpp.orig        2006-01-20 19:51:12.000000000 +0000
 +++ scitech/include/tcl/hashtab.hpp     2006-01-22 14:12:12.000000000 +0000
@@ -60,7 +60,7 @@
     TCHashTableNode **prev;
     friend class TCGenHashTable;
 -    friend  ostream& operator << (ostream& o,TCGenHashTable& h);
 +    friend  ostream& operator << (ostream& o, class TCGenHashTable& h);
 public:
             // Constructor to satisfy some compilers :-(
             TCHashTableNode() {};
 Bug reports
 -----------
 Please send bug reports with a description of your environment,
 compiler and the error message(s) to the wxwin-developers mailing list at:
    wx-dev@lists.wxwidgets.org
 Vaclav Slavik, Julian Smart, Robert Roebling and Vadim Zeitlin, February 2002.
 Mike Wetherell 2005/2006
--- a/docs/mgl/readme.txt
+++ b/docs/mgl/readme.txt
@ -1,21 +0,0 @@
  Welcome to wxWidgets/MGL
 You have downloaded the MGL port of the wxWidgets GUI library.
 This runs on top of SciTech MGL library (http://www.scitechsoft.com/)
 that is available for variety of operating systems and comes with support
 for embedded devices.
 More information about the wxWidgets project as a whole
 can be found at:
  http://www.wxwidgets.org/
 Information on how to install can be found in the file 
 install.txt
  Regards,
  The wxWidgets team
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@ -15,7 +15,6 @@ The following platforms are supported:
 - Mac OS X using Carbon
 - Mac OS X using Cocoa (beta)
 - OS/2 (beta)
 - MGL for Linux and DOS
 To get wxWidgets, please go to the Download page at:
--- a/docs/tech/tn0012.txt
+++ b/docs/tech/tn0012.txt
@ -45,7 +45,6 @@ $toolkit must currently be one of the following:
 	mac
 	os2
 	pm
 	mgl
 	motif
 --------------------------------------------------------------------
--- a/include/wx/app.h
+++ b/include/wx/app.h
@ -592,10 +592,10 @@ public:
    // ------------------------------------------------------------------------
        // Get display mode that is used use. This is only used in framebuffer
-        // wxWin ports (such as wxMGL or wxDFB).
+        // wxWin ports such as wxDFB.
    virtual wxVideoMode GetDisplayMode() const;
        // Set display mode to use. This is only used in framebuffer wxWin
-        // ports (such as wxMGL or wxDFB). This method should be called from
+        // ports such as wxDFB. This method should be called from
        // wxApp::OnInitGui
    virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; }
@ -685,8 +685,6 @@ protected:
    #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/app.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/app.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/app.h"
 #elif defined(__WXGTK20__)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@ -68,8 +68,7 @@ protected:
    virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0;
 };
-#if defined(__WXMGL__) || \
+#if defined(__WXDFB__) || \
    defined(__WXDFB__) || \
    defined(__WXMAC__) || \
    defined(__WXGTK__) || \
    defined(__WXCOCOA__) || \
@ -252,9 +251,6 @@ protected:
 #elif defined(__WXX11__)
    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
    #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
    #include "wx/mgl/bitmap.h"
 #elif defined(__WXDFB__)
    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
    #include "wx/dfb/bitmap.h"
@ -284,7 +280,7 @@ ConvertToDisabled(unsigned char brightness) const
 #endif // wxUSE_IMAGE
 // we must include generic mask.h after wxBitmap definition
-#if defined(__WXMGL__) || defined(__WXDFB__)
+#if defined(__WXDFB__)
    #define wxUSE_GENERIC_MASK 1
 #else
    #define wxUSE_GENERIC_MASK 0
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@ -78,8 +78,6 @@ public:
    #include "wx/gtk/brush.h"
 #elif defined(__WXGTK__)
    #include "wx/gtk1/brush.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/brush.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@ -1213,8 +1213,6 @@
 #  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)
 #  include "wx/mgl/chkconf.h"
 #elif defined(__WXDFB__)
 #  include "wx/dfb/chkconf.h"
 #elif defined(__WXMOTIF__)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@ -160,8 +160,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
    #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
    #include "wx/x11/clipbrd.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@ -221,8 +221,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
    #include "wx/gtk/colour.h"
 #elif defined(__WXGTK__)
    #include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
    #include "wx/generic/colour.h"
 #elif defined(__WXDFB__)
    #include "wx/generic/colour.h"
 #elif defined(__WXX11__)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@ -49,9 +49,6 @@ public:
 #elif defined(__WXX11__)
    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
    #include "wx/x11/cursor.h"
 #elif defined(__WXMGL__)
    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
    #include "wx/mgl/cursor.h"
 #elif defined(__WXDFB__)
    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
    #include "wx/dfb/cursor.h"
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@ -40,7 +40,6 @@
         !defined(__WXOSX_IPHONE__)   && \
         !defined(__WXCOCOA__) && \
         !defined(__X__)       && \
         !defined(__WXMGL__)   && \
         !defined(__WXDFB__)   && \
         !defined(__WXX11__)   && \
          wxUSE_GUI
@ -3277,10 +3276,6 @@ typedef struct _PangoLayout          PangoLayout;
 typedef struct _PangoFontDescription PangoFontDescription;
 #endif
 #ifdef __WXMGL__
 typedef struct window_t *WXWidget;
 #endif /*  MGL */
 #ifdef __WXDFB__
 /* DirectFB doesn't have the concept of non-TLW window, so use
   something arbitrary */
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@ -116,7 +116,6 @@ protected:
    #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
      defined(__WXX11__)   || \
      defined(__WXMGL__)   || \
      defined(__WXCOCOA__) || \
      defined(__WXPM__)
    #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@ -54,8 +54,6 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
             xencoding;
 #elif defined(wxHAS_UTF8_FONTS)
    // ports using UTF-8 for text don't need encoding information for fonts
 #elif defined(__WXMGL__)
    int      mglEncoding;
 #else
    #error "Unsupported toolkit"
 #endif
--- a/include/wx/font.h
+++ b/include/wx/font.h
@ -351,8 +351,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
    #include "wx/gtk1/font.h"
 #elif defined(__WXX11__)
    #include "wx/x11/font.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/font.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@ -176,9 +176,6 @@ enum wxStockCursor
 #elif defined(__WXPM__)
    // Load from a resource
    #define wxICON(X) wxIcon(wxT(#X))
 #elif defined(__WXMGL__)
    // Initialize from an included XPM
    #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXDFB__)
    // Initialize from an included XPM
    #define wxICON(X) wxIcon( X##_xpm )
@ -209,7 +206,6 @@ enum wxStockCursor
      defined(__WXMOTIF__) || \
      defined(__WXX11__)   || \
      defined(__WXMAC__)   || \
      defined(__WXMGL__)   || \
      defined(__WXDFB__)   || \
      defined(__WXCOCOA__)
    // Initialize from an included XPM
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@ -38,9 +38,6 @@
 #elif defined(__WXX11__)
  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
  #include "wx/generic/icon.h"
 #elif defined(__WXMGL__)
  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
  #include "wx/generic/icon.h"
 #elif defined(__WXDFB__)
  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
  #include "wx/generic/icon.h"
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@ -1,57 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/app.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 #include "wx/frame.h"
 #include "wx/icon.h"
 #include "wx/vidmode.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
 public:
    wxApp();
    virtual ~wxApp();
    /* override for altering the way wxGTK intializes the GUI
     * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
     * default. when overriding this method, the code in it is likely to be
     * platform dependent, otherwise use OnInit(). */
    virtual bool OnInitGui();
    // override base class (pure) virtuals
    virtual bool Initialize(int& argc, wxChar **argv);
    virtual void CleanUp();
    virtual void Exit();
    virtual void WakeUpIdle();
    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
    virtual bool SetDisplayMode(const wxVideoMode& mode);
 private:
    DECLARE_DYNAMIC_CLASS(wxApp)
    wxVideoMode m_displayMode;
 };
 #endif // __WX_APP_H__
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@ -1,92 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/bitmap.h
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_BITMAP_H__
 #define __WX_BITMAP_H__
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 class MGLDevCtx;
 struct bitmap_t;
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
    wxBitmap() {}
    wxBitmap(int width, int height, int depth = -1)
        { Create(width, height, depth); }
    wxBitmap(const wxSize& sz, int depth = -1)
        { Create(sz, depth); }
    wxBitmap(const char bits[], int width, int height, int depth = 1);
    wxBitmap(const char* const* bits);
    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
    wxBitmap(const wxImage& image, int depth = -1);
    virtual ~wxBitmap() {}
    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
    virtual int GetHeight() const;
    virtual int GetWidth() const;
    virtual int GetDepth() const;
    virtual wxImage ConvertToImage() const;
    virtual wxMask *GetMask() const;
    virtual void SetMask(wxMask *mask);
    virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const;
    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
    virtual wxPalette *GetPalette() const;
    virtual void SetPalette(const wxPalette& palette);
    // copies the contents and mask of the given (colour) icon to the bitmap
    virtual bool CopyFromIcon(const wxIcon& icon);
    static void InitStandardHandlers();
    // implementation:
    virtual void SetHeight(int height);
    virtual void SetWidth(int width);
    virtual void SetDepth(int depth);
    virtual wxColour QuantizeColour(const wxColour& colour) const;
    // get underlying native representation:
    bitmap_t *GetMGLbitmap_t() const;
 protected:
    virtual wxGDIRefData *CreateGDIRefData() const;
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
    // creates temporary DC for access to bitmap's data:
    MGLDevCtx *CreateTmpDC() const;
    // sets fg & bg colours for 1bit bitmaps:
    void SetMonoPalette(const wxColour& fg, const wxColour& bg);
 private:
    DECLARE_DYNAMIC_CLASS(wxBitmap)
    friend class wxDC;
    friend class wxMemoryDC;
 };
 #endif // __WX_BITMAP_H__
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@ -1,70 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/brush.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxBrush;
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 {
 public:
    wxBrush() {}
    wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
 #endif
    wxBrush(const wxBitmap &stippleBitmap);
    bool operator==(const wxBrush& brush) const;
    bool operator!=(const wxBrush& brush) const;
    wxBrushStyle GetStyle() const;
    wxColour GetColour() const;
    wxBitmap *GetStipple() const;
    void SetColour(const wxColour& col);
    void SetColour(unsigned char r, unsigned char g, unsigned char b);
    void SetStyle(wxBrushStyle style);
    void SetStipple(const wxBitmap& stipple);
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
    wxDEPRECATED_FUTURE( void SetStyle(int style) )
        { SetStyle((wxBrushStyle)style); }
 #endif
    // implementation:
    void* GetMaskPattern() const;
    void* GetPixPattern() const;
 protected:
    virtual wxGDIRefData *CreateGDIRefData() const;
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 private:
    DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 #endif // __WX_BRUSH_H__
--- a/include/wx/mgl/chkconf.h
+++ b/include/wx/mgl/chkconf.h
@ -1,103 +0,0 @@
 /*
 * Name:        wx/mgl/chkconf.h
 * Purpose:     Compiler-specific configuration checking
 * Author:      Julian Smart
 * Modified by:
 * Created:     01/02/97
 * RCS-ID:      $Id$
 * Copyright:   (c) Julian Smart
 * Licence:     wxWindows licence
 */
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 #ifndef _WX_MGL_CHKCONF_H_
 #define _WX_MGL_CHKCONF_H_
 #ifndef __WXUNIVERSAL__
 #   error "wxMGL cannot be built without wxUniversal"
 #endif
 /* wxPalette is always needed */
 #if !wxUSE_PALETTE
 #   error "wxMGL requires wxUSE_PALETTE=1"
 #endif
 /*
   wxDisplay is not implemented for OS/2, use stub common version instead.
 */
 #if wxUSE_DISPLAY
 #   undef wxUSE_DISPLAY
 #   define wxUSE_DISPLAY 0
 #endif /* wxUSE_DISPLAY */
 #ifdef __WATCOMC__
 /* Watcom builds for MGL port are setup.h driven and setup.h is
   automatically generated from include/wx/setup_inc.h so we have
   to disable here features not supported currently or enable
   features required */
 #if wxUSE_STACKWALKER
 #   undef wxUSE_STACKWALKER
 #   define wxUSE_STACKWALKER 0
 #endif /* wxUSE_STACKWALKER */
 #if wxUSE_ACCEL
 #   undef wxUSE_ACCEL
 #   define wxUSE_ACCEL 0
 #endif /* wxUSE_ACCEL */
 #if wxUSE_DYNLIB_CLASS
 #   undef wxUSE_DYNLIB_CLASS
 #   define wxUSE_DYNLIB_CLASS 0
 #endif /* wxUSE_DYNLIB_CLASS */
 #if wxUSE_DYNAMIC_LOADER
 #   undef wxUSE_DYNAMIC_LOADER
 #   define wxUSE_DYNAMIC_LOADER 0
 #endif /* wxUSE_DYNAMIC_LOADER */
 #if wxUSE_DATAOBJ
 #   undef wxUSE_DATAOBJ
 #   define wxUSE_DATAOBJ 0
 #endif
 #if wxUSE_CLIPBOARD
 #   undef wxUSE_CLIPBOARD
 #   define wxUSE_CLIPBOARD 0
 #endif /* wxUSE_CLIPBOARD */
 #if wxUSE_SOCKETS
 #   undef wxUSE_SOCKETS
 #   define wxUSE_SOCKETS 0
 #endif /* wxUSE_SOCKETS */
 #if wxUSE_THREADS
 #   undef wxUSE_THREADS
 #   define wxUSE_THREADS 0
 #endif /* wxUSE_SOCKETS */
 #if wxUSE_PROTOCOL
 #   undef wxUSE_PROTOCOL
 #   define wxUSE_PROTOCOL 0
 #endif /* wxUSE_PROTOCOL */
 #if wxUSE_URL
 #   undef wxUSE_URL
 #   define wxUSE_URL 0
 #endif /* wxUSE_URL */
 #if wxUSE_FS_INET
 #   undef wxUSE_FS_INET
 #   define wxUSE_FS_INET 0
 #endif /* wxUSE_FS_INET */
 #if wxUSE_MS_HTML_HELP
 #   undef wxUSE_MS_HTML_HELP
 #   define wxUSE_MS_HTML_HELP 0
 #endif
 #endif /* __WATCOM__ */
 #endif /* _WX_MGL_CHKCONF_H_ */
--- a/include/wx/mgl/clipbrd.h
+++ b/include/wx/mgl/clipbrd.h
@ -1,77 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/clipbrd.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_CLIPBOARD_H__
 #define __WX_CLIPBOARD_H__
 #if wxUSE_CLIPBOARD
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/dataobj.h"
 #include "wx/control.h"
 #include "wx/module.h"
 // ----------------------------------------------------------------------------
 // wxClipboard
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
 {
 public:
    wxClipboard() {}
    virtual ~wxClipboard() {}
    // open the clipboard before SetData() and GetData()
    virtual bool Open() {}
    // close the clipboard after SetData() and GetData()
    virtual void Close() {}
    // query whether the clipboard is opened
    virtual bool IsOpened() const {}
    // set the clipboard data. all other formats will be deleted.
    virtual bool SetData( wxDataObject *data ) {}
    // add to the clipboard data.
    virtual bool AddData( wxDataObject *data ) {}
    // ask if data in correct format is available
    virtual bool IsSupported( const wxDataFormat& format ) {}
    // fill data with data on the clipboard (if available)
    virtual bool GetData( wxDataObject& data ) {}
    // clears wxTheClipboard and the system's clipboard if possible
    virtual void Clear() {}
    // implementation from now on
    bool              m_open;
    bool              m_ownsClipboard;
    bool              m_ownsPrimarySelection;
    wxDataObject     *m_data;
    GtkWidget        *m_clipboardWidget;  /* for getting and offering data */
    GtkWidget        *m_targetsWidget;    /* for getting list of supported formats */
    bool              m_waiting;          /* querying data or formats is asynchronous */
    bool              m_formatSupported;
    GdkAtom           m_targetRequested;
    wxDataObject     *m_receivedData;
 private:
    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 #endif
   // wxUSE_CLIPBOARD
 #endif
    // __WX_CLIPBOARD_H__
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@ -1,45 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/cursor.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 class MGLCursor;
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
    wxCursor();
    wxCursor(wxStockCursor id) { InitFromStock(id); }
 #if WXWIN_COMPATIBILITY_2_8
    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
 #endif
    wxCursor(const wxString& name,
             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
             int hotSpotX = 0, int hotSpotY = 0);
    virtual ~wxCursor();
    // implementation
    MGLCursor *GetMGLCursor() const;
 private:
    void InitFromStock(wxStockCursor);
    DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 #endif // __WX_CURSOR_H__
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@ -1,214 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/dc.h
 // Purpose:     wxDC class
 // Author:      Vaclav Slavik
 // Created:     2001/03/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 #include "wx/defs.h"
 #include "wx/region.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxDC;
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 #ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
 #define MM_LOMETRIC     3
 #define MM_HIMETRIC     4
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
 #endif
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 // MGL fwd declarations:
 class MGLDevCtx;
 class MGLRegion;
 struct font_t;
 class WXDLLIMPEXP_CORE wxDC : public wxDCBase
 {
    DECLARE_DYNAMIC_CLASS(wxDC)
 public:
    wxDC();
    virtual ~wxDC();
    // implement base class pure virtuals
    // ----------------------------------
    virtual void Clear();
    virtual bool StartDoc(const wxString& message);
    virtual void EndDoc();
    virtual void StartPage();
    virtual void EndPage();
    virtual void SetFont(const wxFont& font);
    virtual void SetPen(const wxPen& pen);
    virtual void SetBrush(const wxBrush& brush);
    virtual void SetBackground(const wxBrush& brush);
    virtual void SetBackgroundMode(int mode);
    virtual void SetPalette(const wxPalette& palette);
    virtual void DestroyClippingRegion();
    virtual wxCoord GetCharHeight() const;
    virtual wxCoord GetCharWidth() const;
    virtual void DoGetTextExtent(const wxString& string,
                                 wxCoord *x, wxCoord *y,
                                 wxCoord *descent = NULL,
                                 wxCoord *externalLeading = NULL,
                                 const wxFont *theFont = NULL) const;
    virtual bool CanDrawBitmap() const;
    virtual bool CanGetTextExtent() const;
    virtual int GetDepth() const;
    virtual wxSize GetPPI() const;
    virtual void SetLogicalFunction(wxRasterOperationMode function);
    // implementation from now on
    // --------------------------
    virtual void ComputeScaleAndOrigin();
    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
    MGLDevCtx *GetMGLDC() const { return m_MGLDC; }
    void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = false);
 protected:
    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                             wxFloodFillStyle style = wxFLOOD_SURFACE);
    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
    virtual void DoDrawPoint(wxCoord x, wxCoord y);
    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
                           wxCoord x2, wxCoord y2,
                           wxCoord xc, wxCoord yc);
    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                                   double sa, double ea);
    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                        wxCoord width, wxCoord height,
                                        double radius);
    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
    virtual void DoCrossHair(wxCoord x, wxCoord y);
    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
                              bool useMask = false);
    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
                                   double angle);
    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                     wxCoord width, wxCoord height);
    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
    virtual void DoGetSize(int *width, int *height) const;
    virtual void DoGetSizeMM(int* width, int* height) const;
    virtual void DoDrawLines(int n, wxPoint points[],
                             wxCoord xoffset, wxCoord yoffset);
    virtual void DoDrawPolygon(int n, wxPoint points[],
                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
    // implementation from now on:
 protected:
    // setup newly attached MGLDevCtx for wxDC's use
    // (does things like setting RGB blending mode for antialiased texts):
    void InitializeMGLDC();
    // common part of DoDrawText() and DoDrawRotatedText()
    void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
    // MGL uses pens as both wxPens and wxBrushes, so we have to
    // switch them as needed:
    void SelectPen();
    void SelectBrush();
    void SelectMGLStipplePen(int style);
    void SelectMGLFatPen(int style, int flag);
    // Select m_font into m_MGLDC:
    bool SelectMGLFont();
    // Convert wxWin logical function to MGL rop:
    int LogicalFunctionToMGLRop(int logFunc) const;
    // Unified implementation of DrawIcon, DrawBitmap and Blit:
    void DoDrawSubBitmap(const wxBitmap &bmp,
                         wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                         wxCoord destx, wxCoord desty, int rop, bool useMask);
    // MGL DC class we use:
    MGLDevCtx        *m_MGLDC;
    bool              m_OwnsMGLDC:1;
    // helper variables for SelectXXXX():
    bool              m_penSelected;
    bool              m_brushSelected;
    bool              m_downloadedPatterns[2];
    // MGL does not render lines with width>1 with endings centered
    // at given coords but with top left corner of the pen at them,
    // these offsets are used to correct it. They are computed by
    // SelectPen.
    int               m_penOfsX, m_penOfsY;
    double            m_mm_to_pix_x, m_mm_to_pix_y;
    wxPalette         m_oldPalette;
    wxRegion          m_currentClippingRegion;
    wxRegion          m_globalClippingRegion;
    // wxDC::Blit handles memoryDCs as special cases :(
    bool              m_isMemDC;
    font_t            *m_mglFont;
 };
 #endif
    // _WX_DC_H_
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@ -1,71 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/dcclient.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_DCCLIENT_H__
 #define __WX_DCCLIENT_H__
 #include "wx/dc.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxPaintDC;
 class WXDLLIMPEXP_FWD_CORE wxClientDC;
 class WXDLLIMPEXP_FWD_CORE wxWindowMGL;
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:
    wxWindowDC() {}
    virtual ~wxWindowDC();
    wxWindowDC(wxWindow *win);
 protected:
    wxWindow *m_wnd;
    bool      m_inPaintHandler;
 private:
    DECLARE_DYNAMIC_CLASS(wxWindowDC)
 };
 //-----------------------------------------------------------------------------
 // wxClientDC
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
 {
 public:
    wxClientDC() : wxWindowDC() {}
    wxClientDC(wxWindow *win);
 private:
    DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
 {
 public:
    wxPaintDC() : wxClientDC() {}
    wxPaintDC(wxWindow *win) : wxClientDC(win) {}
 private:
    DECLARE_DYNAMIC_CLASS(wxPaintDC)
 };
 #endif // __WX_DCCLIENT_H__
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@ -1,59 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/dcmemory.h
 // Purpose:
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_DCMEMORY_H__
 #define __WX_DCMEMORY_H__
 #include "wx/defs.h"
 #include "wx/dcclient.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC, public wxMemoryDCBase
 {
 public:
    wxMemoryDC() { Init(); }
    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
    wxMemoryDC(wxDC *dc); // Create compatible DC
    virtual ~wxMemoryDC();
    // these get reimplemented for mono-bitmaps to behave
    // more like their Win32 couterparts. They now interpret
    // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
    // and everything else as drawing 1.
    virtual void SetPen(const wxPen &pen);
    virtual void SetBrush(const wxBrush &brush);
    virtual void SetTextForeground(const wxColour &col);
    virtual void SetTextBackground(const wxColour &col);
    // implementation
    wxBitmap  m_selected;
    wxBitmap GetSelectedObject() const { return m_selected; }
 protected:
    virtual void DoSelect(const wxBitmap& bitmap);
 private:
    void Init();
    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 #endif
    // __WX_DCMEMORY_H__
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@ -1,42 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/dcscreen.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_DCSCREEN_H__
 #define __WX_DCSCREEN_H__
 #include "wx/dcclient.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxScreenDC;
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxScreenDC: public wxDC
 {
 public:
    wxScreenDC();
    virtual ~wxScreenDC();
    static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
    static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
    static bool EndDrawingOnTop() { return TRUE; }
 private:
    DECLARE_DYNAMIC_CLASS(wxScreenDC)
 };
 #endif
    // __WX_DCSCREEN_H__
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@ -1,121 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/font.h
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_FONT_H__
 #define __WX_FONT_H__
 #include "wx/hash.h"
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxPaintDC;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxFont;
 struct font_t;
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
    // ctors and such
    wxFont() { }
    wxFont(const wxNativeFontInfo& info)
    {
        (void)Create(info);
    }
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
    wxFont(int size,
           int family,
           int style,
           int weight,
           bool underlined = false,
           const wxString& face = wxEmptyString,
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
    {
        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
    }
 #endif
    wxFont(int size,
           wxFontFamily family,
           wxFontStyle style,
           wxFontWeight weight,
           bool underlined = false,
           const wxString& face = wxEmptyString,
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
    {
        Create(size, family, style, weight, underlined, face, encoding);
    }
    wxFont(const wxSize& pixelSize,
           wxFontFamily family,
           wxFontStyle style,
           wxFontWeight weight,
           bool underlined = false,
           const wxString& face = wxEmptyString,
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
    {
        Create(10, family, style, weight, underlined, face, encoding);
        SetPixelSize(pixelSize);
    }
    bool Create(int size,
                wxFontFamily family,
                wxFontStyle style,
                wxFontWeight weight,
                bool underlined = false,
                const wxString& face = wxEmptyString,
                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
    bool Create(const wxNativeFontInfo& fontinfo);
    virtual ~wxFont() {}
    // implement base class pure virtuals
    virtual int GetPointSize() const;
    virtual wxFontStyle GetStyle() const;
    virtual wxFontWeight GetWeight() const;
    virtual wxString GetFaceName() const;
    virtual bool GetUnderlined() const;
    virtual wxFontEncoding GetEncoding() const;
    virtual bool IsFixedWidth() const;
    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
    virtual void SetPointSize(int pointSize);
    virtual void SetFamily(wxFontFamily family);
    virtual void SetStyle(wxFontStyle style);
    virtual void SetWeight(wxFontWeight weight);
    virtual bool SetFaceName(const wxString& faceName);
    virtual void SetUnderlined(bool underlined);
    virtual void SetEncoding(wxFontEncoding encoding);
    wxDECLARE_COMMON_FONT_METHODS();
    struct font_t *GetMGLfont_t(float scale, bool antialiased);
 protected:
    // ref counting code
    virtual wxGDIRefData *CreateGDIRefData() const;
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
    virtual wxFontFamily DoGetFamily() const;
 private:
    DECLARE_DYNAMIC_CLASS(wxFont)
 };
 #endif // __WX_FONT_H__
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@ -1,49 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/palette.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_PALETTE_H__
 #define __WX_PALETTE_H__
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 struct palette_t;
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
 {
 public:
    wxPalette();
    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
    virtual ~wxPalette();
    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
    // implementation
    virtual int GetColoursCount() const;
    palette_t *GetMGLpalette_t() const;
    DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 #endif // __WX_PALETTE_H__
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@ -1,79 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/pen.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_PEN_H__
 #define __WX_PEN_H__
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxPen;
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 {
 public:
    wxPen() {}
    wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
 #endif
    wxPen(const wxBitmap& stipple, int width);
    virtual ~wxPen() {}
    bool operator == (const wxPen& pen) const;
    bool operator != (const wxPen& pen) const;
    void SetColour(const wxColour &colour);
    void SetColour(unsigned char red, unsigned char green, unsigned char blue);
    void SetCap(wxPenCap capStyle);
    void SetJoin(wxPenJoin joinStyle);
    void SetStyle(wxPenStyle style);
    void SetWidth(int width);
    void SetDashes(int number_of_dashes, const wxDash *dash);
    void SetStipple(const wxBitmap& stipple);
    wxColour GetColour() const;
    wxPenCap GetCap() const;
    wxPenJoin GetJoin() const;
    wxPenStyle GetStyle() const;
    int GetWidth() const;
    int GetDashes(wxDash **ptr) const;
    int GetDashCount() const;
    wxDash* GetDash() const;
    wxBitmap *GetStipple() const;
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
    wxDEPRECATED_FUTURE( void SetStyle(int style) )
        { SetStyle((wxPenStyle)style); }
 #endif
    // implementation:
    void* GetPixPattern() const;
 protected:
    virtual wxGDIRefData *CreateGDIRefData() const;
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 private:
    DECLARE_DYNAMIC_CLASS(wxPen)
 };
 #endif // __WX_PEN_H__
--- a/include/wx/mgl/popupwin.h
+++ b/include/wx/mgl/popupwin.h
@ -1,39 +0,0 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/popupwin.h
 // Purpose:     wxPopupWindow class for wxMGL
 // Author:      Vadim Zeitlin
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_POPUPWIN_H_
 #define _WX_POPUPWIN_H_
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
 {
 public:
    wxPopupWindow() { }
    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
        { (void)Create(parent, flags); }
    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
    {
        return wxPopupWindowBase::Create(parent) &&
               wxWindow::Create(parent, -1,
                                wxDefaultPosition, wxDefaultSize,
                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
    }
 protected:
    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 #endif // _WX_POPUPWIN_H_
--- a/include/wx/mgl/private.h
+++ b/include/wx/mgl/private.h
@ -1,58 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/private.h
 // Purpose:     Private declarations: as this header is only included by
 //              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Author:      Vaclav Slavik
 // Created:     2001/04/07
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_MGL_PRIVATE_H_
 #define _WX_MGL_PRIVATE_H_
 #include "wx/ioswrap.h"
 #include <mgraph.hpp>
 #include "pmapi.h"
 // the scitech headers define true and false
 #undef true
 #undef false
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 // ---------------------------------------------------------------------------
 // private variables
 // ---------------------------------------------------------------------------
 extern MGLDevCtx *g_displayDC;
 extern winmng_t  *g_winMng;
 // ---------------------------------------------------------------------------
 // helper functions
 // ---------------------------------------------------------------------------
 // This function converts wxBitmap into pixpattern24_t representation
 // (used by wxBrush and wxPen)
 extern void wxBitmapToPixPattern(const wxBitmap& bitmap,
                                 pixpattern24_t *pix, pattern_t *mask);
 // Sets current DC and restores previous one upon destruction:
 class wxCurrentDCSwitcher
 {
 public:
    wxCurrentDCSwitcher(MGLDevCtx *dc)
            { m_old = dc->makeCurrent(); }
    ~wxCurrentDCSwitcher()
            { MGL_makeCurrentDC(m_old); }
    MGLDC *m_old;
 };
 #endif // _WX_MGL_PRIVATE_H_
--- a/include/wx/mgl/private/fontmgr.h
+++ b/include/wx/mgl/private/fontmgr.h
@ -1,75 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/private/fontmgr.h
 // Purpose:     font management for MGL
 // Author:      Vaclav Slavik
 // Created:     2006-11-18
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_MGL_PRIVATE_FONTMGR_H_
 #define _WX_MGL_PRIVATE_FONTMGR_H_
 struct font_info_t;
 struct font_lib_t;
 struct font_t;
 class wxFontInstance : public wxFontInstanceBase
 {
 public:
    wxFontInstance(float ptSize, bool aa, font_lib_t *fontLib);
    virtual ~wxFontInstance();
    struct font_t *GetMGLfont_t() const { return m_font; }
 private:
    font_t *m_font;
 };
 class wxFontFace : public wxFontFaceBase
 {
 public:
    wxFontFace(const wxString& filename)
        : m_fontLib(NULL), m_fileName(filename) {}
    virtual void Acquire();
    virtual void Release();
    virtual wxFontInstance *GetFontInstance(float ptSize, bool aa);
 protected:
    wxFontInstance *CreateFontInstance(float ptSize, bool aa);
 private:
    font_lib_t *m_fontLib;
    wxString m_fileName;
 };
 class wxFontBundle : public wxFontBundleBase
 {
 public:
    wxFontBundle(const font_info_t *fontInfo);
    virtual wxString GetName() const;
    virtual bool IsFixed() const;
    const font_info_t *GetInfo() const { return m_fontInfo; }
 private:
    const font_info_t *m_fontInfo;
 };
 class wxFontsManager : public wxFontsManagerBase
 {
 public:
    wxFontsManager() { AddAllFonts(); }
    virtual wxString GetDefaultFacename(wxFontFamily family) const;
 private:
    // adds all fonts using AddBundle()
    void AddAllFonts();
 };
 #endif // _WX_MGL_PRIVATE_FONTMGR_H_
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@ -1,103 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/region.h
 // Purpose:     wxRegion class
 // Author:      Vaclav Slavik
 // Created:     2001/03/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_MGL_REGION_H_
 #define _WX_MGL_REGION_H_
 #include "wx/list.h"
 class MGLRegion;
 class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
 {
 public:
    wxRegion();
    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
    wxRegion(const wxRect& rect);
    wxRegion(const MGLRegion& region);
    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
    wxRegion(const wxBitmap& bmp)
    {
        Union(bmp);
    }
    wxRegion(const wxBitmap& bmp,
             const wxColour& transColour, int tolerance = 0)
    {
        Union(bmp, transColour, tolerance);
    }
    virtual ~wxRegion();
    // wxRegionBase methods
    virtual void Clear();
    virtual bool IsEmpty() const;
    // implementation from now on:
    const MGLRegion& GetMGLRegion() const;
 protected:
    virtual wxGDIRefData *CreateGDIRefData() const;
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
    // wxRegionBase pure virtuals
    virtual bool DoIsEqual(const wxRegion& region) const;
    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
    virtual bool DoOffset(wxCoord x, wxCoord y);
    virtual bool DoUnionWithRect(const wxRect& rect);
    virtual bool DoUnionWithRegion(const wxRegion& region);
    virtual bool DoIntersect(const wxRegion& region);
    virtual bool DoSubtract(const wxRegion& region);
    virtual bool DoXor(const wxRegion& region);
 private:
    DECLARE_DYNAMIC_CLASS(wxRegion);
    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 };
 WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList);
 class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
 {
 public:
    wxRegionIterator(void);
    wxRegionIterator(const wxRegion& region);
    virtual ~wxRegionIterator(void);
    void Reset(void) { m_currentNode = NULL; }
    void Reset(const wxRegion& region);
    operator bool (void) const { return (m_currentNode != NULL); }
    bool HaveRects(void) const { return (m_currentNode != NULL); }
    void operator ++ (void);
    void operator ++ (int);
    wxCoord GetX(void) const;
    wxCoord GetY(void) const;
    wxCoord GetW(void) const;
    wxCoord GetWidth(void) const { return GetW(); }
    wxCoord GetH(void) const;
    wxCoord GetHeight(void) const { return GetH(); }
    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 private:
    wxRegionRectList         m_rects;
    wxRegionRectList::Node  *m_currentNode;
    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 #endif // _WX_MGL_REGION_H_
--- a/include/wx/mgl/toplevel.h
+++ b/include/wx/mgl/toplevel.h
@ -1,81 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/toplevel.h
 // Purpose:     Top level window, abstraction of wxFrame and wxDialog
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WX_TOPLEVEL_H__
 #define __WX_TOPLEVEL_H__
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowMGL
 //-----------------------------------------------------------------------------
 class wxTopLevelWindowMGL : public wxTopLevelWindowBase
 {
 public:
    // construction
    wxTopLevelWindowMGL() { Init(); }
    wxTopLevelWindowMGL(wxWindow *parent,
                        wxWindowID id,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& name = wxFrameNameStr)
    {
        Init();
        Create(parent, id, title, pos, size, style, name);
    }
    bool Create(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxDEFAULT_FRAME_STYLE,
                const wxString& name = wxFrameNameStr);
    // implement base class pure virtuals
    virtual void Maximize(bool maximize = true);
    virtual bool IsMaximized() const;
    virtual void Iconize(bool iconize = true);
    virtual bool IsIconized() const;
    virtual void Restore();
    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
    virtual bool IsFullScreen() const { return m_fsIsShowing; }
    virtual bool Show(bool show = true);
    virtual void SetTitle(const wxString &title) { m_title = title; }
    virtual wxString GetTitle() const { return m_title; }
    // implementation from now on
    // --------------------------
 protected:
    // common part of all ctors
    void Init();
    wxString      m_title;
    bool          m_fsIsShowing:1;         /* full screen */
    long          m_fsSaveStyle;
    long          m_fsSaveFlag;
    wxRect        m_fsSaveFrame;
    // is the frame currently iconized?
    bool          m_isIconized:1;
    // and maximized?
    bool          m_isMaximized:1;
    wxRect        m_savedFrame;
    // did we sent wxSizeEvent at least once?
    bool          m_sizeSet:1;
 };
 #endif // __WX_TOPLEVEL_H__
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@ -1,149 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mgl/window.h
 // Purpose:     wxWindow class
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 // ---------------------------------------------------------------------------
 // headers
 // ---------------------------------------------------------------------------
 #include "wx/font.h"
 struct window_t;
 class MGLDevCtx;
 // ---------------------------------------------------------------------------
 // wxWindow declaration for MGL
 // ---------------------------------------------------------------------------
 class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase
 {
 public:
    wxWindowMGL() { Init(); }
    wxWindowMGL(wxWindow *parent,
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPanelNameStr)
    {
        Init();
        Create(parent, id, pos, size, style, name);
    }
    virtual ~wxWindowMGL();
    bool Create(wxWindow *parent,
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPanelNameStr);
    // implement base class (pure) virtual methods
    // -------------------------------------------
    virtual void SetLabel( const wxString &WXUNUSED(label) ) {}
    virtual wxString GetLabel() const { return wxEmptyString; }
    virtual void Raise();
    virtual void Lower();
    virtual bool Show(bool show = true);
    virtual void SetFocus();
    virtual bool Reparent(wxWindowBase *newParent);
    virtual void WarpPointer(int x, int y);
    virtual void Refresh(bool eraseBackground = true,
                         const wxRect *rect = (const wxRect *) NULL);
    virtual void Update();
    virtual bool SetCursor(const wxCursor &cursor);
    virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
    virtual int GetCharHeight() const;
    virtual int GetCharWidth() const;
 #if wxUSE_DRAG_AND_DROP
    virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP
    // Accept files for dragging
    virtual void DragAcceptFiles(bool accept);
    virtual WXWidget GetHandle() const { return m_wnd; }
    void SetMGLwindow_t(struct window_t *wnd);
    // implementation from now on
    // --------------------------
 protected:
    virtual void DoFreeze();
    virtual void DoThaw();
    // the window handle
    struct window_t      *m_wnd;
    // whether there should be wxEraseEvent before wxPaintEvent or not
    // (see wxWindow::Refresh)
    bool                  m_refreshAfterThaw:1;
    int                   m_eraseBackground;
    // implement the base class pure virtuals
    virtual void DoGetTextExtent(const wxString& string,
                                 int *x, int *y,
                                 int *descent = NULL,
                                 int *externalLeading = NULL,
                                 const wxFont *font = NULL) const;
    virtual void DoClientToScreen( int *x, int *y ) const;
    virtual void DoScreenToClient( int *x, int *y ) const;
    virtual void DoGetPosition( int *x, int *y ) const;
    virtual void DoGetSize( int *width, int *height ) const;
    virtual void DoGetClientSize( int *width, int *height ) const;
    virtual void DoSetSize(int x, int y,
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
    virtual void DoSetClientSize(int width, int height);
    virtual void DoCaptureMouse();
    virtual void DoReleaseMouse();
    // move the window to the specified location and resize it: this is called
    // from both DoSetSize() and DoSetClientSize() and would usually just call
    // ::MoveWindow() except for composite controls which will want to arrange
    // themselves inside the given rectangle
    virtual void DoMoveWindow(int x, int y, int width, int height);
 private:
    // common part of all ctors
    void Init();
    // counterpart to SetFocus
    void KillFocus();
    MGLDevCtx *m_paintMGLDC;
    friend class wxPaintDC;
    DECLARE_DYNAMIC_CLASS(wxWindowMGL)
    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);
    DECLARE_EVENT_TABLE()
 public:
    void HandlePaint(MGLDevCtx *dc);
    // needed by wxWindowPainter
    MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; }
 };
 #endif // _WX_WINDOW_H_
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@ -34,8 +34,6 @@ public:
    #include "wx/x11/palette.h"
 #elif defined(__WXGTK__) || defined(__WXCOCOA__)
    #include "wx/generic/paletteg.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/palette.h"
 #elif defined(__WXPM__)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@ -107,8 +107,6 @@ public:
    #include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
    #include "wx/gtk1/pen.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/pen.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@ -72,15 +72,14 @@ enum wxPortId
    wxPORT_MSW      = 1 << 1,       // wxMSW, native toolkit is Windows API
    wxPORT_MOTIF    = 1 << 2,       // wxMotif, using [Open]Motif or Lesstif
    wxPORT_GTK      = 1 << 3,       // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_MGL      = 1 << 4,       // wxMGL, using wxUniversal
+    wxPORT_DFB      = 1 << 4,       // wxDFB, using wxUniversal
    wxPORT_X11      = 1 << 5,       // wxX11, using wxUniversal
    wxPORT_PM       = 1 << 6,       // wxOS2, using OS/2 Presentation Manager
    wxPORT_OS2      = wxPORT_PM,    // wxOS2, using OS/2 Presentation Manager
    wxPORT_MAC      = 1 << 7,       // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API
    wxPORT_OSX      = wxPORT_MAC,   // wxOSX, using Cocoa, Carbon or iPhone API
    wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
+    wxPORT_WINCE    = 1 << 9        // wxWinCE, toolkit is WinCE SDK API
    wxPORT_DFB      = 1 << 10       // wxDFB, using wxUniversal
 };
 // architecture of the operating system
@ -362,7 +361,6 @@ protected:
    #define wxWIN32S                wxOS_WINDOWS_9X
    #define wxOS2                   wxPORT_OS2
    #define wxMGL                   wxPORT_MGL
    #define wxCocoa                 wxPORT_MAC
    #define wxMac                   wxPORT_MAC
    #define wxMotif                 wxPORT_MOTIF
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@ -66,8 +66,6 @@ public:
    #include "wx/motif/popupwin.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/popupwin.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/popupwin.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/popupwin.h"
 #else
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@ -192,9 +192,7 @@ protected:
-#if defined(__WXMGL__)
+#if defined(__WXDFB__)
    #include "wx/mgl/private/fontmgr.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/private/fontmgr.h"
 #endif
--- a/include/wx/region.h
+++ b/include/wx/region.h
@ -220,8 +220,6 @@ protected:
    #include "wx/gtk1/region.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
    #include "wx/x11/region.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/region.h"
 #elif defined(__WXDFB__)
    #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@ -367,9 +367,6 @@ protected:
 #elif defined(__WXX11__)
    #include "wx/x11/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowX11
 #elif defined(__WXMGL__)
    #include "wx/mgl/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowMGL
 #elif defined(__WXDFB__)
    #include "wx/dfb/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowDFB
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@ -44,8 +44,6 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer;
 #define wxWindowNative wxWindowMSW
 #elif defined(__WXGTK__)
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL
 #elif defined(__WXX11__)
 #define wxWindowNative wxWindowX11
 #elif defined(__WXMAC__)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@ -1842,9 +1842,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
        #define wxWindowX11 wxWindow
    #endif // wxUniv
    #include "wx/x11/window.h"
 #elif defined(__WXMGL__)
    #define wxWindowNative wxWindowMGL
    #include "wx/mgl/window.h"
 #elif defined(__WXDFB__)
    #define wxWindowNative wxWindowDFB
    #include "wx/dfb/window.h"
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@ -54,11 +54,6 @@
 #   include "wx/os2/private.h"
 #endif
 // include mgl headers
 #ifdef __WXMGL__
 #   include "wx/mgl/private.h"
 #endif
 // include the most common wx headers
 #include "wx/wx.h"
--- a/interface/wx/app.h
+++ b/interface/wx/app.h
@ -635,7 +635,7 @@ public:
    /**
        Get display mode that is used use. This is only used in framebuffer
-        wxWidgets ports (such as wxMGL or wxDFB).
+        wxWidgets ports such as wxDFB.
    */
    virtual wxVideoMode GetDisplayMode() const;
@ -727,7 +727,7 @@ public:
    /**
        Set display mode to use. This is only used in framebuffer wxWidgets
-        ports (such as wxMGL or wxDFB).
+        ports such as wxDFB.
    */
    virtual bool SetDisplayMode(const wxVideoMode& info);
--- a/interface/wx/checkbox.h
+++ b/interface/wx/checkbox.h
@ -51,7 +51,7 @@ enum wxCheckBoxState
    @style{wxCHK_2STATE}
           Create a 2-state checkbox. This is the default.
    @style{wxCHK_3STATE}
-           Create a 3-state checkbox. Not implemented in wxMGL, wxOS2 and
+           Create a 3-state checkbox. Not implemented in wxOS2 and
           wxGTK built against GTK+ 1.2.
    @style{wxCHK_ALLOW_3RD_STATE_FOR_USER}
           By default a user can't set a 3-state checkbox to the third state.
--- a/interface/wx/platinfo.h
+++ b/interface/wx/platinfo.h
@ -77,13 +77,12 @@ enum wxPortId
    wxPORT_MSW      = 1 << 1,       //!< wxMSW, native toolkit is Windows API
    wxPORT_MOTIF    = 1 << 2,       //!< wxMotif, using [Open]Motif or Lesstif
    wxPORT_GTK      = 1 << 3,       //!< wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_MGL      = 1 << 4,       //!< wxMGL, using wxUniversal
+    wxPORT_DFB      = 1 << 4,       //!< wxDFB, using wxUniversal
    wxPORT_X11      = 1 << 5,       //!< wxX11, using wxUniversal
    wxPORT_OS2      = 1 << 6,       //!< wxOS2, using OS/2 Presentation Manager
    wxPORT_MAC      = 1 << 7,       //!< wxMac, using Carbon or Classic Mac API
    wxPORT_COCOA    = 1 << 8,       //!< wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9,       //!< wxWinCE, toolkit is WinCE SDK API
+    wxPORT_WINCE    = 1 << 9        //!< wxWinCE, toolkit is WinCE SDK API
    wxPORT_DFB      = 1 << 10       //!< wxDFB, using wxUniversal
 };
--- a/interface/wx/sysopt.h
+++ b/interface/wx/sysopt.h
@ -128,16 +128,6 @@
    @endFlagTable
    @section sysopt_mgl MGL
    @beginFlagTable
    @flag{mgl.aa-threshold}
        Set this integer option to point size below which fonts are not antialiased. Default: 10.
    @flag{mgl.screen-refresh}
        Screen refresh rate in Hz. A reasonable default is used if not specified.
    @endFlagTable
    @section sysopt_motif Motif
    @beginFlagTable
--- a/locale/wxstd.pot
+++ b/locale/wxstd.pot
@ -1741,14 +1741,6 @@ msgstr ""
 msgid "Cannot initialize OLE"
 msgstr ""
 #: ../src/mgl/app.cpp:224
 msgid "Cannot initialize SciTech MGL!"
 msgstr ""
 #: ../src/mgl/window.cpp:547
 msgid "Cannot initialize display."
 msgstr ""
 #: ../src/common/socket.cpp:844
 msgid "Cannot initialize sockets"
 msgstr ""
@ -2361,10 +2353,6 @@ msgstr ""
 msgid "Couldn't create a timer"
 msgstr ""
 #: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:153
 msgid "Couldn't create cursor."
 msgstr ""
 #: ../src/osx/carbon/overlay.cpp:123
 msgid "Couldn't create the overlay window"
 msgstr ""
@ -2656,11 +2644,6 @@ msgstr ""
 msgid "Directory '%s' couldn't be deleted"
 msgstr ""
 #: ../src/mgl/dirmgl.cpp:200
 #, c-format
 msgid "Directory '%s' doesn't exist!"
 msgstr ""
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr ""
@ -3509,11 +3492,6 @@ msgstr ""
 msgid "File \"%s\" could not be opened for writing."
 msgstr ""
 #: ../src/mgl/bitmap.cpp:439
 #, c-format
 msgid "File %s does not exist."
 msgstr ""
 #: ../src/gtk/filedlg.cpp:53
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
@ -4642,11 +4620,6 @@ msgstr ""
 msgid "Missing a required parameter."
 msgstr ""
 #: ../src/mgl/app.cpp:114
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr ""
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr ""
--- a/samples/access/makefile.unx
+++ b/samples/access/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/animate/makefile.unx
+++ b/samples/animate/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/artprov/makefile.unx
+++ b/samples/artprov/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/aui/makefile.unx
+++ b/samples/aui/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/clipboard/makefile.unx
+++ b/samples/clipboard/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/collpane/makefile.unx
+++ b/samples/collpane/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/combo/makefile.unx
+++ b/samples/combo/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/controls/makefile.unx
+++ b/samples/controls/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dataview/makefile.unx
+++ b/samples/dataview/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/debugrpt/makefile.unx
+++ b/samples/debugrpt/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dialup/makefile.unx
+++ b/samples/dialup/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/display/makefile.unx
+++ b/samples/display/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dll/makefile.unx
+++ b/samples/dll/makefile.unx
@ -13,7 +13,7 @@
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dnd/makefile.unx
+++ b/samples/dnd/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/dragimag/makefile.unx
+++ b/samples/dragimag/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/drawing/makefile.unx
+++ b/samples/drawing/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/erase/makefile.unx
+++ b/samples/erase/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/event/makefile.unx
+++ b/samples/event/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/except/makefile.unx
+++ b/samples/except/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/font/makefile.unx
+++ b/samples/font/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/samples/fswatcher/makefile.unx
+++ b/samples/fswatcher/makefile.unx
@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 # Use DLL build of wx library to use? [0,1]
--- a/Show More
+++ b/Show More