This commit was manufactured by cvs2svn to create tag 'WX_2_7_0'.

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

build/aclocal/bakefile.m4

@@ -287,7 +287,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
                 AC_TRY_COMPILE([],
                     [
                         #ifndef __INTEL_COMPILER
-                        #error Not icc
+                        This is not ICC
                         #endif
                     ],
                     bakefile_cv_prog_icc=yes,
@@ -329,7 +329,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
                [
                    #if (__GNUC__ < 3) || \
                        ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
-                       #error old gcc
+                       This is old gcc
                    #endif
                ],
                [
@@ -421,6 +421,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
 
       powerpc-apple-macos* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+      *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
@@ -514,7 +515,17 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_BAKEFILE_DEPS],
 [
+    AC_ARG_ENABLE([dependency-tracking],
+                  AS_HELP_STRING([--disable-dependency-tracking],
+                                 [don't use dependency tracking even if the compiler can]),
+                  [bk_use_trackdeps="$enableval"])
+    
     AC_MSG_CHECKING([for dependency tracking method])
+
+    if test "x$bk_use_trackdeps" = "xno" ; then
+        DEPS_TRACKING=0
+        AC_MSG_RESULT([disabled])
+    else
         DEPS_TRACKING=1
 
         if test "x$GCC" = "xyes"; then
@@ -559,6 +570,7 @@ AC_DEFUN([AC_BAKEFILE_DEPS],
             AC_BAKEFILE_CREATE_FILE_BK_DEPS
             chmod +x bk-deps
         fi
+    fi
 
     AC_SUBST(DEPS_TRACKING)
 ])
@@ -643,6 +655,8 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
                   [bk_use_pch="$enableval"])
 
     GCC_PCH=0
+    ICC_PCH=0
+    USE_PCH=0
 
     case ${BAKEFILE_HOST} in 
         *-*-cygwin* )
@@ -660,25 +674,40 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
             AC_TRY_COMPILE([],
                 [
                     #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
-                        #error "no pch support"
+                        There is no PCH support
                     #endif
                     #if (__GNUC__ < 3)
-                        #error "no pch support"
+                        There is no PCH support
                     #endif
                     #if (__GNUC__ == 3) && \
                        ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
-                       ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
+                       ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \
-                        #error "no pch support"
+                       ( defined(__INTEL_COMPILER) )
+                        There is no PCH support
                     #endif
                 ],
                 [
                     AC_MSG_RESULT([yes])
                     GCC_PCH=1
                 ],
+                [
+                    AC_TRY_COMPILE([],
+                        [
+                            #if !defined(__INTEL_COMPILER) || \
+                                (__INTEL_COMPILER < 800)
+                                There is no PCH support
+                            #endif
+                        ],
+                        [
+                            AC_MSG_RESULT([yes])
+                            ICC_PCH=1
+                        ],
                         [
                             AC_MSG_RESULT([no])
                         ])
-            if test $GCC_PCH = 1 ; then
+                ])
+            if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
+                USE_PCH=1
                 AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH
                 chmod +x bk-make-pch
             fi
@@ -686,6 +715,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
     fi
 
     AC_SUBST(GCC_PCH)
+    AC_SUBST(ICC_PCH)
 ])
 
 
@@ -716,6 +746,10 @@ AC_DEFUN([AC_BAKEFILE],
     AC_PREREQ(2.58)
 
     if test "x$BAKEFILE_HOST" = "x"; then
+               if test "x${host}" = "x" ; then
+                       AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
+               fi
+
         BAKEFILE_HOST="${host}"
     fi
 
@@ -731,7 +765,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_BAKEFILE_DEPS
     AC_BAKEFILE_RES_COMPILERS
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.1.9"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
    
     dnl includes autoconf_inc.m4:
     $1
@@ -1464,9 +1498,11 @@ header="${D}{2}"
 shift
 shift
 
-compiler=
+compiler=""
-headerfile=
+headerfile=""
+
 while test ${D}{#} -gt 0; do
+    add_to_cmdline=1
     case "${D}{1}" in
         -I* )
             incdir=\`echo ${D}{1} | sed -e 's/-I\\(.*\\)/\\1/g'\`
@@ -1474,13 +1510,19 @@ while test ${D}{#} -gt 0; do
                 headerfile="${D}{incdir}/${D}{header}"
             fi
         ;;
+        -use-pch|-use_pch )
+            shift
+            add_to_cmdline=0
+        ;;
     esac
+    if test ${D}add_to_cmdline = 1 ; then
         compiler="${D}{compiler} ${D}{1}"
+    fi
     shift
 done
 
 if test "x${D}{headerfile}" = "x" ; then
-    echo "error: can't find header ${D}{header} in include paths" >2
+    echo "error: can't find header ${D}{header} in include paths" >&2
 else
     if test -f ${D}{outfile} ; then
         rm -f ${D}{outfile}
@@ -1489,8 +1531,21 @@ else
     fi
     depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
     mkdir -p .deps
+    if test "x${GCC_PCH}" = "x1" ; then
         # can do this because gcc is >= 3.4:
         ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
+    elif test "x${ICC_PCH}" = "x1" ; then
+        filename=pch_gen-${D}${D}
+        file=${D}{filename}.c
+        dfile=${D}{filename}.d
+        cat > ${D}file <<EOT
+#include "${D}header"
+EOT
+        # using -MF icc complains about differing command lines in creation/use
+        ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+          sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
+          rm -f ${D}file ${D}dfile ${D}{filename}.o
+    fi
     exit ${D}{?}
 fi
 EOF

build/bakefiles/Bakefiles.bkgen

@@ -15,18 +15,17 @@
 
     Reasons why these formats are disabled (and so not in CVS):
 
-    dmars     - In beta testing, will be added when it stabilizes.
-    dmars_smake     - ditto
-    msevc4prj - ditto
     cbuilderx - Generated projects are too bad to be included in CVS. Please
                 *do not* enable this format until FIXMEs in .bkl files related
                 to cbuilderx are addressed. In particular, the project must
                 be placed into build/msw(?) directory and store object files
                 in its subdirectory and it must copy setup.h as others do.
     cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
+    dmars, dmars_smake, msevc4prj - These are generated at release time and
+                we don't want to clutter the source tree with these files.
     -->
 
-    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
+    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->

build/bakefiles/build_cfg.bkl

@@ -39,6 +39,7 @@
                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
+                @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)

build/bakefiles/common.bkl

@@ -130,7 +130,7 @@
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
     <set var="WXLIB_MEDIA">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+        <if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
     </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
@@ -149,6 +149,12 @@
     <set var="WXLIB_DBGRID">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
     </set>
+    <set var="WXLIB_AUI">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
+    </set>
+    <set var="WXLIB_RICHTEXT">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
+    </set>
 
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -306,6 +312,7 @@
         <if cond="FORMAT=='msvc'">
             <ldflags>$(LINK_TARGET_CPU)</ldflags>
         </if>
+        <include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>
     </template>
 
     <template id="anylib">
@@ -493,9 +500,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <!-- for both GUI and wxBase libs/samples: -->
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
-        <sys-lib>$(LIB_TIFF)</sys-lib>
-        <sys-lib>$(LIB_JPEG)</sys-lib>
-        <sys-lib>$(LIB_PNG)</sys-lib>
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
@@ -558,7 +562,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
 
     <!-- for GUI libs/samples: -->
-    <template id="wx_append_nomono" template="wx_append_base_nomono">
+    <template id="wx_append_nomono" template_append="wx_append_base_nomono">
+        <sys-lib>$(LIB_TIFF)</sys-lib>
+        <sys-lib>$(LIB_JPEG)</sys-lib>
+        <sys-lib>$(LIB_PNG)</sys-lib>
         <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>
 
@@ -580,10 +587,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
-                <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+                <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                 <precomp-headers-gen>
-                    $(WXTOPDIR)src/msw/dummy.cpp
+                    $(WXTOPDIR)src/common/dummy.cpp
                 </precomp-headers-gen>
             </if>
             <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>

build/bakefiles/config.bkl

@@ -79,7 +79,6 @@
 
     <if cond="FORMAT=='msvc'">
         <option name="TARGET_CPU">
-            <values>AMD64,IA64</values>
             <default-value>$(DOLLAR)(CPU)</default-value>
             <description>
 The target processor architecture must be specified when it is not X86.
@@ -87,6 +86,8 @@ This does not affect the compiler output, so you still need to make sure
 your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
+
+Accepted values: AMD64, IA64.
             </description>
         </option>
     </if>
@@ -180,6 +181,14 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_MEDIA">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build multimedia library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_XRC">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -188,6 +197,22 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_AUI">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxAUI library (USE_GUI must be 1)?
+        </description>
+    </option>
+
+    <option name="USE_RICHTEXT">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxRichTextCtrl library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -211,7 +236,7 @@ Acts according to BUILD by default.
     </set>
     <option name="USE_QA">
         <values>0,1</values>
-        <default-value>USE_QA_DEFAULT</default-value>
+        <default-value>$(USE_QA_DEFAULT)</default-value>
         <description>
             Build quality assurance classes library (USE_GUI must be 1)?
         </description>
@@ -295,7 +320,6 @@ to run the tests, include CppUnit library here.
     <!-- ================================================================== -->
 
     <if cond="FORMAT=='autoconf'">
-        <option name="REZ"/>
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
@@ -403,7 +427,10 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
+        <set var="USE_AUI">1</set>
+        <set var="USE_RICHTEXT">1</set>
         <set var="USE_HTML">1</set>
+        <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>

build/bakefiles/files.bkl

@@ -88,6 +88,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dir.cpp
     src/msw/dlmsw.cpp
     src/msw/mimetype.cpp
+    src/msw/power.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
@@ -119,6 +120,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/private.h
     wx/msw/regconf.h
     wx/msw/registry.h
+    wx/msw/seh.h
     wx/msw/stackwalk.h
     wx/msw/stdpaths.h
     wx/msw/winundef.h
@@ -237,6 +239,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/private.h
     wx/os2/stdpaths.h
     wx/os2/chkconf.h
+    wx/os2/wxrsc.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -290,6 +293,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
+    src/common/convauto.cpp
     src/common/datetime.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
@@ -319,6 +323,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/module.cpp
     src/common/mstream.cpp
     src/common/object.cpp
+    src/common/powercmn.cpp
     src/common/process.cpp
     src/common/regex.cpp
     src/common/stdpbase.cpp
@@ -362,6 +367,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
+    wx/convauto.h
     wx/containr.h
     wx/datetime.h
     wx/datstrm.h
@@ -415,6 +421,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mstream.h
     wx/object.h
     wx/platform.h
+    wx/power.h
     wx/process.h
     wx/ptr_scpd.h
     wx/recguard.h
@@ -548,6 +555,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
+    src/common/clrpickercmn.cpp
+    src/common/colourcmn.cpp
+    src/common/combocmn.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -566,8 +576,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/effects.cpp
     src/common/evtloopcmn.cpp
     src/common/fddlgcmn.cpp
+    src/common/filepickercmn.cpp
+    src/common/fontpickercmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
+    src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
@@ -595,6 +608,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/menucmn.cpp
     src/common/nbkbase.cpp
     src/common/paper.cpp
+    src/common/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
@@ -616,11 +630,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
+    src/generic/buttonbar.cpp
     src/generic/choicdgg.cpp
     src/generic/choicbkg.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/combog.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -649,6 +668,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/choicdlg.h
     wx/choice.h
     wx/cmndata.h
+    wx/combo.h
     wx/combobox.h
     wx/control.h
     wx/ctrlsub.h
@@ -668,13 +688,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
+    wx/generic/buttonbar.h
     wx/generic/choicdgg.h
+    wx/generic/clrpickerg.h
     wx/generic/colrdlgg.h
+    wx/generic/combo.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
     wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
     wx/generic/imaglist.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
@@ -721,6 +746,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/validate.h
     wx/valtext.h
     wx/window.h
+    wx/wupdlock.h
 
     wx/accel.h
     wx/access.h
@@ -732,6 +758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
+    wx/clrpicker.h
     wx/cmdproc.h
     wx/colordlg.h
     wx/colour.h
@@ -742,12 +769,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
+    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
+    wx/filepicker.h
+    wx/fontpicker.h
     wx/fmappriv.h
     wx/font.h
     wx/fontdlg.h
@@ -782,6 +812,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h
+    wx/pickerbase.h
     wx/popupwin.h
     wx/print.h
     wx/printdlg.h
@@ -833,7 +864,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
-    wx/unix/displayx11.h
 </set>
 
 
@@ -894,7 +924,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h
     wx/gtk/font.h
-    wx/gtk/gdiobj.h
     wx/gtk/icon.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
@@ -931,12 +960,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
+    src/gtk/clrpicker.cpp
     src/gtk/dialog.cpp
+    src/gtk/fontpicker.cpp
+    src/gtk/filepicker.cpp
+    src/gtk/dirdlg.cpp
     src/gtk/filedlg.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
+    src/gtk/gnome/gvfs.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -956,6 +990,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
+    src/gtk/treeentry_gtk.c
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
@@ -974,12 +1009,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/choice.h
     wx/gtk/combobox.h
     wx/gtk/control.h
+    wx/gtk/clrpicker.h
     wx/gtk/dialog.h
+    wx/gtk/dirdlg.h
     wx/gtk/filedlg.h
+    wx/gtk/fontpicker.h
+    wx/gtk/filepicker.h
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
+    wx/gtk/gnome/gvfs.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -1001,6 +1041,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/textctrl.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
+    wx/gtk/treeentry_gtk.h
 </set>
 
 
@@ -1061,7 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/dcscreen.h
     wx/gtk1/dnd.h
     wx/gtk1/font.h
-    wx/gtk1/gdiobj.h
     wx/gtk1/icon.h
     wx/gtk1/minifram.h
     wx/gtk1/pen.h
@@ -1292,7 +1332,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/font.h
     wx/motif/frame.h
     wx/motif/gauge.h
-    wx/motif/gdiobj.h
     wx/motif/icon.h
     wx/motif/listbox.h
     wx/motif/mdi.h
@@ -1346,7 +1385,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/gdiobj.cpp
     src/x11/gsockx11.cpp
     src/x11/icon.cpp
-    src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1365,6 +1403,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
+    wx/x11/chkconf.h
     wx/x11/clipbrd.h
     wx/x11/colour.h
     wx/x11/cursor.h
@@ -1378,7 +1417,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/dcscreen.h
     wx/x11/dnd.h
     wx/x11/font.h
-    wx/x11/gdiobj.h
     wx/x11/icon.h
     wx/x11/minifram.h
     wx/x11/palette.h
@@ -1474,6 +1512,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/checkbox.cpp
     src/msw/choice.cpp
     src/msw/colordlg.cpp
+    src/msw/combo.cpp
     src/msw/combobox.cpp
     src/msw/control.cpp
     src/msw/dialog.cpp
@@ -1513,6 +1552,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/fontpickerg.h
+    wx/generic/filepickerg.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -1525,6 +1567,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/clipbrd.h
     wx/msw/colordlg.h
     wx/msw/colour.h
+    wx/msw/combo.h
     wx/msw/combobox.h
     wx/msw/control.h
     wx/msw/cursor.h
@@ -1544,7 +1587,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/frame.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
-    wx/msw/gdiobj.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
@@ -1586,7 +1628,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/stattext.h
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
-    wx/msw/tbarmsw.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
     wx/msw/timer.h
@@ -1640,7 +1681,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/checklst.h
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
-    wx/msw/helpbest.h
     wx/msw/ole/automtn.h
     wx/msw/ole/uuid.h
 </set>
@@ -1649,6 +1689,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="WINCE_SRC" hints="files">
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/checklst.cpp
     src/msw/wince/choicece.cpp
@@ -1662,6 +1703,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
     wx/generic/fontdlgg.h
     wx/msw/wince/checklst.h
     wx/msw/wince/choicece.h
@@ -1723,7 +1765,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcscreen.h
     wx/mgl/font.h
     wx/mgl/fontutil.h
-    wx/mgl/gdiobj.h
     wx/mgl/icon.h
     wx/mgl/palette.h
     wx/mgl/pen.h
@@ -1752,7 +1793,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
-    src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     <!-- OS/2 specific files: -->
@@ -1778,7 +1818,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/dcprint.cpp
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
-    src/os2/display.cpp
     src/os2/dnd.cpp
     src/os2/evtloop.cpp
     src/os2/filedlg.cpp
@@ -1860,7 +1899,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/dcprint.h
     wx/os2/dcscreen.h
     wx/os2/dialog.h
-    wx/os2/display.h
     wx/os2/dnd.h
     wx/os2/filedlg.h
     wx/os2/font.h
@@ -1868,7 +1906,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/frame.h
     wx/os2/gauge.h
     wx/os2/gdiimage.h
-    wx/os2/gdiobj.h
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
@@ -1992,7 +2029,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/notebmac.cpp
     src/mac/carbon/palette.cpp
     src/mac/carbon/pen.cpp
-    src/mac/carbon/pnghand.cpp
     src/mac/carbon/printdlg.cpp
     src/mac/carbon/printmac.cpp
     src/mac/carbon/radiobox.cpp
@@ -2056,7 +2092,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
-    wx/mac/display.h
     wx/mac/dnd.h
     wx/mac/evtloop.h
     wx/mac/filedlg.h
@@ -2064,7 +2099,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/fontdlg.h
     wx/mac/frame.h
     wx/mac/gauge.h
-    wx/mac/gdiobj.h
     wx/mac/glcanvas.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
@@ -2144,7 +2178,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/dcscreen.h
     wx/mac/carbon/dialog.h
     wx/mac/carbon/dirdlg.h
-    wx/mac/carbon/display.h
     wx/mac/carbon/dnd.h
     wx/mac/carbon/evtloop.h
     wx/mac/carbon/filedlg.h
@@ -2152,7 +2185,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/fontdlg.h
     wx/mac/carbon/frame.h
     wx/mac/carbon/gauge.h
-    wx/mac/carbon/gdiobj.h
     wx/mac/carbon/gsockmac.h
     wx/mac/carbon/helpxxxx.h
     wx/mac/carbon/icon.h
@@ -2256,6 +2288,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
+    src/cocoa/dirdlg.mm
     src/cocoa/display.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
@@ -2301,7 +2334,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/accel.cpp
     src/generic/caret.cpp
     src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
@@ -2350,14 +2382,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
-    wx/cocoa/display.h
+    wx/cocoa/dirdlg.h
     wx/cocoa/drawer.h
     wx/cocoa/filedlg.h
     wx/cocoa/font.h
     wx/cocoa/fontdlg.h
     wx/cocoa/frame.h
     wx/cocoa/gauge.h
-    wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
     wx/cocoa/log.h
@@ -2386,7 +2417,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
-    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
@@ -2453,6 +2483,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
     src/univ/textctrl.cpp
+    src/univ/tglbtn.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
@@ -2512,31 +2543,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">
+    src/common/datavcmn.cpp
     src/generic/calctrl.cpp
+    src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
+    src/generic/hyperlink.cpp
     src/generic/laywin.cpp
+    src/generic/odcombo.cpp
     src/generic/propdlg.cpp
     src/generic/sashwin.cpp
     src/generic/splash.cpp
     src/generic/tipdlg.cpp
     src/generic/wizard.cpp
-    src/richtext/richtextctrl.cpp
-    src/richtext/richtextbuffer.cpp
-    src/richtext/richtextstyles.cpp
-    src/richtext/richtextxml.cpp
-    src/richtext/richtexthtml.cpp
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
+    wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/generic/calctrl.h
     wx/generic/datectrl.h
+    wx/generic/dataview.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
@@ -2547,8 +2579,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splash.h
     wx/generic/wizard.h
     wx/grid.h
+    wx/hyperlink.h
     wx/joystick.h
     wx/laywin.h
+    wx/odcombo.h
     wx/propdlg.h
     wx/sashwin.h
     wx/sound.h
@@ -2557,14 +2591,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tipdlg.h
     wx/wave.h
     wx/wizard.h
-    wx/richtext/richtextctrl.h
-    wx/richtext/richtextbuffer.h
-    wx/richtext/richtextstyles.h
-    wx/richtext/richtextxml.h
 </set>
 
 <set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
     wx/datectrl.h
+    wx/dataview.h
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
@@ -2640,6 +2671,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_GTK_SRC" hints="files">
     src/gtk/taskbar.cpp
+    src/gtk/dataview.cpp
     src/gtk/eggtrayicon.c
 </set>
 <set var="ADVANCED_GTK1_SRC" hints="files">
@@ -2658,7 +2690,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_MSW_SRC" hints="files">
-    src/msw/mediactrl.cpp
+    src/msw/mediactrl_am.cpp
+    src/msw/mediactrl_wmp10.cpp
     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
@@ -2760,6 +2793,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h
+    wx/msw/helpbest.h
 </set>
 
 
@@ -2777,20 +2811,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_chckl.cpp
     src/xrc/xh_choic.cpp
     src/xrc/xh_choicbk.cpp
+    src/xrc/xh_clrpicker.cpp
     src/xrc/xh_combo.cpp
     src/xrc/xh_datectrl.cpp
+    src/xrc/xh_dirpicker.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
     src/xrc/xh_mdi.cpp
+    src/xrc/xh_filepicker.cpp
+    src/xrc/xh_fontpicker.cpp
     src/xrc/xh_gauge.cpp
     src/xrc/xh_gdctl.cpp
     src/xrc/xh_grid.cpp
     src/xrc/xh_html.cpp
+    src/xrc/xh_hyperlink.cpp
     src/xrc/xh_listb.cpp
     src/xrc/xh_listbk.cpp
     src/xrc/xh_listc.cpp
     src/xrc/xh_menu.cpp
     src/xrc/xh_notbk.cpp
+    src/xrc/xh_odcombo.cpp
     src/xrc/xh_panel.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
@@ -2825,20 +2865,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_chckl.h
     wx/xrc/xh_choic.h
     wx/xrc/xh_choicbk.h
+    wx/xrc/xh_clrpicker.h
     wx/xrc/xh_combo.h
     wx/xrc/xh_datectrl.h
+    wx/xrc/xh_dirpicker.h
     wx/xrc/xh_dlg.h
+    wx/xrc/xh_filepicker.h
+    wx/xrc/xh_fontpicker.h
     wx/xrc/xh_frame.h
     wx/xrc/xh_mdi.h
     wx/xrc/xh_gauge.h
     wx/xrc/xh_gdctl.h
     wx/xrc/xh_grid.h
     wx/xrc/xh_html.h
+    wx/xrc/xh_hyperlink.h
     wx/xrc/xh_listb.h
     wx/xrc/xh_listbk.h
     wx/xrc/xh_listc.h
     wx/xrc/xh_menu.h
     wx/xrc/xh_notbk.h
+    wx/xrc/xh_odcombo.h
     wx/xrc/xh_panel.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
@@ -2940,6 +2986,44 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/sound_sdl.cpp
 </set>
 
+<!-- ====================================================================== -->
+<!--                                  wxAUI                                 -->
+<!-- ====================================================================== -->
+
+<set var="AUI_SRC" hints="files">
+    src/aui/framemanager.cpp
+    src/aui/dockart.cpp
+    src/aui/floatpane.cpp
+    src/aui/auibook.cpp
+    src/aui/tabmdi.cpp
+</set>
+<set var="AUI_HDR" hints="files">
+    wx/aui/framemanager.h
+    wx/aui/dockart.h
+    wx/aui/floatpane.h
+    wx/aui/auibook.h
+    wx/aui/tabmdi.h
+    wx/aui/aui.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                                  wxRichTextCtrl                        -->
+<!-- ====================================================================== -->
+
+<set var="RICHTEXT_SRC" hints="files">
+    src/richtext/richtextctrl.cpp
+    src/richtext/richtextbuffer.cpp
+    src/richtext/richtextstyles.cpp
+    src/richtext/richtextxml.cpp
+    src/richtext/richtexthtml.cpp
+</set>
+<set var="RICHTEXT_HDR" hints="files">
+    wx/richtext/richtextctrl.h
+    wx/richtext/richtextbuffer.h
+    wx/richtext/richtextstyles.h
+    wx/richtext/richtextxml.h
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -3002,6 +3086,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
+        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">
@@ -3169,7 +3254,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
         </if>
     </set>
 

build/bakefiles/formats/wx24dsp.bkl

@@ -8,7 +8,7 @@
     <include file="presets/fake.bkl"/>
 
     <set var="ALL_SOURCES" eval="0">
-        $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
+        $(MONOLIB_SRC) src/common/dummy.cpp $(OPENGL_SRC)
     </set>
     
     <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>

build/bakefiles/formats/wx24dsp.empy

@@ -330,7 +330,7 @@ SOURCE="This project is deprecated, please see install.txt"
 # Begin Source File
 
 SOURCE=.\@src[4:].replace('/','\\')
-@[if src=='src/msw/dummy.cpp']@
+@[if src=='src/common/dummy.cpp']@
 # ADD CPP /Yc"wx/wxprec.h"
 @[end if]@
 @[if src.endswith('.c')]@

build/bakefiles/make_dist.mk

@@ -14,6 +14,7 @@ GENDIR   = $(WXDIR)/src/generic
 COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
+AUIDIR =   $(WXDIR)/src/aui
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
@@ -61,6 +62,7 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
 
 DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
 DISTDIR=./_dist_dir/$(DISTDIRNAME)
+BASEDISTDIR=./_dist_dir/wxBase-$(WX_VERSION)
 
 ########################## Tools ###############################
 
@@ -157,6 +159,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/generic
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
+	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
@@ -166,6 +169,7 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
+	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
@@ -179,6 +183,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
 	mkdir $(DISTDIR)/src/richtext
+	mkdir $(DISTDIR)/src/aui
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
@@ -196,6 +201,7 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
 	$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
 	$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
+	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
 	$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
@@ -206,7 +212,7 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
 	$(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff
 
-BASE_DIST: ALL_DIST
+BASE_DIST: ALL_DIST INTL_DIST
 	# make --disable-gui the default
 	rm $(DISTDIR)/configure.in
 	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
@@ -222,6 +228,7 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
+	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/mac
 	mkdir $(DISTDIR)/include/wx/mac/carbon
 	mkdir $(DISTDIR)/include/wx/mac/corefoundation
@@ -275,6 +282,8 @@ BASE_DIST: ALL_DIST
 	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
 	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
 
+	mv $(DISTDIR) $(BASEDISTDIR)
+
 GTK_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
 	$(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
@@ -386,7 +395,6 @@ COCOA_DIST: ALL_GUI_DIST
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_DIST: UNIV_DIST
-	$(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/include/wx/msw/wince
 	$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -406,7 +414,6 @@ MSW_DIST: UNIV_DIST
 	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
-	$(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/include/wx/msw/wince
@@ -468,9 +475,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	$(CP_P) $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
-	$(CP_P) $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
-	$(CP_P) $(DEMODIR)/forty/*.bmp $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty
@@ -512,163 +517,34 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 
-	mkdir $(DISTDIR)/samples/artprov
+	# copy files common to all samples in a general way
-	$(CP_P) $(SAMPDIR)/artprov/Makefile.in $(DISTDIR)/samples/artprov
+	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
-	$(CP_P) $(SAMPDIR)/artprov/makefile.unx $(DISTDIR)/samples/artprov
+		    -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
-	$(CP_P) $(SAMPDIR)/artprov/*.cpp $(DISTDIR)/samples/artprov
+	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
-	$(CP_P) $(SAMPDIR)/artprov/*.h $(DISTDIR)/samples/artprov
+	    mkdir -p $$t; \
-	$(CP_P) $(SAMPDIR)/artprov/*.xpm $(DISTDIR)/samples/artprov
+	    $(CP_P) $$s/Makefile.in \
+		    `find $$s -maxdepth 1 -name 'makefile.*' -o -name descrip.mms -o \
+				-name '*.cpp' -o -name '*.h' -o \
+				-name '*.bmp' -o -name '*.ico' -o -name '*.png' -o \
+				-name '*.rc' -o -name '*.xpm'` $$t; \
+	    i=""; \
+	    if [ -d $$s/bitmaps ]; then i="bitmaps"; fi; \
+	    if [ -d $$s/icons ]; then i="icons"; fi; \
+	    if [ -n "$$i" ]; then \
+		mkdir $$t/$$i; \
+		cp `find $$s/$$i -name '*.bmp' -o -name '*.xpm'` $$t/$$i; \
+	    fi; \
+	done
 
-	mkdir $(DISTDIR)/samples/calendar
+	# copy the rest, not covered by the above loop
-	$(CP_P) $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
-	$(CP_P) $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
-	$(CP_P) $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
-
-	mkdir $(DISTDIR)/samples/caret
-	$(CP_P) $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
-	$(CP_P) $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
-	$(CP_P) $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
-	$(CP_P) $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
-
-	mkdir $(DISTDIR)/samples/checklst
-	$(CP_P) $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
-	$(CP_P) $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
-	$(CP_P) $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
-	$(CP_P) $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
-	$(CP_P) $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
-
-	mkdir $(DISTDIR)/samples/config
-	$(CP_P) $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
-	$(CP_P) $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
-	$(CP_P) $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
-
-	mkdir $(DISTDIR)/samples/console
-	$(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
-	$(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
-	$(CP_P) $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
 	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
-	mkdir $(DISTDIR)/samples/controls
+	$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
-	mkdir $(DISTDIR)/samples/controls/icons
-	$(CP_P) $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
-	$(CP_P) $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
 
-	mkdir $(DISTDIR)/samples/db
+	$(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
-	$(CP_P) $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
-	$(CP_P) $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
-	$(CP_P) $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
-	$(CP_P) $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
 
-	mkdir $(DISTDIR)/samples/debugrpt
-	$(CP_P) $(SAMPDIR)/debugrpt/Makefile.in $(DISTDIR)/samples/debugrpt
-	$(CP_P) $(SAMPDIR)/debugrpt/*.cpp $(DISTDIR)/samples/debugrpt
-
-	mkdir $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
-	$(CP_P) $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
-
-	mkdir $(DISTDIR)/samples/dialup
-	$(CP_P) $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
-	$(CP_P) $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
-	$(CP_P) $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
-
-	mkdir $(DISTDIR)/samples/display
-	$(CP_P) $(SAMPDIR)/display/Makefile.in $(DISTDIR)/samples/display
-	$(CP_P) $(SAMPDIR)/display/*.cpp $(DISTDIR)/samples/display
-
-	mkdir $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
-	$(CP_P) $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
-
-	mkdir $(DISTDIR)/samples/docview
-	$(CP_P) $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
-	$(CP_P) $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
-	$(CP_P) $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
-	$(CP_P) $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
-	$(CP_P) $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
-
-	mkdir $(DISTDIR)/samples/docvwmdi
-	$(CP_P) $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
-	$(CP_P) $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
-	$(CP_P) $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
-	$(CP_P) $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
-
-	mkdir $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/Makefile.in $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/makefile.unx $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag
-	$(CP_P) $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag
-
-	mkdir $(DISTDIR)/samples/drawing
-	$(CP_P) $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
-	$(CP_P) $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
-	$(CP_P) $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
-	$(CP_P) $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
-	$(CP_P) $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing
-
-	mkdir $(DISTDIR)/samples/dynamic
-	$(CP_P) $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
-	$(CP_P) $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
-	$(CP_P) $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
-	$(CP_P) $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
-
-	mkdir $(DISTDIR)/samples/erase
-	$(CP_P) $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
-	$(CP_P) $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
-	$(CP_P) $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
-	$(CP_P) $(SAMPDIR)/erase/*.xml $(DISTDIR)/samples/erase
-	$(CP_P) $(SAMPDIR)/erase/*.xpm $(DISTDIR)/samples/erase
-
-	mkdir $(DISTDIR)/samples/event
-	$(CP_P) $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
-	$(CP_P) $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
-	$(CP_P) $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
-
-	mkdir $(DISTDIR)/samples/except
-	$(CP_P) $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except
-	$(CP_P) $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except
-
-	mkdir $(DISTDIR)/samples/exec
-	$(CP_P) $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
-	$(CP_P) $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
-	$(CP_P) $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
-
-	mkdir $(DISTDIR)/samples/font
-	$(CP_P) $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
-	$(CP_P) $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
-	$(CP_P) $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
-
-	mkdir $(DISTDIR)/samples/grid
-	$(CP_P) $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
-	$(CP_P) $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
-	$(CP_P) $(SAMPDIR)/grid/*.cpp $(SAMPDIR)/grid/*.h $(DISTDIR)/samples/grid
-
-	mkdir $(DISTDIR)/samples/help
 	mkdir $(DISTDIR)/samples/help/doc
-	$(CP_P) $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
+	$(CP_P) $(SAMPDIR)/help/*.h?? $(DISTDIR)/samples/help
-	$(CP_P) $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help
-	$(CP_P) $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help
-	$(CP_P) $(SAMPDIR)/help/*.h* $(DISTDIR)/samples/help
-	$(CP_P) $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
-	$(CP_P) $(SAMPDIR)/help/*.bmp $(DISTDIR)/samples/help
 	$(CP_P) $(SAMPDIR)/help/*.gif $(DISTDIR)/samples/help
 	$(CP_P) $(SAMPDIR)/help/cshelp.txt $(DISTDIR)/samples/help
 	$(CP_P) $(SAMPDIR)/help/*.chm $(DISTDIR)/samples/help
@@ -676,364 +552,47 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/help/doc.zip $(DISTDIR)/samples/help
 	$(CP_P) $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
 
-	mkdir $(DISTDIR)/samples/htlbox
-	$(CP_P) $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox
-	$(CP_P) $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox
-	$(CP_P) $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox
-	$(CP_P) $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox
-
-	mkdir $(DISTDIR)/samples/html
-	$(CP_P) $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
-	mkdir $(DISTDIR)/samples/html/about
-	$(CP_P) $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
-	$(CP_P) $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
 	mkdir $(DISTDIR)/samples/html/about/data
 	$(CP_P) $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
 	$(CP_P) $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
-	mkdir $(DISTDIR)/samples/html/help
-	$(CP_P) $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
-	$(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
 	mkdir $(DISTDIR)/samples/html/help/helpfiles
 	$(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
-	mkdir $(DISTDIR)/samples/html/helpview
-	$(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
-	$(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
 	$(CP_P) $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
-	mkdir $(DISTDIR)/samples/html/printing
-	$(CP_P) $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-	$(CP_P) $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
 	$(CP_P) $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
 	$(CP_P) $(SAMPDIR)/html/printing/*.gif $(DISTDIR)/samples/html/printing
-	$(CP_P) $(SAMPDIR)/html/printing/*.ico $(DISTDIR)/samples/html/printing
-	mkdir $(DISTDIR)/samples/html/test
-	$(CP_P) $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
-	$(CP_P) $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
-	$(CP_P) $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
-	$(CP_P) $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
 	$(CP_P) $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test
 	$(CP_P) $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
 	$(CP_P) $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
-	mkdir $(DISTDIR)/samples/html/virtual
-	$(CP_P) $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
-	$(CP_P) $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
 	$(CP_P) $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
-	mkdir $(DISTDIR)/samples/html/widget
-	$(CP_P) $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
-	$(CP_P) $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
 	$(CP_P) $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
-	mkdir $(DISTDIR)/samples/html/zip
-	$(CP_P) $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
-	$(CP_P) $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
 	$(CP_P) $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
 	$(CP_P) $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
 
-	mkdir $(DISTDIR)/samples/image
-	$(CP_P) $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
-	$(CP_P) $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
-	$(CP_P) $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
-	$(CP_P) $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image
 	$(CP_P) $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image
 	$(CP_P) $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
-	$(CP_P) $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
 
-	mkdir $(DISTDIR)/samples/internat
+	$(CP_P) $(SAMPDIR)/internat/readme.txt $(DISTDIR)/samples/internat
-	$(CP_P) $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
-	$(CP_P) $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
-	$(CP_P) $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
-	$(CP_P) $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
-	$(CP_P) $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
 	for f in `(cd $(SAMPDIR); find internat -name '*.[mp]o' -print)`; do \
 	    mkdir -p $(DISTDIR)/samples/`dirname $$f`;  \
 	    $(CP_P) $(SAMPDIR)/$$f $(DISTDIR)/samples/$$f; \
 	done
 
-	mkdir $(DISTDIR)/samples/ipc
-	$(CP_P) $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
-	$(CP_P) $(SAMPDIR)/ipc/makefile.unx $(DISTDIR)/samples/ipc
-	$(CP_P) $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
-	$(CP_P) $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
-	$(CP_P) $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
-
-	mkdir $(DISTDIR)/samples/joytest
-	$(CP_P) $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
-	$(CP_P) $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
-	$(CP_P) $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
-	$(CP_P) $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
 	$(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
 
-	mkdir $(DISTDIR)/samples/keyboard
-	$(CP_P) $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard
-	$(CP_P) $(SAMPDIR)/keyboard/*.cpp $(DISTDIR)/samples/keyboard
-
-	mkdir $(DISTDIR)/samples/layout
-	$(CP_P) $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
-	$(CP_P) $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
-	$(CP_P) $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
-	$(CP_P) $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
-
-	mkdir $(DISTDIR)/samples/listbox
-	$(CP_P) $(SAMPDIR)/listbox/Makefile.in $(DISTDIR)/samples/listbox
-	$(CP_P) $(SAMPDIR)/listbox/*.cpp $(DISTDIR)/samples/listbox
-
-	mkdir $(DISTDIR)/samples/listctrl
-	mkdir $(DISTDIR)/samples/listctrl/bitmaps
-	$(CP_P) $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
-	$(CP_P) $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl
-	$(CP_P) $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
-	$(CP_P) $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
-	$(CP_P) $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-	$(CP_P) $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
-
-	mkdir $(DISTDIR)/samples/mediaplayer
-	$(CP_P) $(SAMPDIR)/mediaplayer/Makefile.in $(DISTDIR)/samples/mediaplayer
-	$(CP_P) $(SAMPDIR)/mediaplayer/*.cpp $(DISTDIR)/samples/mediaplayer
-
-	mkdir $(DISTDIR)/samples/mdi
-	mkdir $(DISTDIR)/samples/mdi/bitmaps
-	$(CP_P) $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
-	$(CP_P) $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi
-	$(CP_P) $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
-	$(CP_P) $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
-	$(CP_P) $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
-	$(CP_P) $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
-
-	mkdir $(DISTDIR)/samples/memcheck
-	$(CP_P) $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck
-	$(CP_P) $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck
-	$(CP_P) $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck
-	$(CP_P) $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck
-
-	mkdir $(DISTDIR)/samples/menu
-	$(CP_P) $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
-	$(CP_P) $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
-	$(CP_P) $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu
-	$(CP_P) $(SAMPDIR)/menu/*.xpm $(DISTDIR)/samples/menu
-
-	mkdir $(DISTDIR)/samples/minifram
-	mkdir $(DISTDIR)/samples/minifram/bitmaps
-	$(CP_P) $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
-	$(CP_P) $(SAMPDIR)/minifram/makefile.unx $(DISTDIR)/samples/minifram
-	$(CP_P) $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
-	$(CP_P) $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
-	$(CP_P) $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-	$(CP_P) $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
-
-	mkdir $(DISTDIR)/samples/minimal
-	$(CP_P) $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
-	$(CP_P) $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
-	$(CP_P) $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
-	$(CP_P) $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
-
-	mkdir $(DISTDIR)/samples/mobile
-	$(CP_P) $(SAMPDIR)/mobile/Makefile.in $(DISTDIR)/samples/mobile
-	mkdir $(DISTDIR)/samples/mobile/wxedit
-	$(CP_P) $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
-	$(CP_P) $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
-	$(CP_P) $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
-	mkdir $(DISTDIR)/samples/mobile/styles
-	$(CP_P) $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles
-	$(CP_P) $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
-	$(CP_P) $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	$(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
 
-	mkdir $(DISTDIR)/samples/multimon
+	$(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon
-	$(CP_P) $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon
-	$(CP_P) $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon
-
-	mkdir $(DISTDIR)/samples/notebook
-	$(CP_P) $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
-	$(CP_P) $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
-	$(CP_P) $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
-	$(CP_P) $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
-
-	mkdir $(DISTDIR)/samples/opengl
-	$(CP_P) $(SAMPDIR)/opengl/Makefile.in $(DISTDIR)/samples/opengl
-	mkdir $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/opengl/penguin/Makefile.in $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/opengl/penguin/makefile.unx $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin
-	$(CP_P) $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin
 	$(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
-	mkdir $(DISTDIR)/samples/opengl/cube
-	$(CP_P) $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube
-	$(CP_P) $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube
-	$(CP_P) $(SAMPDIR)/opengl/cube/*.cpp $(DISTDIR)/samples/opengl/cube
-	$(CP_P) $(SAMPDIR)/opengl/cube/*.h $(DISTDIR)/samples/opengl/cube
-	mkdir $(DISTDIR)/samples/opengl/isosurf
-	$(CP_P) $(SAMPDIR)/opengl/isosurf/Makefile.in $(DISTDIR)/samples/opengl/isosurf
-	$(CP_P) $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf
-	$(CP_P) $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf
-	$(CP_P) $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
 	$(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
 
-	mkdir $(DISTDIR)/samples/png
-	$(CP_P) $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
-	$(CP_P) $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
-	$(CP_P) $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
-	$(CP_P) $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
-	$(CP_P) $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
-
-	mkdir $(DISTDIR)/samples/popup
-	$(CP_P) $(SAMPDIR)/popup/Makefile.in $(DISTDIR)/samples/popup
-	$(CP_P) $(SAMPDIR)/popup/makefile.unx $(DISTDIR)/samples/popup
-	$(CP_P) $(SAMPDIR)/popup/*.cpp $(DISTDIR)/samples/popup
-
-	mkdir $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-	$(CP_P) $(SAMPDIR)/printing/*.rc $(DISTDIR)/samples/printing
-
-	mkdir $(DISTDIR)/samples/render
-	$(CP_P) $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render
-	$(CP_P) $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render
-	$(CP_P) $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render
-
-	mkdir $(DISTDIR)/samples/rotate
-	$(CP_P) $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
-	$(CP_P) $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
-	$(CP_P) $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	$(CP_P) $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
-
-	mkdir $(DISTDIR)/samples/richtext
-	mkdir $(DISTDIR)/samples/richtext/bitmaps
-	$(CP_P) $(SAMPDIR)/richtext/Makefile.in $(DISTDIR)/samples/richtext
-	$(CP_P) $(SAMPDIR)/richtext/*.cpp $(DISTDIR)/samples/richtext
-	$(CP_P) $(SAMPDIR)/richtext/bitmaps/*.xpm $(DISTDIR)/samples/richtext/bitmaps
 	$(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext
 	$(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext
 
-	mkdir $(DISTDIR)/samples/propsize
-	$(CP_P) $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
-	$(CP_P) $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize
-	$(CP_P) $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
-	$(CP_P) $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
-
-	mkdir $(DISTDIR)/samples/sashtest
-	$(CP_P) $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
-	$(CP_P) $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest
-	$(CP_P) $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
-	$(CP_P) $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
-
-	mkdir $(DISTDIR)/samples/scroll
-	$(CP_P) $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
-	$(CP_P) $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
-	$(CP_P) $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
-
-	mkdir $(DISTDIR)/samples/scrollsub
-	$(CP_P) $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
-	$(CP_P) $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
-	$(CP_P) $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
-
-	mkdir $(DISTDIR)/samples/shaped
-	$(CP_P) $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
-	$(CP_P) $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
-	$(CP_P) $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
-	$(CP_P) $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
-
-	mkdir $(DISTDIR)/samples/sockets
-	$(CP_P) $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
-	$(CP_P) $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
-	$(CP_P) $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
-	$(CP_P) $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
-
-	mkdir $(DISTDIR)/samples/sound
-	$(CP_P) $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound
-	$(CP_P) $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound
 	$(CP_P) $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound
 
-	mkdir $(DISTDIR)/samples/splash
-	$(CP_P) $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash
-	$(CP_P) $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash
-	$(CP_P) $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash
 	$(CP_P) $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash
-	$(CP_P) $(SAMPDIR)/splash/*.xpm $(DISTDIR)/samples/splash
 
-	mkdir $(DISTDIR)/samples/splitter
-	$(CP_P) $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
-	$(CP_P) $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
-	$(CP_P) $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
-
-	mkdir $(DISTDIR)/samples/statbar
-	$(CP_P) $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
-	$(CP_P) $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
-	$(CP_P) $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar
-	$(CP_P) $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar
-
-	mkdir $(DISTDIR)/samples/taskbar
-	$(CP_P) $(SAMPDIR)/taskbar/Makefile.in $(DISTDIR)/samples/taskbar
-	$(CP_P) $(SAMPDIR)/taskbar/*.cpp $(DISTDIR)/samples/taskbar
-	$(CP_P) $(SAMPDIR)/taskbar/*.h $(DISTDIR)/samples/taskbar
-	$(CP_P) $(SAMPDIR)/taskbar/*.xpm $(DISTDIR)/samples/taskbar
-
-	mkdir $(DISTDIR)/samples/text
-	$(CP_P) $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
-	$(CP_P) $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
-	$(CP_P) $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
-	$(CP_P) $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
-
-	mkdir $(DISTDIR)/samples/thread
-	$(CP_P) $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
-	$(CP_P) $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
-	$(CP_P) $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
-
-	mkdir $(DISTDIR)/samples/toolbar
-	$(CP_P) $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
-	$(CP_P) $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar
-	$(CP_P) $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-	$(CP_P) $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-	mkdir $(DISTDIR)/samples/toolbar/bitmaps
-	$(CP_P) $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
-
-	mkdir $(DISTDIR)/samples/treectrl
-	$(CP_P) $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
-	$(CP_P) $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl
-	$(CP_P) $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
-	$(CP_P) $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
-	$(CP_P) $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
-
-	mkdir $(DISTDIR)/samples/typetest
-	$(CP_P) $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
-	$(CP_P) $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest
-	$(CP_P) $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
-	$(CP_P) $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
-	$(CP_P) $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
-
-	mkdir $(DISTDIR)/samples/validate
-	$(CP_P) $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
-	$(CP_P) $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate
-	$(CP_P) $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
-	$(CP_P) $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
-	$(CP_P) $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
-
-	mkdir $(DISTDIR)/samples/vscroll
-	$(CP_P) $(SAMPDIR)/vscroll/Makefile.in $(DISTDIR)/samples/vscroll
-	$(CP_P) $(SAMPDIR)/vscroll/*.cpp $(DISTDIR)/samples/vscroll
-
-	mkdir $(DISTDIR)/samples/wizard
-	$(CP_P) $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
-	$(CP_P) $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard
-	$(CP_P) $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
-	$(CP_P) $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
-
-	mkdir $(DISTDIR)/samples/widgets
-	mkdir $(DISTDIR)/samples/widgets/icons
-	$(CP_P) $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets
-	$(CP_P) $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets
-	$(CP_P) $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets
-	$(CP_P) $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets
-	$(CP_P) $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons
-
-	mkdir $(DISTDIR)/samples/xrc
 	mkdir $(DISTDIR)/samples/xrc/rc
-	$(CP_P) $(SAMPDIR)/xrc/Makefile.in $(DISTDIR)/samples/xrc
-	$(CP_P) $(SAMPDIR)/xrc/*.cpp $(DISTDIR)/samples/xrc
-	$(CP_P) $(SAMPDIR)/xrc/*.h $(DISTDIR)/samples/xrc
-	$(CP_P) $(SAMPDIR)/xrc/*.rc $(DISTDIR)/samples/xrc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
@@ -1253,8 +812,8 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
 			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
 			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-			   -o -name "*.bkl" -o -name "*.pro"  \
+			   -o -name "*.pro"  \
-			   -o -name "*.vpj" -o -name "*.sc"                      \
+			   -o -name "*.vpj"  \
 			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
 			\) -print0 | xargs -0 rm -rf
 

build/bakefiles/monolithic.bkl

@@ -5,7 +5,7 @@
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
             $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC)
+            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -29,6 +29,9 @@
         <define>wxUSE_BASE=1</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <if cond="FORMAT=='watcom'">
+            <set var="LIB_PAGESIZE" overwrite="1">8192</set>
+        </if>
     </lib>
 
 

build/bakefiles/multilib.bkl

@@ -81,8 +81,6 @@
         <define>WXMAKINGDLL_ADV</define>
         <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
-        <library>htmldll</library>
-        <library>xmldll</library>
         <library>coredll</library>
         <library>basedll</library>
         <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
@@ -102,7 +100,7 @@
     <!-- ================================================================= -->
 
     <dll id="mediadll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_MEDIA</define>
         <sources>$(MEDIA_SRC)</sources>
@@ -112,7 +110,7 @@
     </dll>
 
     <lib id="medialib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <sources>$(MEDIA_SRC)</sources>
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
@@ -265,4 +263,52 @@
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 
+    <!-- ================================================================ -->
+    <!--                            AUI                                   -->
+    <!-- ================================================================ -->
+
+    <dll id="auidll" template="wx_dll"
+         cond="SHARED=='1' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_AUI</define>
+        <sources>$(AUI_SRC)</sources>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="auilib" template="wx_lib"
+         cond="SHARED=='0' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <sources>$(AUI_SRC)</sources>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
+
+    <!-- ================================================================ -->
+    <!--                            RICHTEXT                              -->
+    <!-- ================================================================ -->
+
+    <dll id="richtextdll" template="wx_dll"
+         cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_RICHTEXT</define>
+        <sources>$(RICHTEXT_SRC)</sources>
+        <library>advdll</library>
+        <library>htmldll</library>
+        <library>xmldll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="richtextlib" template="wx_lib"
+         cond="SHARED=='0' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <sources>$(RICHTEXT_SRC)</sources>
+        <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
+    </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
+
 </makefile>

build/bakefiles/wx.bkl

@@ -61,20 +61,20 @@
             <depends>xmllib</depends>
 
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
             </command>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
             <depends>wxrc</depends>
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
             </command>
         </action>
 

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -235,6 +235,8 @@ options are:
 
     Option              Values              Description
     ------              ------              -------------
+    WX_MONOLITHIC       0(default),1        Set this to 1 if you built wx 
+                                            as a monolithic library
     WX_SHARED           0(default),1        Specify static or dynamic wx libs
     WX_UNICODE          0(defualt),1        Use ANSI or UNICODE wx libs
     WX_DEBUG            0,1(default)        Use release or debug wx libs

build/bakefiles/wxpresets/presets/wx.bkl

@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 <!--
-Presents for building wxWidgets applications.
+    Presets for building wxWidgets applications.
 
     FIXME: docs
 -->
@@ -10,6 +10,40 @@ FIXME: docs
 
 <makefile>
 
+    <!-- this variable identifies the version of the wx presets.
+         this is changed only when major changes to wxpresets take place. -->
+    <set var="WX_PRESETS_VERSION">3</set>
+
+    <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
+    <set var="LIB_LIST">base core net xml odbc xrc html adv media gl dbgrid qa</set>
+
+    <!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
+               (which is already in LIB_LIST) -->
+    <set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
+    <set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>
+
+    <!-- this is a temporary variable until there is non general    -->
+    <!-- function in bakefiles for returning native markup for      -->
+    <!-- reading envrionment variables                              -->
+    <set var="ENV_VAR">
+        <if cond="FORMAT=='watcom'">%</if>
+        <if cond="FORMAT!='watcom'"></if>
+    </set>
+
+
+    <!-- The directory where wxWidgets is installed: -->
+    <if cond="not isdefined('WX_DIR')">
+        <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
+        <option name="WX_DIR" category="path">
+            <default-value>$(WX_DIR_DEFAULT)</default-value>
+            <description>
+                The directory where wxWidgets library is installed
+            </description>
+        </option>
+    </if>
+
+
+
     <!-- this is just a wrapper that includes the real implementation: -->
 
     <set var="__wx_included_impl">0</set>

build/bakefiles/wxpresets/presets/wx_unix.bkl

@@ -30,6 +30,7 @@ Format-specific notes:
         <option name="WX_CXXFLAGS"/>
         <option name="WX_CPPFLAGS"/>
         <option name="WX_LIBS"/>
+        <option name="WX_RESCOMP"/>
     </if>
 
     <!-- ============================================================== -->
@@ -37,8 +38,9 @@ Format-specific notes:
     <!-- ============================================================== -->
 
     <if cond="FORMAT=='gnu'">
+        <set var="WX_CONFIG_DEFAULT" overwrite="0">wx-config</set>
         <option name="WX_CONFIG">
-            <default-value>wx-config</default-value>
+            <default-value>$(WX_CONFIG_DEFAULT)</default-value>
             <description>Location and arguments of wx-config script</description>
         </option>
         <option name="WX_CFLAGS">
@@ -53,9 +55,9 @@ Format-specific notes:
             <default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
             <description>C preprocessor flags to use with wxWidgets code</description>
         </option>
-        <option name="WX_LIBS">
+        <option name="WX_RESCOMP">
-            <default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
+            <default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
-            <description>wxWidgets libraries to link against</description>
+            <description>wxWidgets resource compiler and flags</description>
         </option>
 
         <!-- we need this but the trick used in default-values above
@@ -73,6 +75,25 @@ Format-specific notes:
         </error>
     </if>
 
+    <!--
+         We need to re-define the WINDRES resource compiler name to the resource compiler
+         returned by 'wx-config - -rescomp' since this option returns both the name of the
+         resource compiler to use (windres) and the flags required for that compiler.
+
+         This line typically does something *only* when the Makefile.in generated
+         using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
+         are not compiled at all).
+         Without this line, in fact, when compiling with MSYS on Windows, the - -include-dir
+         option which tells windres to look in wxWidgets\include folder would be missing and
+         then windres would fail to find the wxMSW resources.
+
+         NOTE: overwriting the WINDRES variable we add wxWidgets resource flags to
+               all targets which include this bakefile; this could be useless to those
+               targets which are not wx-based eventually present in that bakefile but
+               in any case it shouldn't do any harm.
+    -->
+    <set var="WINDRES">$(WX_RESCOMP)</set>
+
     <template id="wx-lib">
         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>
@@ -89,11 +110,27 @@ Format-specific notes:
         -->
     </template>
 
-    <!-- not used together with wx-config: -->
+    <!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
+                         in all your bakefiles !!
+    -->
     <define-tag name="wx-lib" rules="exe,dll,module">
-        <if cond="value=='base'">
+        <if cond="FORMAT=='autoconf' and value=='base'">
+            <!-- all wx-dependent libraries should have been already listed
+                 thus we can now add WX_LIBS to the linker line -->
             <ldlibs>$(WX_LIBS)</ldlibs>
         </if>
+        <if cond="FORMAT=='gnu' and value=='base'">
+            <!-- all wx libraries should have been already specified, thus
+                  $(__liblist) should contain the full list... -->
+            <set var="__liblist" append="1">base</set>
+            <ldlibs>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldlibs>
+        </if>
+        <if cond="FORMAT=='gnu' and value!='base'">
+            <set var="__liblist" append="1">$(value)</set>
+        </if>
+        <if cond="value not in ALLLIB_LIST.split()">
+            <error>Unknown wxWidgets library given in the wx-lib tag</error>
+        </if>
     </define-tag>
 
 </makefile>

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -42,15 +42,6 @@ FIXME: this template has (at least) the following bugs:
     <!--    is not constant, i.e. if it cannot be determined        -->
     <!--    by bakefile itself.                                     -->
 
-    <!-- this is a temporary variable until there is non general    -->
-    <!-- function in bakefiles for returning native markup for      -->
-    <!-- reading envrionment variables                              -->
-    <set var="ENV_VAR">
-        <if cond="FORMAT=='watcom'">%</if>
-        <if cond="FORMAT!='watcom'"></if>
-    </set>
-
-
     <!-- Presets for limited dmars make.exe format: -->
     <if cond="FORMAT=='dmars'">
         <set var="WX_UNICODE">0</set>
@@ -59,17 +50,6 @@ FIXME: this template has (at least) the following bugs:
     </if>
 
 
-    <!-- The directory where wxWidgets is installed: -->
-    <if cond="not isdefined('WX_DIR')">
-        <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
-        <option name="WX_DIR" category="path">
-            <default-value>$(WX_DIR_DEFAULT)</default-value>
-            <description>
-                The directory where wxWidgets library is installed
-            </description>
-        </option>
-    </if>
-
     <!--    This is a standard option that determines               -->
     <!--    whether the user wants to build this library as         -->
     <!--    a dll or as a static library.                           -->
@@ -121,6 +101,19 @@ FIXME: this template has (at least) the following bugs:
         </option>
     </if>
 
+    <if cond="not isdefined('WX_MONOLITHIC')">
+        <set var="WX_MONOLITHIC_DEFAULT" overwrite="0">0</set>
+        <option name="WX_MONOLITHIC">
+            <values>0,1</values>
+            <values-description>Multilib,Monolithic</values-description>
+            <default-value>$(WX_MONOLITHIC_DEFAULT)</default-value>
+            <description>
+                Use monolithic build of wxWidgets?
+            </description>
+        </option>
+    </if>
+
+
     <!--                     HELPER VARIABLES                       -->
     <!--                                                            -->
 
@@ -167,6 +160,100 @@ FIXME: this template has (at least) the following bugs:
     <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX)</set>
 
 
+    <!--    All the possible mixes for the wx library names          -->
+    <set var="WXLIB_BASE_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
+
+        <!--
+            the trick used to support monolithic builds is here: when the
+            <wx-lib>base</wx-lib> tag is found, and user selected
+            WX_MONOLITHIC=1, then the base library is translated to the
+            monolithic library
+        -->
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud</if>
+    </set>
+
+    <!--   Libraries whose name is prefixed with 'wxbase'            -->
+    <set var="WXLIB_NET_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_net</if>
+    </set>
+    <set var="WXLIB_XML_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_xml</if>
+    </set>
+    <set var="WXLIB_ODBC_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_odbc</if>
+    </set>
+
+    <!--   Libraries whose name is prefixed with 'wx' only          -->
+    <set var="WXLIB_CORE_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_core</if>
+    </set>
+    <set var="WXLIB_MEDIA_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_media</if>
+    </set>
+    <set var="WXLIB_XRC_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_xrc</if>
+    </set>
+    <set var="WXLIB_HTML_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_html</if>
+    </set>
+    <set var="WXLIB_ADV_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_adv</if>
+    </set>
+    <set var="WXLIB_QA_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_qa</if>
+    </set>
+    <set var="WXLIB_DBGRID_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_dbgrid</if>
+    </set>
+    <set var="WXLIB_GL_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_gl</if>
+    </set>
+
+
+
+
+
+
     <!--                        WX TEMPLATE                         -->
     <!--                                                            -->
     <!--                                                            -->
@@ -185,19 +272,32 @@ FIXME: this template has (at least) the following bugs:
     <!--    libraries required by the platform, the libraries       -->
     <!--    we want for our stuff, and the wxWindows libs.          -->
 
-
-
     <!-- this tag is used to include wx libraries: -->
     <define-tag name="wx-lib" rules="exe,dll,module">
-        <if cond="value=='base'">
+        <if cond="value=='base'"><sys-lib>$(WXLIB_BASE_NAME)</sys-lib></if>
-            <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
+        <if cond="value=='core'"><sys-lib>$(WXLIB_CORE_NAME)</sys-lib></if>
-        </if>
+
-        <if cond="value in ['net','xml', 'odbc']">
+        <if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
-            <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+        <if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
-        </if>
+        <if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
-        <if cond="value not in ['base','net', 'odbc', 'xml']">
+
+        <if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
+        <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
+        <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
+        <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
+        <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
+        <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
+        <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
+
+        <!-- wx-lib can be used also to link against contrib libraries
+             (which always have the same name, regardless of WX_MONOLITHIC value) -->
+        <if cond="value in CONTRIBLIB_LIST.split()">
             <sys-lib>wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
+
+        <if cond="value not in ALLLIB_LIST.split()">
+            <error>Unknown wxWidgets library given in the wx-lib tag</error>
+        </if>
     </define-tag>
 
     <!-- just a placeholder to mark the place where <wx-lib> will be placed,

build/bakefiles/wxwin.py

@@ -40,10 +40,10 @@ def mk_wxid(id):
 
 # All libs that are part of the main library (i.e. non-contrib):
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
-             'media', 'odbc', 'qa', 'dbgrid', 'xrc']
+             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext']
 # List of library names/ids for categories with different names:
 LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media', 'aui', 'richtext']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',

build/mgl/config.wat

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -73,9 +73,18 @@ 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/msw/.cvsignore

@@ -1,2 +1,5 @@
+.m*
 config.dmc
 makefile.dmc
+vc_mswhdll
+vc_mswuhdll

build/msw/config.bcc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -98,11 +98,26 @@ USE_GUI = 1
 USE_HTML = 1
 !endif
 
+# Build multimedia library (USE_GUI must be 1)? [0,1]
+!ifndef USE_MEDIA
+USE_MEDIA = 1
+!endif
+
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 !ifndef USE_XRC
 USE_XRC = 1
 !endif
 
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+!ifndef USE_AUI
+USE_AUI = 1
+!endif
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+!ifndef USE_RICHTEXT
+USE_RICHTEXT = 1
+!endif
+
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 USE_OPENGL = 0

build/msw/config.gcc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -64,9 +64,18 @@ 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/msw/config.vc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -50,7 +50,9 @@ BUILD = debug
 # This does not affect the compiler output, so you still need to make sure
 # your environment is set up appropriately with the correct compiler in the
 # PATH. Rather it affects some options passed to some of the common build
-# utilities such as the resource compiler and the linker. [AMD64,IA64]
+# utilities such as the resource compiler and the linker.
+# 
+# Accepted values: AMD64, IA64. 
 TARGET_CPU = $(CPU)
 
 # Should debugging info be included in the executables? The default value
@@ -75,9 +77,18 @@ 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/msw/config.wat

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -32,12 +32,15 @@ LDFLAGS =
 CPP = $(CC) -p
 
 # What type of library to build? [0,1]
+#   1 - DLL
 SHARED = 0
 
 # Build wxUniversal instead of native port? [0,1]
+#   1 - Universal
 WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
+#   1 - Unicode
 UNICODE = 0
 
 # Type of compiled binaries [debug,release]
@@ -53,17 +56,30 @@ DEBUG_INFO = 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/msw/wx.dsw

@@ -206,6 +206,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "aui"=wx_aui.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "richtext"=wx_richtext.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "gl"=wx_gl.dsp - Package Owner=<4>
 
 Package=<5>

build/msw/wx_adv.dsp

@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 
@@ -452,6 +452,16 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\common\datavcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\taskbarcmn.cpp
 # End Source File
 # End Group
@@ -523,12 +533,6 @@ SOURCE=..\..\src\msw\datectrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\joystick.cpp
 # End Source File
 # Begin Source File
@@ -612,6 +616,10 @@ SOURCE=..\..\src\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\datavgen.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\datectlg.cpp
 # End Source File
 # Begin Source File
@@ -632,10 +640,18 @@ SOURCE=..\..\src\generic\helpext.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\hyperlink.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\odcombo.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\propdlg.cpp
 # End Source File
 # Begin Source File
@@ -1109,6 +1125,10 @@ SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\datectrl.h
 # End Source File
 # Begin Source File
@@ -1157,6 +1177,10 @@ SOURCE=..\..\include\wx\calctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
 # Begin Source File
@@ -1173,6 +1197,10 @@ SOURCE=..\..\include\wx\grid.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\joystick.h
 # End Source File
 # Begin Source File
@@ -1181,26 +1209,14 @@ SOURCE=..\..\include\wx\laywin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\propdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\richtext\richtextbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextstyles.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextxml.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
@@ -1228,30 +1244,6 @@ SOURCE=..\..\include\wx\wave.h
 SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\richtext\richtextbuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\richtext\richtextctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\richtext\richtexthtml.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\richtext\richtextstyles.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\richtext\richtextxml.cpp
-# End Source File
-# End Group
 # End Target
 # End Project
 

build/msw/wx_base.dsp

@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
 
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"
 
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"
 
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"
 
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"
 
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"
 
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"
 
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"
 
@@ -472,6 +472,10 @@ SOURCE=..\..\src\common\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\convauto.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\datetime.cpp
 # End Source File
 # Begin Source File
@@ -484,6 +488,12 @@ SOURCE=..\..\src\common\dircmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\dynarray.cpp
 # End Source File
 # Begin Source File
@@ -601,6 +611,10 @@ SOURCE=..\..\src\common\object.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\powercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\process.cpp
 # End Source File
 # Begin Source File
@@ -717,12 +731,6 @@ SOURCE=..\..\src\msw\dlmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\main.cpp
 # End Source File
 # Begin Source File
@@ -735,6 +743,10 @@ SOURCE=..\..\src\msw\mslu.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\power.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\regconf.cpp
 # End Source File
 # Begin Source File
@@ -1307,6 +1319,18 @@ SOURCE=..\..\include\wx\msw\private.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\regconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\seh.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\stackwalk.h
 # End Source File
 # Begin Source File
@@ -1399,6 +1423,10 @@ SOURCE=..\..\include\wx\containr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\convauto.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\datetime.h
 # End Source File
 # Begin Source File
@@ -1599,6 +1627,10 @@ SOURCE=..\..\include\wx\platform.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\power.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\process.h
 # End Source File
 # Begin Source File

build/msw/wx_core.dsp

@@ -484,6 +484,10 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\clrpickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
@@ -492,6 +496,14 @@ SOURCE=..\..\src\common\cmndata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\combocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\containr.cpp
 # End Source File
 # Begin Source File
@@ -544,6 +556,12 @@ SOURCE=..\..\src\common\dseldlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\effects.cpp
 # End Source File
 # Begin Source File
@@ -560,6 +578,10 @@ SOURCE=..\..\src\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\filepickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fldlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -568,10 +590,18 @@ SOURCE=..\..\src\common\fontcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontenumcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fontmap.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontpickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -684,6 +714,10 @@ SOURCE=..\..\src\common\paper.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\pickerbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\popupcmn.cpp
 # End Source File
 # Begin Source File
@@ -1304,6 +1338,69 @@ SOURCE=..\..\src\msw\colour.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\combo.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\combobox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -1671,12 +1768,6 @@ SOURCE=..\..\src\msw\ole\droptgt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
@@ -4014,6 +4105,10 @@ SOURCE=..\..\src\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
@@ -4022,6 +4117,10 @@ SOURCE=..\..\src\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\clrpickerg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\colrdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -4085,6 +4184,10 @@ SOURCE=..\..\src\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\combog.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
@@ -4286,6 +4389,10 @@ SOURCE=..\..\src\generic\filedlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\filepickerg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\fontdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -4349,6 +4456,10 @@ SOURCE=..\..\src\generic\fontdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\fontpickerg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\imaglist.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -6802,6 +6913,69 @@ SOURCE=..\..\src\univ\textctrl.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\univ\tglbtn.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
@@ -7480,6 +7654,10 @@ SOURCE=..\..\include\wx\msw\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\combobox.h
 # End Source File
 # Begin Source File
@@ -7588,10 +7766,6 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gdiobj.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -7859,18 +8033,10 @@ SOURCE=..\..\include\wx\msw\rcdefs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\regconf.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\region.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\registry.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
@@ -7927,10 +8093,6 @@ SOURCE=..\..\include\wx\msw\tbar95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tbarmsw.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\textctrl.h
 # End Source File
 # Begin Source File
@@ -7979,6 +8141,14 @@ SOURCE=..\..\include\wx\generic\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
@@ -7987,10 +8157,22 @@ SOURCE=..\..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\clrpickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\datectrl.h
 # End Source File
 # Begin Source File
@@ -8019,10 +8201,18 @@ SOURCE=..\..\include\wx\generic\filedlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\filepickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\fontdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\fontpickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\grid.h
 # End Source File
 # Begin Source File
@@ -8367,6 +8557,14 @@ SOURCE=..\..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\aui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\auibook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
@@ -8387,10 +8585,6 @@ SOURCE=..\..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\busyinfo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\button.h
 # End Source File
 # Begin Source File
@@ -8427,6 +8621,10 @@ SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\clrpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
@@ -8443,6 +8641,10 @@ SOURCE=..\..\include\wx\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\combobox.h
 # End Source File
 # Begin Source File
@@ -8467,6 +8669,10 @@ SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
 # Begin Source File
@@ -8535,10 +8741,18 @@ SOURCE=..\..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dnd.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\dockart.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\docmdi.h
 # End Source File
 # Begin Source File
@@ -8571,6 +8785,14 @@ SOURCE=..\..\include\wx\filedlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\floatpane.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\fmappriv.h
 # End Source File
 # Begin Source File
@@ -8587,6 +8809,10 @@ SOURCE=..\..\include\wx\fontenum.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\fontpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\fontutil.h
 # End Source File
 # Begin Source File
@@ -8595,6 +8821,10 @@ SOURCE=..\..\include\wx\frame.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\framemanager.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\gauge.h
 # End Source File
 # Begin Source File
@@ -8647,6 +8877,10 @@ SOURCE=..\..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -8767,6 +9001,10 @@ SOURCE=..\..\include\wx\numdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -8787,6 +9025,10 @@ SOURCE=..\..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\pickerbase.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
@@ -8935,6 +9177,10 @@ SOURCE=..\..\include\wx\tabctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\tabmdi.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\taskbar.h
 # End Source File
 # Begin Source File
@@ -9031,6 +9277,10 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -9071,6 +9321,10 @@ SOURCE=..\..\include\wx\xrc\xh_choicbk.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File
 # Begin Source File
@@ -9079,10 +9333,22 @@ SOURCE=..\..\include\wx\xrc\xh_datectrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_dlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_frame.h
 # End Source File
 # Begin Source File
@@ -9103,6 +9369,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_listb.h
 # End Source File
 # Begin Source File
@@ -9127,6 +9397,10 @@ SOURCE=..\..\include\wx\xrc\xh_notbk.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_panel.h
 # End Source File
 # Begin Source File

build/msw/wx_dbgrid.dsp

@@ -454,18 +454,18 @@ LIB32=link.exe -lib
 
 SOURCE=..\..\src\common\dbgrid.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
 # End Group
 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

build/msw/wx_gl.dsp

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
 # Name "gl - Win32 Unicode Debug"
 # Name "gl - Win32 Release"
 # Name "gl - Win32 Debug"
-# Begin Group "MSW Sources"
+# Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
+SOURCE=..\..\src\common\dummy.cpp
 # ADD BASE CPP /Yc"wx/wxprec.h"
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\src\msw\glcanvas.cpp
@@ -529,141 +533,6 @@ SOURCE=..\..\src\msw\version.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\setup.h
-
-!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\univ\setup.h
 
 !IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
@@ -796,6 +665,141 @@ InputPath=..\include\wx\univ\setup.h
 
 !ENDIF
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ENDIF
+
 # End Source File
 # End Group
 # Begin Group "MSW Headers"

build/msw/wx_html.dsp

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
 # Name "html - Win32 Unicode Debug"
 # Name "html - Win32 Release"
 # Name "html - Win32 Debug"
-# Begin Group "MSW Sources"
+# Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
+SOURCE=..\..\src\common\dummy.cpp
 # ADD BASE CPP /Yc"wx/wxprec.h"
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\src\msw\helpbest.cpp
@@ -1051,6 +1055,10 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 !ENDIF
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpbest.h
 # End Source File
 # End Group
 # Begin Group "wxHTML Headers"

build/msw/wx_media.dsp

@@ -452,6 +452,12 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\mediactrlcmn.cpp
 # End Source File
 # End Group
@@ -464,13 +470,11 @@ SOURCE=..\..\src\msw\ole\activex.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
+SOURCE=..\..\src\msw\mediactrl_am.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\mediactrl.cpp
+SOURCE=..\..\src\msw\mediactrl_wmp10.cpp
 # End Source File
 # Begin Source File
 

build/msw/wx_net.dsp

@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
 
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"
 
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"
 
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"
 
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"
 
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Release"
 
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"
 
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"
 
@@ -452,6 +452,12 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fs_inet.cpp
 # End Source File
 # Begin Source File
@@ -496,12 +502,6 @@ SOURCE=..\..\src\common\url.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\gsocket.cpp
 # End Source File
 # Begin Source File

build/msw/wx_odbc.dsp

@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
 
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"
 
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"
 
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"
 
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
 
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"
 
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"
 
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"
 
@@ -458,18 +458,18 @@ SOURCE=..\..\src\common\db.cpp
 
 SOURCE=..\..\src\common\dbtable.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
 # End Group
 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

build/msw/wx_qa.dsp

@@ -454,18 +454,18 @@ LIB32=link.exe -lib
 
 SOURCE=..\..\src\common\debugrpt.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
 # End Group
 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

build/msw/wx_xml.dsp

@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
 
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"
 
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"
 
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"
 
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"
 
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"
 
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"
 
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"
 
@@ -452,6 +452,12 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\xtixml.cpp
 # End Source File
 # End Group
@@ -460,12 +466,6 @@ SOURCE=..\..\src\common\xtixml.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

build/msw/wx_xrc.dsp

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
 # Name "xrc - Win32 Unicode Debug"
 # Name "xrc - Win32 Release"
 # Name "xrc - Win32 Debug"
-# Begin Group "MSW Sources"
+# Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
+SOURCE=..\..\src\common\dummy.cpp
 # ADD BASE CPP /Yc"wx/wxprec.h"
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\src\msw\version.rc
@@ -990,6 +994,10 @@ SOURCE=..\..\include\wx\xrc\xh_choicbk.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File
 # Begin Source File
@@ -998,10 +1006,22 @@ SOURCE=..\..\include\wx\xrc\xh_datectrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_dlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_frame.h
 # End Source File
 # Begin Source File
@@ -1022,6 +1042,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_listb.h
 # End Source File
 # Begin Source File
@@ -1046,6 +1070,10 @@ SOURCE=..\..\include\wx\xrc\xh_notbk.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_panel.h
 # End Source File
 # Begin Source File
@@ -1170,6 +1198,10 @@ SOURCE=..\..\src\xrc\xh_choicbk.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_clrpicker.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_combo.cpp
 # End Source File
 # Begin Source File
@@ -1178,10 +1210,22 @@ SOURCE=..\..\src\xrc\xh_datectrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_dirpicker.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_dlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_filepicker.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xh_fontpicker.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_frame.cpp
 # End Source File
 # Begin Source File
@@ -1202,6 +1246,10 @@ SOURCE=..\..\src\xrc\xh_html.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_hyperlink.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_listb.cpp
 # End Source File
 # Begin Source File
@@ -1226,6 +1274,10 @@ SOURCE=..\..\src\xrc\xh_notbk.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_odcombo.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_panel.cpp
 # End Source File
 # Begin Source File

build/os2/config.wat

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -68,9 +68,18 @@ 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/palmos/makefile

@@ -144,7 +144,6 @@ PALMOS_LOWLEVEL_SRC = \
 ../../src/palmos/dcprint.cpp \
 ../../src/palmos/dcscreen.cpp \
 ../../src/palmos/dib.cpp \
-../../src/palmos/display.cpp \
 ../../src/palmos/enhmeta.cpp \
 ../../src/palmos/evtloop.cpp \
 ../../src/palmos/font.cpp \
@@ -224,6 +223,7 @@ GUI_CMN_SRC = \
 ../../src/common/bookctrl.cpp \
 ../../src/common/choiccmn.cpp \
 ../../src/common/clipcmn.cpp \
+../../src/common/colourcmn.cpp \
 ../../src/common/cmdproc.cpp \
 ../../src/common/cmndata.cpp \
 ../../src/common/containr.cpp \
@@ -240,9 +240,11 @@ GUI_CMN_SRC = \
 ../../src/common/dpycmn.cpp \
 ../../src/common/dseldlg.cpp \
 ../../src/common/effects.cpp \
+../../src/common/evtloopcmn.cpp \
 ../../src/common/fddlgcmn.cpp \
 ../../src/common/fldlgcmn.cpp \
 ../../src/common/fontcmn.cpp \
+../../src/common/fontenumcmn.cpp \
 ../../src/common/fontmap.cpp \
 ../../src/common/framecmn.cpp \
 ../../src/common/gaugecmn.cpp \

build/script/makedocs.vc

@@ -30,19 +30,19 @@ allhlp: wxhlp
         cd $(WXDIR)\utils\tex2rtf\docs
         nmake -f makefile.vc hlp
         cd $(WXDIR)\contrib\src\fl
-        -nmake -f makefile.vc hlp
+        -nmake -f makedocs.vc hlp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\ogl
-        -nmake -f makefile.vc hlp
+        -nmake -f makedocs.vc hlp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\svg
-        -nmake -f makefile.vc hlp
+        -nmake -f makedocs.vc hlp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\gizmos
-        -nmake -f makefile.vc hlp
+        -nmake -f makedocs.vc hlp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\mmedia
-        -nmake -f makefile.vc hlp
+        -nmake -f makedocs.vc hlp
         cd $(THISDIR)
 
 
@@ -58,16 +58,16 @@ allhtml: wxhtml
         cd $(WXDIR)\contrib\src\fl
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\ogl
-        nmake -f makefile.vc html
+        nmake -f makedocs.vc html
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\svg
-        nmake -f makefile.vc html
+        nmake -f makedocs.vc html
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\gizmos
-        nmake -f makefile.vc html
+        nmake -f makedocs.vc html
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\mmedia
-        nmake -f makefile.vc html
+        nmake -f makedocs.vc html
         cd $(THISDIR)
 
 allhtmlhelp: htmlhelp
@@ -76,19 +76,19 @@ allhtmlhelp: htmlhelp
         cd $(WXDIR)\utils\tex2rtf\docs
         -nmake -f makefile.vc htmlhelp
         cd $(WXDIR)\contrib\src\fl
-        -nmake -f makefile.vc htmlhelp
+        -nmake -f makedocs.vc htmlhelp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\ogl
-        -nmake -f makefile.vc htmlhelp
+        -nmake -f makedocs.vc htmlhelp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\svg
-        -nmake -f makefile.vc htmlhelp
+        -nmake -f makedocs.vc htmlhelp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\gizmos
-        -nmake -f makefile.vc htmlhelp
+        -nmake -f makedocs.vc htmlhelp
         cd $(THISDIR)
         cd $(WXDIR)\contrib\src\mmedia
-        -nmake -f makefile.vc htmlhelp
+        -nmake -f makedocs.vc htmlhelp
         cd $(THISDIR)
 
 

build/script/win_docs.bat

@@ -9,7 +9,7 @@ echo Building wxWidgets docs... > c:\temp.log
 
 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
-set PATH=%PATH%;C:\wx\wxWidg~1.3\utils\tex2rtf\src\vc_based;C:\wx\GnuWin32\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
+set PATH=%PATH%;C:\wx\wxw26b\utils\tex2rtf\src\vc_based;C:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
 set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
 echo %PATH% >> c:\temp.log
 
@@ -31,6 +31,9 @@ nmake -f makedocs.vc cleandocs
 nmake -f makedocs.vc alldocs
 
 del %DAILY%\in\*.p*
+mkdir %WXWIN%\docs\pdf
+mkdir %WXWIN%\docs\htmlhelp
+mkdir %WXWIN%\docs\htb
 echo starting word >>  c:\temp.log
 start /WAIT winword /mwx_ps
 
@@ -67,7 +70,7 @@ zip %DAILY%\wx-docs-extra-pdf.ZIP *.pdf -x wx.pdf
 
 
 echo setting S
-rem echo yes > net use s: /delete
+echo yes > net use s: /delete
 net use s: \\biolpc22\bake 
 
 copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win

build/wince/missing/AGL/agl.h

@@ -0,0 +1 @@
+

build/wince/missing/ATSUnicode.h

@@ -0,0 +1 @@
+

build/wince/missing/Appearance.h

@@ -0,0 +1 @@
+

build/wince/missing/AvailabilityMacros.h

@@ -0,0 +1 @@
+

build/wince/missing/CFString.h

@@ -0,0 +1 @@
+

build/wince/missing/Carbon/Carbon.h

@@ -0,0 +1 @@
+

build/wince/missing/CodeFragments.h

@@ -0,0 +1 @@
+

build/wince/missing/ControlDefinitions.h

@@ -0,0 +1 @@
+

build/wince/missing/Controls.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreFoundation/CFBase.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreFoundation/CFString.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreFoundation/CFStringEncodingExt.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreFoundation/CoreFoundation.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreServices.h

@@ -0,0 +1 @@
+

build/wince/missing/CoreServices/CoreServices.h

@@ -0,0 +1 @@
+

build/wince/missing/DateTime.h

@@ -0,0 +1 @@
+

build/wince/missing/Debugging.h

@@ -0,0 +1 @@
+

build/wince/missing/DriverServices.h

@@ -0,0 +1 @@
+

build/wince/missing/FixMath.h

@@ -0,0 +1 @@
+

build/wince/missing/Folders.h

@@ -0,0 +1 @@
+

build/wince/missing/GL/glx.h

@@ -0,0 +1 @@
+

build/wince/missing/Gestalt.h

@@ -0,0 +1 @@
+

build/wince/missing/InternetConfig.h

@@ -0,0 +1 @@
+

build/wince/missing/LowMem.h

@@ -0,0 +1 @@
+

build/wince/missing/MacHeaders.c

@@ -0,0 +1 @@
+

build/wince/missing/MoreFilesX.h

@@ -0,0 +1 @@
+

build/wince/missing/OpenGL/gl.h

@@ -0,0 +1 @@
+

build/wince/missing/OpenGL/glx.h

@@ -0,0 +1 @@
+

build/wince/missing/OpenTptInternet.h

@@ -0,0 +1 @@
+

build/wince/missing/OpenTransport.h

@@ -0,0 +1 @@
+

build/wince/missing/OpenTransportProviders.h

@@ -0,0 +1 @@
+

build/wince/missing/PMApplication.h

@@ -0,0 +1 @@
+

build/wince/missing/PalmOS.h

@@ -0,0 +1 @@
+

build/wince/missing/Printing.h

@@ -0,0 +1 @@
+

build/wince/missing/Quickdraw.h

@@ -0,0 +1 @@
+

build/wince/missing/StringMgr.h

@@ -0,0 +1 @@
+

build/wince/missing/SystemMgr.h

@@ -0,0 +1 @@
+

build/wince/missing/TextCommon.h

@@ -0,0 +1 @@
+

build/wince/missing/TextEncodingConverter.h

@@ -0,0 +1 @@
+

build/wince/missing/TimeMgr.h

@@ -0,0 +1 @@
+

build/wince/missing/Timer.h

@@ -0,0 +1 @@
+

build/wince/missing/X11/Xatom.h

@@ -0,0 +1 @@
+

build/wince/missing/X11/Xlib.h

@@ -0,0 +1 @@
+

build/wince/missing/X11/Xmd.h

@@ -0,0 +1 @@
+

build/wince/missing/X11/Xutil.h

@@ -0,0 +1 @@
+

build/wince/missing/Xm/VendorSP.h

@@ -0,0 +1 @@
+

build/wince/missing/Xm/Xm.h

@@ -0,0 +1 @@
+

build/wince/missing/_mingw.h

@@ -0,0 +1 @@
+

build/wince/missing/agl.h

@@ -0,0 +1 @@
+

build/wince/missing/alloc.h

@@ -0,0 +1 @@
+