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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_5_2@27530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-31 10:49:16 +00:00
1778 changed files with 64606 additions and 98309 deletions
--- a/Makefile.in
+++ b/Makefile.in
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -88,11 +88,14 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
 dnl or only the old <iostream.h> one - it may be generally assumed that if
 dnl <iostream> exists, the other "new" headers (without .h) exist too.
 dnl
-dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
+dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
 dnl ---------------------------------------------------------------------------

 AC_DEFUN([WX_CPP_NEW_HEADERS],
 [
+  if test "$cross_compiling" = "yes"; then
+    ifelse([$2], , :, [$2])
+  else
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS

@@ -105,6 +108,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
    fi

    AC_LANG_RESTORE
+  fi
 ])

 dnl ---------------------------------------------------------------------------
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -243,18 +243,6 @@ dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
    fi
    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
-dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF)
-dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_X11 ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
 dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_GUI_1 ###
    COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -429,12 +417,6 @@ dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 1_COND_TOOLKIT_MAC_WXUNIV_0 ###
-    COND_TOOLKIT_MAC_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MAC_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_MGL ###
    COND_TOOLKIT_MGL="#"
    if test "x$TOOLKIT" = "xMGL" ; then
@@ -483,12 +465,6 @@ dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 1_COND_TOOLKIT_MSW_WXUNIV_0 ###
-    COND_TOOLKIT_MSW_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MSW_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_PM ###
    COND_TOOLKIT_PM="#"
    if test "x$TOOLKIT" = "xPM" ; then
@@ -507,12 +483,6 @@ dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 1_COND_TOOLKIT_PM_WXUNIV_0 ###
-    COND_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_PM_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_WINCE ###
    COND_TOOLKIT_WINCE="#"
    if test "x$TOOLKIT" = "xWINCE" ; then
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -23,7 +23,7 @@
                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.
+    cbx_unix  - Doesn't intergrate well and won't be used by most Unix people.
    -->
    
    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
@@ -139,7 +139,7 @@

    <add-formats files="wx.bkl">wx24dsp</add-formats>
    <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWidgets.dsp
    </add-flags>
    
    <add-formats files="wx.bkl">rpmspec</add-formats>
--- a/build/bakefiles/README
+++ b/build/bakefiles/README
@@ -36,7 +36,7 @@ Note: the following files are generated using bakefile_gen:
    that contain "This makefile was generated by Bakefile" banner and
    VC++ project files in samples, demos and utils directories (inc. contrib
    ones)
-  * src/wxWindows.dsp
+  * src/wxWidgets.dsp
  * {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
  * autoconf_inc.m4
  * all Makefile.in files
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -428,8 +428,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
            <precomp-headers-exclude>
                src/common/unzip.c
                src/common/extended.c
-                src/msw/gsocket.cpp
-                src/msw/gsockmsw.cpp
+                src/msw/gsocket.c
+                src/msw/gsockmsw.c
            </precomp-headers-exclude>
        </if>
        
@@ -524,9 +524,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
    
    <set var="PLUGINSUFFIX">
        <if cond="UNICODE=='0' and BUILD=='release'"></if>
-        <if cond="UNICODE=='0' and BUILD=='debug'">d</if>
-        <if cond="UNICODE=='1' and BUILD=='release'">u</if>
-        <if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
+        <if cond="UNICODE=='0' and BUILD=='debug'">_d</if>
+        <if cond="UNICODE=='1' and BUILD=='release'">_u</if>
+        <if cond="UNICODE=='1' and BUILD=='debug'">_ud</if>
    </set>

    <set var="PLUGINS_INST_DIR" make_var="1">
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -33,6 +33,5 @@
    
    <template id="wx_contrib_headers">
        <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
-        <install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)</install-to>
    </template>
 </makefile>
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -142,7 +142,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!

 <set var="BASE_CMN_SRC" hints="files">
    src/common/appbase.cpp
-    src/common/clntdata.cpp
    src/common/cmdline.cpp
    src/common/config.cpp
    src/common/datetime.cpp
@@ -210,7 +209,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/buffer.h
    wx/build.h
    wx/chkconf.h
-    wx/clntdata.h
    wx/cmdline.h
    wx/confbase.h
    wx/config.h
@@ -307,14 +305,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->

 <set var="NET_UNIX_SRC" hints="files">
-    src/unix/gsocket.cpp
+    src/unix/gsocket.c
 </set>
 <set var="NET_UNIX_HDR" hints="files">
    wx/unix/gsockunx.h
 </set>

 <set var="NET_WIN32_SRC" hints="files">
-    src/msw/gsocket.cpp
+    src/msw/gsocket.c
    src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
@@ -329,14 +327,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>

 <set var="NET_DARWIN_SRC" hints="files">
-    src/unix/gsocket.cpp
+    src/unix/gsocket.c
 </set>
 <set var="NET_DARWIN_HDR" hints="files">
    wx/unix/gsockunx.h
 </set>

 <set var="NET_OS2_SRC" hints="files">
-    src/unix/gsocket.cpp
+    src/unix/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
    wx/unix/gsockunx.h
@@ -383,6 +381,7 @@ 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/clntdata.cpp
    src/common/cmdproc.cpp
    src/common/cmndata.cpp
    src/common/containr.cpp
@@ -478,6 +477,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/checklst.h
    wx/choicdlg.h
    wx/choice.h
+    wx/clntdata.h
    wx/cmndata.h
    wx/combobox.h
    wx/control.h
@@ -686,7 +686,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/evtloop.cpp
    src/gtk/font.cpp
    src/gtk/gdiobj.cpp
-    src/gtk/gsockgtk.cpp
+    src/gtk/gsockgtk.c
    src/gtk/icon.cpp
    src/gtk/main.cpp
    src/gtk/minifram.cpp
@@ -727,7 +727,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/checkbox.cpp
    src/gtk/checklst.cpp
    src/gtk/choice.cpp
-    src/gtk/colordlg.cpp
    src/gtk/combobox.cpp
    src/gtk/control.cpp
    src/gtk/dialog.cpp
@@ -756,7 +755,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
-    wx/generic/colrdlgg.h
    wx/generic/dirdlgg.h
    wx/generic/fdrepdlg.h
    wx/generic/listctrl.h
@@ -770,7 +768,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/gtk/button.h
    wx/gtk/checkbox.h
    wx/gtk/checklst.h
-    wx/gtk/colordlg.h
    wx/gtk/choice.h
    wx/gtk/clipbrd.h
    wx/gtk/colour.h
@@ -873,7 +870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/motif/frame.cpp
    src/motif/gauge.cpp
    src/motif/gdiobj.cpp
-    src/motif/gsockmot.cpp
+    src/motif/gsockmot.c
    src/motif/icon.cpp
    src/motif/listbox.cpp
    src/motif/main.cpp
@@ -966,6 +963,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/motif/private.h
    wx/motif/radiobox.h
    wx/motif/radiobut.h
+    wx/motif/region.h
    wx/motif/scrolbar.h
    wx/motif/slider.h
    wx/motif/spinbutt.h
@@ -1004,7 +1002,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/x11/evtloop.cpp
    src/x11/font.cpp
    src/x11/gdiobj.cpp
-    src/x11/gsockx11.cpp
+    src/x11/gsockx11.c
    src/x11/icon.cpp
    src/x11/main.cpp
    src/x11/minifram.cpp
@@ -1084,7 +1082,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/fontutil.cpp
    src/msw/gdiimage.cpp
    src/msw/gdiobj.cpp
-    src/msw/gsockmsw.cpp
+    src/msw/gsockmsw.c
    src/msw/icon.cpp
    src/msw/minifram.cpp
    src/msw/ole/dataobj.cpp
@@ -1318,7 +1316,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/wince/filedlgwce.cpp
    src/msw/wince/helpwce.cpp
    src/msw/wince/tbarwce.cpp
-    src/msw/wince/menuce.cpp
 </set>
 <set var="WINCE_HDR" hints="files">
    wx/generic/fdrepdlg.h
@@ -1327,7 +1324,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/msw/wince/libraries.h
    wx/msw/wince/missing.h
    wx/msw/wince/tbarwce.h
-    wx/msw/wince/resources.h
 </set>


@@ -1445,7 +1441,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/os2/gauge.cpp
    src/os2/gdiimage.cpp
    src/os2/gdiobj.cpp
-    src/os2/gsockpm.cpp
+    src/os2/gsockpm.c
    src/os2/helpwin.cpp
    src/os2/icon.cpp
    src/os2/iniconf.cpp
@@ -1605,7 +1601,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/mac/carbon/frame.cpp
    src/mac/carbon/gauge.cpp
    src/mac/carbon/gdiobj.cpp
-    src/mac/carbon/gsockosx.cpp
+    src/mac/carbon/gsockosx.c
    src/mac/carbon/icon.cpp
    src/mac/carbon/listbox.cpp
    src/mac/carbon/mdi.cpp
@@ -1850,7 +1846,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/cocoa/NSControl.mm
    src/cocoa/NSMenu.mm
    src/cocoa/NSPanel.mm
-    src/cocoa/NSScroller.mm
    src/cocoa/NSTabView.mm
    src/cocoa/NSTableView.mm
    src/cocoa/NSTextField.mm
@@ -1896,7 +1891,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/cocoa/radiobox.mm
    src/cocoa/radiobut.mm
    src/cocoa/region.mm
-    src/cocoa/scrolbar.mm
    src/cocoa/settings.cpp
    src/cocoa/slider.mm
    src/cocoa/spinbutt.mm
@@ -1927,7 +1921,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/generic/tabg.cpp
    src/generic/timer.cpp
    <!-- wxMac stuff used by wxCocoa: -->
-    src/mac/carbon/gsockosx.cpp
+    src/mac/carbon/gsockosx.c
 </set>
 <set var="COCOA_HDR" hints="files">
    wx/cocoa/NSApplication.h
@@ -1936,7 +1930,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/cocoa/NSControl.h
    wx/cocoa/NSMenu.h
    wx/cocoa/NSPanel.h
-    wx/cocoa/NSScroller.h
    wx/cocoa/NSTabView.h
    wx/cocoa/NSTableView.h
    wx/cocoa/NSTextField.h
@@ -1982,7 +1975,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/cocoa/radiobox.h
    wx/cocoa/radiobut.h
    wx/cocoa/region.h
-    wx/cocoa/scrolbar.h
    wx/cocoa/slider.h
    wx/cocoa/spinbutt.h
    wx/cocoa/statbmp.h
@@ -2204,11 +2196,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/unix/taskbarx11.h
 </set>

-<set var="ADVANCED_GTK_SRC" hints="files">
-    src/gtk/taskbar.cpp
-    src/gtk/eggtrayicon.c
-</set>
-

 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -2353,8 +2340,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
    </set>
    <set var="BASE_PLATFORM_SRC" hints="files">
@@ -2465,7 +2450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
    </set>
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -77,7 +77,6 @@ ALL_DIST: distrib_clean
 	cp $(WXDIR)/install-sh $(DISTDIR)
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
-	cp $(WXDIR)/wx-config-wrapper.in $(DISTDIR)
 	cp $(WXDIR)/version-script.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
@@ -529,11 +528,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
 	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event

-	mkdir $(DISTDIR)/samples/except
-	cp $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except
-	cp $(SAMPDIR)/except/makefile.unx $(DISTDIR)/samples/except
-	cp $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except
-
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -834,13 +828,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound
 	cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound

-	mkdir $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/makefile.unx $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.h $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash
-
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -28,7 +28,6 @@
        <define>$(UNICODE_DEFINE)</define>
        <dirname>$(LIBDIRNAME)</dirname>
        <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
-        <cflags-dmars>-w12</cflags-dmars>
        <sources>
            src/regex/regcomp.c
            src/regex/regexec.c
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -33,7 +33,6 @@
        <include>$(INC_ZLIB)</include>
        <include>$(INC_JPEG)</include>
        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
-        <cflags-dmars>-w2</cflags-dmars>
        <sources>
            $(TIFF_PLATFORM_SRC)
 		    src/tiff/tif_aux.c
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -64,11 +64,8 @@
            <dependency-of>install</dependency-of>
            <command>
                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
-                $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
+                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(BINDIR)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
            </command>
        </action>

@@ -81,9 +78,6 @@
        <headers>
            <srcdir>$(SRCDIR)/include</srcdir>
            <files>$(ALL_HEADERS)</files>
-            <install-to>
-                $(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
-            </install-to>
        </headers>

        <!-- Locales: -->
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -11,15 +11,8 @@ import utils
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):
-
-try:
-    # this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature:
-    utils.checkBakefileVersion('0.1.5') 
-    def __noopSubst(name, func, caller):
-        return '$(%s)' % name
-except AttributeError:
-    def __noopSubst(func, name):
-        return '$(%s)' % name
+def __noopSubst(func, name):
+    return '$(%s)' % name
 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
 utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -187,7 +187,6 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.obj \
 	$(OBJS)\monodll_appbase.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
 	$(OBJS)\monodll_datetime.obj \
@@ -285,7 +284,6 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.obj \
 	$(OBJS)\monolib_appbase.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
 	$(OBJS)\monolib_datetime.obj \
@@ -384,7 +382,6 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.obj \
 	$(OBJS)\basedll_appbase.obj \
-	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
 	$(OBJS)\basedll_datetime.obj \
@@ -467,7 +464,6 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.obj \
 	$(OBJS)\baselib_appbase.obj \
-	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
 	$(OBJS)\baselib_datetime.obj \
@@ -536,6 +532,12 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.obj \
 	$(OBJS)\baselib_mslu.obj \
 	$(OBJS)\baselib_volume.obj
+NETDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \
+	$(CPPFLAGS) $(CFLAGS)
 NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -556,6 +558,11 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_url.obj \
 	$(OBJS)\netdll_gsocket.obj \
 	$(OBJS)\netdll_urlmsw.obj
+NETLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
 NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -576,6 +583,12 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_url.obj \
 	$(OBJS)\netlib_gsocket.obj \
 	$(OBJS)\netlib_urlmsw.obj
+COREDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \
+	$(CPPFLAGS) $(CFLAGS)
 COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -592,6 +605,11 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.obj \
 	$(OBJS)\coredll_volume.obj \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
+	-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
+	-I..\..\src\expat\lib -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -987,6 +1005,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1180,6 +1199,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1420,6 +1440,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1613,6 +1634,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1826,6 +1848,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2019,6 +2042,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2216,6 +2240,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -2409,6 +2434,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -3330,9 +3356,6 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

@@ -3567,8 +3590,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**

 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -3950,8 +3973,8 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -4364,6 +4387,11 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4800,9 +4828,6 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

@@ -5037,8 +5062,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**

 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -5420,8 +5445,8 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -5834,6 +5859,11 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6270,9 +6300,6 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**

-$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**

@@ -6483,9 +6510,6 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**

-$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**

@@ -6723,8 +6747,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**

-$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
+$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $**

 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
@@ -6762,8 +6786,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
 	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**

-$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
+$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $**

 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
@@ -7046,8 +7070,8 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(COREDLL_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -7460,6 +7484,11 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8168,8 +8197,8 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) -q -c -P- -o$@ $(CORELIB_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -8582,6 +8611,11 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -173,7 +173,6 @@ MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.o \
 	$(OBJS)\monodll_appbase.o \
-	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdline.o \
 	$(OBJS)\monodll_config.o \
 	$(OBJS)\monodll_datetime.o \
@@ -271,7 +270,6 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.o \
 	$(OBJS)\monolib_appbase.o \
-	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdline.o \
 	$(OBJS)\monolib_config.o \
 	$(OBJS)\monolib_datetime.o \
@@ -369,7 +367,6 @@ BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.o \
 	$(OBJS)\basedll_appbase.o \
-	$(OBJS)\basedll_clntdata.o \
 	$(OBJS)\basedll_cmdline.o \
 	$(OBJS)\basedll_config.o \
 	$(OBJS)\basedll_datetime.o \
@@ -452,7 +449,6 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.o \
 	$(OBJS)\baselib_appbase.o \
-	$(OBJS)\baselib_clntdata.o \
 	$(OBJS)\baselib_cmdline.o \
 	$(OBJS)\baselib_config.o \
 	$(OBJS)\baselib_datetime.o \
@@ -521,6 +517,11 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.o \
 	$(OBJS)\baselib_mslu.o \
 	$(OBJS)\baselib_volume.o
+NETDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
+	-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \
+	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS)
 NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
@@ -541,6 +542,11 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_url.o \
 	$(OBJS)\netdll_gsocket.o \
 	$(OBJS)\netdll_urlmsw.o
+NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
+	-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
 NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
@@ -561,6 +567,11 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_url.o \
 	$(OBJS)\netlib_gsocket.o \
 	$(OBJS)\netlib_urlmsw.o
+COREDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
+	-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \
+	-DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
@@ -577,6 +588,11 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.o \
 	$(OBJS)\coredll_volume.o \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
+	-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \
+	-DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
 	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
@@ -977,6 +993,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.o \
 	$(OBJS)\monodll_choiccmn.o \
 	$(OBJS)\monodll_clipcmn.o \
+	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdproc.o \
 	$(OBJS)\monodll_cmndata.o \
 	$(OBJS)\monodll_containr.o \
@@ -1172,6 +1189,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.o \
 	$(OBJS)\monodll_choiccmn.o \
 	$(OBJS)\monodll_clipcmn.o \
+	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdproc.o \
 	$(OBJS)\monodll_cmndata.o \
 	$(OBJS)\monodll_containr.o \
@@ -1416,6 +1434,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.o \
 	$(OBJS)\monolib_choiccmn.o \
 	$(OBJS)\monolib_clipcmn.o \
+	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdproc.o \
 	$(OBJS)\monolib_cmndata.o \
 	$(OBJS)\monolib_containr.o \
@@ -1611,6 +1630,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.o \
 	$(OBJS)\monolib_choiccmn.o \
 	$(OBJS)\monolib_clipcmn.o \
+	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdproc.o \
 	$(OBJS)\monolib_cmndata.o \
 	$(OBJS)\monolib_containr.o \
@@ -1838,6 +1858,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.o \
 	$(OBJS)\coredll_choiccmn.o \
 	$(OBJS)\coredll_clipcmn.o \
+	$(OBJS)\coredll_clntdata.o \
 	$(OBJS)\coredll_cmdproc.o \
 	$(OBJS)\coredll_cmndata.o \
 	$(OBJS)\coredll_containr.o \
@@ -2033,6 +2054,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.o \
 	$(OBJS)\coredll_choiccmn.o \
 	$(OBJS)\coredll_clipcmn.o \
+	$(OBJS)\coredll_clntdata.o \
 	$(OBJS)\coredll_cmdproc.o \
 	$(OBJS)\coredll_cmndata.o \
 	$(OBJS)\coredll_containr.o \
@@ -2236,6 +2258,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.o \
 	$(OBJS)\corelib_choiccmn.o \
 	$(OBJS)\corelib_clipcmn.o \
+	$(OBJS)\corelib_clntdata.o \
 	$(OBJS)\corelib_cmdproc.o \
 	$(OBJS)\corelib_cmndata.o \
 	$(OBJS)\corelib_containr.o \
@@ -2431,6 +2454,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.o \
 	$(OBJS)\corelib_choiccmn.o \
 	$(OBJS)\corelib_clipcmn.o \
+	$(OBJS)\corelib_clntdata.o \
 	$(OBJS)\corelib_cmdproc.o \
 	$(OBJS)\corelib_cmndata.o \
 	$(OBJS)\corelib_containr.o \
@@ -3372,9 +3396,6 @@ $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -3609,8 +3630,8 @@ $(OBJS)\monodll_socket.o: ../../src/common/socket.cpp
 $(OBJS)\monodll_url.o: ../../src/common/url.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.c
+	$(CC) -c -o $@ $(MONODLL_CFLAGS) $<

 $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -3992,8 +4013,8 @@ $(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp
 endif

 ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.c
+	$(CC) -c -o $@ $(MONODLL_CFLAGS) $<
 endif

 ifeq ($(USE_GUI),1)
@@ -4506,6 +4527,11 @@ $(OBJS)\monodll_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -4942,9 +4968,6 @@ $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -5179,8 +5202,8 @@ $(OBJS)\monolib_socket.o: ../../src/common/socket.cpp
 $(OBJS)\monolib_url.o: ../../src/common/url.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.c
+	$(CC) -c -o $@ $(MONOLIB_CFLAGS) $<

 $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -5562,8 +5585,8 @@ $(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp
 endif

 ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.c
+	$(CC) -c -o $@ $(MONOLIB_CFLAGS) $<
 endif

 ifeq ($(USE_GUI),1)
@@ -6076,6 +6099,11 @@ $(OBJS)\monolib_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6512,9 +6540,6 @@ $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<

-$(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 $(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<

@@ -6725,9 +6750,6 @@ $(OBJS)\baselib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<

-$(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 $(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<

@@ -6965,8 +6987,8 @@ $(OBJS)\netdll_socket.o: ../../src/common/socket.cpp
 $(OBJS)\netdll_url.o: ../../src/common/url.cpp
 	$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $<

-$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.cpp
-	$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $<
+$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.c
+	$(CC) -c -o $@ $(NETDLL_CFLAGS) $<

 $(OBJS)\netdll_urlmsw.o: ../../src/msw/urlmsw.cpp
 	$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $<
@@ -7004,8 +7026,8 @@ $(OBJS)\netlib_socket.o: ../../src/common/socket.cpp
 $(OBJS)\netlib_url.o: ../../src/common/url.cpp
 	$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $<

-$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.cpp
-	$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $<
+$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.c
+	$(CC) -c -o $@ $(NETLIB_CFLAGS) $<

 $(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp
 	$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $<
@@ -7288,8 +7310,8 @@ $(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp
 endif

 ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.c
+	$(CC) -c -o $@ $(COREDLL_CFLAGS) $<
 endif

 ifeq ($(USE_GUI),1)
@@ -7802,6 +7824,11 @@ $(OBJS)\coredll_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -8510,8 +8537,8 @@ $(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp
 endif

 ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.c
+	$(CC) -c -o $@ $(CORELIB_CFLAGS) $<
 endif

 ifeq ($(USE_GUI),1)
@@ -9024,6 +9051,11 @@ $(OBJS)\corelib_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -188,7 +188,6 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.obj \
 	$(OBJS)\monodll_appbase.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
 	$(OBJS)\monodll_datetime.obj \
@@ -292,7 +291,6 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.obj \
 	$(OBJS)\monolib_appbase.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
 	$(OBJS)\monolib_datetime.obj \
@@ -397,7 +395,6 @@ BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.obj \
 	$(OBJS)\basedll_appbase.obj \
-	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
 	$(OBJS)\basedll_datetime.obj \
@@ -486,7 +483,6 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.obj \
 	$(OBJS)\baselib_appbase.obj \
-	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
 	$(OBJS)\baselib_datetime.obj \
@@ -555,6 +551,14 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_main.obj \
 	$(OBJS)\baselib_mslu.obj \
 	$(OBJS)\baselib_volume.obj
+NETDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \
+	$(__DEBUGINFO) \
+	/Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
+	$(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS)
 NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
@@ -579,6 +583,14 @@ NETDLL_OBJECTS =  \
 	$(OBJS)\netdll_url.obj \
 	$(OBJS)\netdll_gsocket.obj \
 	$(OBJS)\netdll_urlmsw.obj
+NETLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \
+	$(__DEBUGINFO) \
+	/Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
+	$(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
 NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
@@ -602,6 +614,14 @@ NETLIB_OBJECTS =  \
 	$(OBJS)\netlib_url.obj \
 	$(OBJS)\netlib_gsocket.obj \
 	$(OBJS)\netlib_urlmsw.obj
+COREDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \
+	$(__DEBUGINFO) \
+	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
+	$(____DEBUGRUNTIME_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
@@ -622,6 +642,14 @@ COREDLL_OBJECTS =  \
 	$(OBJS)\coredll_mslu.obj \
 	$(OBJS)\coredll_volume.obj \
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \
+	$(__DEBUGINFO) \
+	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
+	$(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	/I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+	/I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+	/DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
@@ -1184,6 +1212,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1377,6 +1406,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1635,6 +1665,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1828,6 +1859,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -2131,6 +2163,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2324,6 +2357,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
+	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2539,6 +2573,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -2732,6 +2767,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
+	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -3875,9 +3911,6 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

@@ -4112,8 +4145,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

-$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**

 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4495,8 +4528,8 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -4909,6 +4942,11 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5345,9 +5383,6 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

@@ -5582,8 +5617,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

-$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**

 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -5965,8 +6000,8 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -6379,6 +6414,11 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6815,9 +6855,6 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**

-$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
-
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**

@@ -7028,9 +7065,6 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**

-$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
-
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**

@@ -7268,8 +7302,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**

-$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**

 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
@@ -7307,8 +7341,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**

-$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
+	$(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**

 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
@@ -7591,8 +7625,8 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -8005,6 +8039,11 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8713,8 +8752,8 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
 !endif

 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+	$(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $**
 !endif

 !if "$(USE_GUI)" == "1"
@@ -9127,6 +9166,11 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -240,6 +240,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_bookctrl.obj &
 	$(OBJS)\monodll_choiccmn.obj &
 	$(OBJS)\monodll_clipcmn.obj &
+	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdproc.obj &
 	$(OBJS)\monodll_cmndata.obj &
 	$(OBJS)\monodll_containr.obj &
@@ -435,6 +436,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_bookctrl.obj &
 	$(OBJS)\monodll_choiccmn.obj &
 	$(OBJS)\monodll_clipcmn.obj &
+	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdproc.obj &
 	$(OBJS)\monodll_cmndata.obj &
 	$(OBJS)\monodll_containr.obj &
@@ -682,6 +684,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_bookctrl.obj &
 	$(OBJS)\monolib_choiccmn.obj &
 	$(OBJS)\monolib_clipcmn.obj &
+	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdproc.obj &
 	$(OBJS)\monolib_cmndata.obj &
 	$(OBJS)\monolib_containr.obj &
@@ -877,6 +880,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_bookctrl.obj &
 	$(OBJS)\monolib_choiccmn.obj &
 	$(OBJS)\monolib_clipcmn.obj &
+	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdproc.obj &
 	$(OBJS)\monolib_cmndata.obj &
 	$(OBJS)\monolib_containr.obj &
@@ -1110,6 +1114,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_bookctrl.obj &
 	$(OBJS)\coredll_choiccmn.obj &
 	$(OBJS)\coredll_clipcmn.obj &
+	$(OBJS)\coredll_clntdata.obj &
 	$(OBJS)\coredll_cmdproc.obj &
 	$(OBJS)\coredll_cmndata.obj &
 	$(OBJS)\coredll_containr.obj &
@@ -1305,6 +1310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_bookctrl.obj &
 	$(OBJS)\coredll_choiccmn.obj &
 	$(OBJS)\coredll_clipcmn.obj &
+	$(OBJS)\coredll_clntdata.obj &
 	$(OBJS)\coredll_cmdproc.obj &
 	$(OBJS)\coredll_cmndata.obj &
 	$(OBJS)\coredll_containr.obj &
@@ -1510,6 +1516,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_bookctrl.obj &
 	$(OBJS)\corelib_choiccmn.obj &
 	$(OBJS)\corelib_clipcmn.obj &
+	$(OBJS)\corelib_clntdata.obj &
 	$(OBJS)\corelib_cmdproc.obj &
 	$(OBJS)\corelib_cmndata.obj &
 	$(OBJS)\corelib_containr.obj &
@@ -1705,6 +1712,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_bookctrl.obj &
 	$(OBJS)\corelib_choiccmn.obj &
 	$(OBJS)\corelib_clipcmn.obj &
+	$(OBJS)\corelib_clntdata.obj &
 	$(OBJS)\corelib_cmdproc.obj &
 	$(OBJS)\corelib_cmndata.obj &
 	$(OBJS)\corelib_containr.obj &
@@ -2176,7 +2184,6 @@ MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_dummy.obj &
 	$(OBJS)\monodll_appbase.obj &
-	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdline.obj &
 	$(OBJS)\monodll_config.obj &
 	$(OBJS)\monodll_datetime.obj &
@@ -2274,7 +2281,6 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_dummy.obj &
 	$(OBJS)\monolib_appbase.obj &
-	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdline.obj &
 	$(OBJS)\monolib_config.obj &
 	$(OBJS)\monolib_datetime.obj &
@@ -2373,7 +2379,6 @@ BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_dummy.obj &
 	$(OBJS)\basedll_appbase.obj &
-	$(OBJS)\basedll_clntdata.obj &
 	$(OBJS)\basedll_cmdline.obj &
 	$(OBJS)\basedll_config.obj &
 	$(OBJS)\basedll_datetime.obj &
@@ -2456,7 +2461,6 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_dummy.obj &
 	$(OBJS)\baselib_appbase.obj &
-	$(OBJS)\baselib_clntdata.obj &
 	$(OBJS)\baselib_cmdline.obj &
 	$(OBJS)\baselib_config.obj &
 	$(OBJS)\baselib_datetime.obj &
@@ -2525,6 +2529,12 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_main.obj &
 	$(OBJS)\baselib_mslu.obj &
 	$(OBJS)\baselib_volume.obj
+NETDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
+	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+	$(CPPFLAGS) $(CFLAGS)
 NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
@@ -2545,6 +2555,11 @@ NETDLL_OBJECTS =  &
 	$(OBJS)\netdll_url.obj &
 	$(OBJS)\netdll_gsocket.obj &
 	$(OBJS)\netdll_urlmsw.obj
+NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
+	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
 NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
@@ -2565,6 +2580,12 @@ NETLIB_OBJECTS =  &
 	$(OBJS)\netlib_url.obj &
 	$(OBJS)\netlib_gsocket.obj &
 	$(OBJS)\netlib_urlmsw.obj
+COREDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
+	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 &
+	$(CPPFLAGS) $(CFLAGS)
 COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
@@ -2581,6 +2602,11 @@ COREDLL_OBJECTS =  &
 	$(OBJS)\coredll_mslu.obj &
 	$(OBJS)\coredll_volume.obj &
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
+	-i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+	-i=..\..\src\expat\lib -dwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg &
@@ -3560,9 +3586,6 @@ $(OBJS)\monodll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -3797,8 +3820,8 @@ $(OBJS)\monodll_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
 $(OBJS)\monodll_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

-$(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
+	$(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<

 $(OBJS)\monodll_urlmsw.obj :  .AUTODEPEND ..\..\src\msw\urlmsw.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4180,8 +4203,8 @@ $(OBJS)\monodll_gdiobj.obj :  .AUTODEPEND ..\..\src\msw\gdiobj.cpp
 !endif

 !ifeq USE_GUI 1
-$(OBJS)\monodll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<
 !endif

 !ifeq USE_GUI 1
@@ -4694,6 +4717,11 @@ $(OBJS)\monodll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5130,9 +5158,6 @@ $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -5367,8 +5392,8 @@ $(OBJS)\monolib_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
 $(OBJS)\monolib_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

-$(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
+	$(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<

 $(OBJS)\monolib_urlmsw.obj :  .AUTODEPEND ..\..\src\msw\urlmsw.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -5750,8 +5775,8 @@ $(OBJS)\monolib_gdiobj.obj :  .AUTODEPEND ..\..\src\msw\gdiobj.cpp
 !endif

 !ifeq USE_GUI 1
-$(OBJS)\monolib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<
 !endif

 !ifeq USE_GUI 1
@@ -6264,6 +6289,11 @@ $(OBJS)\monolib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6700,9 +6730,6 @@ $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

-$(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
 $(OBJS)\basedll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

@@ -6913,9 +6940,6 @@ $(OBJS)\baselib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

-$(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
 $(OBJS)\baselib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

@@ -7153,8 +7177,8 @@ $(OBJS)\netdll_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
 $(OBJS)\netdll_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
 	$(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<

-$(OBJS)\netdll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.cpp
-	$(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+$(OBJS)\netdll_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
+	$(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $<

 $(OBJS)\netdll_urlmsw.obj :  .AUTODEPEND ..\..\src\msw\urlmsw.cpp
 	$(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
@@ -7192,8 +7216,8 @@ $(OBJS)\netlib_socket.obj :  .AUTODEPEND ..\..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj :  .AUTODEPEND ..\..\src\common\url.cpp
 	$(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<

-$(OBJS)\netlib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.cpp
-	$(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+$(OBJS)\netlib_gsocket.obj :  .AUTODEPEND ..\..\src\msw\gsocket.c
+	$(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $<

 $(OBJS)\netlib_urlmsw.obj :  .AUTODEPEND ..\..\src\msw\urlmsw.cpp
 	$(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
@@ -7476,8 +7500,8 @@ $(OBJS)\coredll_gdiobj.obj :  .AUTODEPEND ..\..\src\msw\gdiobj.cpp
 !endif

 !ifeq USE_GUI 1
-$(OBJS)\coredll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+$(OBJS)\coredll_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(COREDLL_CFLAGS) $<
 !endif

 !ifeq USE_GUI 1
@@ -7990,6 +8014,11 @@ $(OBJS)\coredll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\coredll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -8698,8 +8727,8 @@ $(OBJS)\corelib_gdiobj.obj :  .AUTODEPEND ..\..\src\msw\gdiobj.cpp
 !endif

 !ifeq USE_GUI 1
-$(OBJS)\corelib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+$(OBJS)\corelib_gsockmsw.obj :  .AUTODEPEND ..\..\src\msw\gsockmsw.c
+	$(CC) -zq -fo=$^@ $(CORELIB_CFLAGS) $<
 !endif

 !ifeq USE_GUI 1
@@ -9212,6 +9241,11 @@ $(OBJS)\corelib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\corelib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -456,10 +456,6 @@ SOURCE=..\..\src\common\appbase.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\common\clntdata.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\common\cmdline.cpp
 # End Source File
 # Begin Source File
@@ -995,10 +991,6 @@ SOURCE=..\..\include\wx\chkconf.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\clntdata.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -484,6 +484,10 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\clntdata.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
@@ -1953,7 +1957,8 @@ SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\msw\gsockmsw.cpp
+SOURCE=..\..\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File

@@ -8113,6 +8118,10 @@ SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\clntdata.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_dll.dsw
+++ b/build/msw/wx_dll.dsw
@@ -105,9 +105,6 @@ Package=<4>
    Project_Dep_Name adv
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name odbc
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name base
    End Project Dependency
    Begin Project Dependency
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -502,7 +502,8 @@ SOURCE=..\..\src\msw\dummy.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\msw\gsocket.cpp
+SOURCE=..\..\src\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File

--- a/1675
+++ b/1675
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,6 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=5
 WX_RELEASE_NUMBER=2
-WX_SUBRELEASE_NUMBER=3

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -477,7 +476,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_MENUS=no
  DEFAULT_wxUSE_MINIFRAME=no
  DEFAULT_wxUSE_HTML=no
-  DEFAULT_wxUSE_WEBKIT=no
  DEFAULT_wxUSE_FILESYSTEM=no
  DEFAULT_wxUSE_FS_INET=no
  DEFAULT_wxUSE_FS_ZIP=no
@@ -661,7 +659,6 @@ else
  DEFAULT_wxUSE_MENUS=yes
  DEFAULT_wxUSE_MINIFRAME=yes
  DEFAULT_wxUSE_HTML=yes
-  DEFAULT_wxUSE_WEBKIT=yes
  DEFAULT_wxUSE_FILESYSTEM=yes
  DEFAULT_wxUSE_FS_INET=yes
  DEFAULT_wxUSE_FS_ZIP=yes
@@ -726,9 +723,6 @@ else
  DEFAULT_wxUSE_MONOLITHIC=no
  DEFAULT_wxUSE_PLUGINS=no
  DEFAULT_wxUSE_OFFICIAL_BUILD=no
-
-  dnl Appliable only when --with-gtk was used:
-  DEFAULT_wxUSE_GTK2=yes
 fi

 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -777,7 +771,7 @@ AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)

-WX_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], wxUSE_GTK2)
+WX_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2)
 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)

 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
@@ -921,7 +915,6 @@ WX_ARG_ENABLE(mdidoc,      [  --enable-mdidoc         use docview architecture w
 WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
 WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
 WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
-WX_ARG_ENABLE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)

 dnl ---------------------------------------------------------------------------
 dnl PostScript options
@@ -1040,6 +1033,9 @@ fi
 if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
  wxUSE_PRINTING_ARCHITECTURE=no
  wxUSE_DRAG_AND_DROP=no
+  # Generic notebook requires tab dialog
+  DEFAULT_wxUSE_TABDIALOG=yes
+  DEFAULT_wxUSE_SCROLLBAR=no
  DEFAULT_wxUSE_TOOLTIPS=no
  DEFAULT_wxUSE_DRAGIMAGE=no
 fi
@@ -1354,6 +1350,18 @@ AC_PROG_CXX

 AC_LANG_RESTORE

+dnl check if compiler includes /usr/local/include in
+dnl default include files search path.
+AC_MSG_CHECKING([for /usr/local/include in default include path])
+GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
+if test "$GCC" = "yes" ; then
+  echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
+  	sed -n '1,/End of search list\./p' | \
+        grep '^ */usr/local/include$' 2>&1 /dev/null \
+  && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
+fi
+AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
+
 dnl ranlib command
 dnl   defines RANLIB with the appropriate command
 AC_PROG_RANLIB
@@ -1574,7 +1582,7 @@ case "${host}" in
              )
          ])

-          if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
+          if test x"$ac_cv_string_strcasecmp" = "xyes"; then
              AC_DEFINE(HAVE_STRCASECMP_IN_STRINGS_H)
          else
              AC_MSG_ERROR([No case-insensitive string comparison function found.])
@@ -2467,14 +2475,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                    ]
                )
            fi
-                
-            save_CFLAGS="$CFLAGS"
-            save_LIBS="$LIBS"
-            CFLAGS="$CFLAGS $GTK_CFLAGS"
-            LIBS="$LIBS $GTK_LIBS"
-            AC_CHECK_FUNCS([pango_font_family_is_monospace])
-            CFLAGS="$save_CFLAGS"
-            LIBS="$save_LIBS"
        else
            if test "$wxUSE_UNICODE" = "yes"; then
                AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
@@ -2621,28 +2621,20 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
    fi

-    dnl common part of X11 and Motif port checks
-    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
-        dnl use standard macros to check for X headers/libs, this brings
-        dnl support for the standard configure options --x-includes,
-        dnl --x-libraries and --no-x
+    if test "$wxUSE_X11" = 1; then
+        dnl use standard macros to check for X headers/libs, this brings support
+        dnl for the standard configure options --x-includes and --x-libraries
        AC_PATH_XTRA

        if test "$no_x" = "yes"; then
          AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
        fi

-        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE (and
-        dnl also sometimes -RNONE) to X_CFLAGS and X_LIBS respectively, filter
-        dnl this junk out
-        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
-        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"
        AFMINSTALL=afminstall
        COMPILED_X_PROGRAM=0

-    fi
-
-    if test "$wxUSE_X11" = 1; then
        if test "$wxUSE_NANOX" = "yes"; then
            AC_MSG_CHECKING(for MicroWindows/NanoX distribution)
            if test "x$MICROWIN" = x ; then
@@ -2683,13 +2675,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                        AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
                    ]
                )
-                save_CFLAGS="$CFLAGS"
-                save_LIBS="$LIBS"
-                CFLAGS="$CFLAGS $PANGOX_CFLAGS"
-                LIBS="$LIBS $PANGOX_LIBS"
-                AC_CHECK_FUNCS([pango_font_family_is_monospace])
-                CFLAGS="$save_CFLAGS"
-                LIBS="$save_LIBS"
        fi

        wxUSE_UNIVERSAL="yes"
@@ -2708,6 +2693,21 @@ equivalent variable and GTK+ is version 1.2.3 or above.
    fi

    if test "$wxUSE_MOTIF" = 1; then
+        dnl use standard macros to check for X headers/libs, this brings support
+        dnl for the standard configure options --x-includes and --x-libraries
+        AC_PATH_XTRA
+
+        if test "$no_x" = "yes"; then
+          AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
+        fi
+
+        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to
+        dnl X_LIBS and X_CFLAGS respectively -- what for??
+        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
+        AFMINSTALL=afminstall
+        COMPILED_X_PROGRAM=0
+
        AC_MSG_CHECKING(for Motif/Lesstif headers)
        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
        if test "$ac_find_includes" != "" ; then
@@ -2843,7 +2843,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        GUIDIST=MOTIF_DIST
    fi

-    dnl more tests common to X11 and Motif:
    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
        dnl test for external libxpm if we're configured to use it
        if test "$wxUSE_LIBXPM" = "sys"; then
@@ -3128,7 +3127,7 @@ if test "$wxUSE_DISPLAY" = "yes"; then
 dnl ---------------------------------------------------------------------------
 dnl Xinerama (for unix ) - Brian Victor
 dnl ---------------------------------------------------------------------------
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then
        AC_MSG_CHECKING([for Xinerama])
        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
        if test "$ac_find_libraries" != "" ; then
@@ -3266,19 +3265,15 @@ fi

 UNICODE=0
 lib_unicode_suffix=
-wxconfig_filename_unicode="ansi"
 if test "$wxUSE_UNICODE" = "yes"; then
    lib_unicode_suffix=u
-    wxconfig_filename_unicode="unicode"
    UNICODE=1
 fi

 lib_debug_suffix=
-wxconfig_filename_debug="release"
 DEBUG_FLAG=0
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
    lib_debug_suffix=d
-    wxconfig_filename_debug="debug"
    DEBUG_FLAG=1
 fi

@@ -3292,12 +3287,9 @@ WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} |
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"

-WXCONFIG_DATA_FILE="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${wxconfig_filename_unicode}-${wxconfig_filename_debug}-${WX_RELEASE}"
-
 if test "$cross_compiling" = "yes"; then
    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
    TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
-    WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}-${host_alias}"
    HOST_SUFFIX="-${host_alias}"
 fi

@@ -3699,7 +3691,7 @@ fi

 if test "$wxUSE_UNICODE" = yes; then
    dnl also look if we have wide char IO functions
-    AC_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf)
+    AC_CHECK_FUNCS(fputwc wprintf vswprintf)

    dnl MinGW has a vswprintf with a different prototype, and
    dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
@@ -5610,12 +5602,7 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then
 fi

 if test "$wxUSE_EXCEPTIONS" = "yes"; then
-    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        AC_MSG_WARN([--enable-exceptions can't be used with --enable-no_exceptions])
-    else
-        AC_DEFINE(wxUSE_EXCEPTIONS)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except"
-    fi
+    AC_DEFINE(wxUSE_EXCEPTIONS)
 fi

 USE_HTML=0
@@ -5627,28 +5614,6 @@ if test "$wxUSE_HTML" = "yes"; then
        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
    fi
 fi
-if test "$wxUSE_WEBKIT" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
-        old_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS -x objective-c++"
-        AC_CHECK_HEADER([WebKit/HIWebView.h],
-                        [
-                           AC_DEFINE(wxUSE_WEBKIT)
-                           WEBKIT_LINK="-framework WebKit"
-                        ],
-                        [
-                           AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
-                           wxUSE_WEBKIT=no
-                        ],
-                        [#include <Carbon/Carbon.h>])
-        CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_COCOA" = 1; then
-        AC_DEFINE(wxUSE_WEBKIT)
-    else
-        wxUSE_WEBKIT=no
-    fi
-fi
-

 if test "$wxUSE_MENUS" = "yes"; then
    AC_DEFINE(wxUSE_MENUS)
@@ -5773,7 +5738,6 @@ fi

 if test "$wxUSE_SPLASH" = "yes"; then
    AC_DEFINE(wxUSE_SPLASH)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash"
 fi

 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
@@ -5860,10 +5824,7 @@ dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in

 if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes"; then
-       LDFLAGS="$LDFLAGS -framework QuickTime"
-    fi
-    LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework System"
+    LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework WebKit -framework System"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
    LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
@@ -5955,18 +5916,18 @@ fi
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"

 dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
-CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS`
-CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`
+CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
    

-LIBS=`echo $LIBS`
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_ODBC="$ODBC_LINK"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
    EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -6084,41 +6045,38 @@ AC_SUBST(CPPUNIT_LIBS)
 AC_BAKEFILE


-GCC_PRAGMA_FLAGS=""
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then
-    GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
+    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+    CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
    case "${host}" in
        powerpc-*-darwin* )
            dnl Some Apple's GCC version are broken and can't handle the
            dnl pragmas:
-            GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+            CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+            CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
            ;;
        *-*-mingw32* )
            dnl MinGW GCC versions >= 3.2 have problems with
            dnl static member of classes derived from templates
-            dnl in combination with #pragma interface/implementation
+            dnl in combination with #pragme interface/implementation
            dnl (the test case uses 4 files)
-            dnl ... and with exceptions handling (undefined symbols needed
-            dnl to correctly calls dtors when unwinding) as well
-            if test "$wxUSE_STL" = "yes" -o \
-                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
-                    "$wxUSE_NO_RTTI" != "yes"; then
-               AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
+            if test "$wxUSE_STL" = "yes"; then
+               AC_MSG_CHECKING([If this MinGW version needs -DNO_GCC_PRAGMA])
               AC_TRY_COMPILE([],
-                              [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
+                              [#if !(__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
                               #error "Not GCC 3.2 or greater"
                               #endif
                               ],
-                              [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+                              [CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+                               CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
                               AC_MSG_RESULT([yes])],
                              [AC_MSG_RESULT([no])])
            fi
            ;;
    esac
 fi
-CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"


 dnl for convenience, sort the samples in alphabetical order
@@ -6138,7 +6096,6 @@ dnl global options
 AC_SUBST(WX_MAJOR_VERSION_NUMBER)
 AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
-AC_SUBST(WX_SUBRELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
 AC_SUBST(WX_LIBRARY_BASENAME_NOGUI)
@@ -6193,9 +6150,7 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
 AC_SUBST(WXCONFIG_LDFLAGS_GUI)
-AC_SUBST(WXCONFIG_DATA_FILE)
 AC_SUBST(WX_LARGEFILE_FLAGS)
-AC_SUBST(GCC_PRAGMA_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS_CXX)

@@ -6237,6 +6192,7 @@ AC_SUBST(MACRESWXCONFIG)

 dnl other tools
 AC_SUBST(GCC)
+AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
@@ -6263,22 +6219,31 @@ dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_CONFIG_FILES([
            wx-config
-            wx-config-wrapper
            version-script
            Makefile
          ])

 AC_CONFIG_COMMANDS([default],
          [
+            dnl This test is required to make the following idempotent.
+            dnl Otherwise running config.status or rerunning configure
+            dnl would stomp the wx-config link or try to move it onto
+            dnl itself.
+            dnl Use -h instead of -L to test for link (GD)
+            dnl   -h is documented as obsolete under Mac OS X but works
+            dnl   -L is obsolete under Solaris8
+            if test ! -h wx-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config
+            fi
+
            if test ! -d lib; then
              mkdir lib
            fi
            if test ! -d lib/wx; then
              mkdir lib/wx
            fi
-            if test ! -d lib/wx/config; then
-              mkdir lib/wx/config
-            fi
            if test ! -d lib/wx/include; then
              mkdir lib/wx/include
            fi
@@ -6291,24 +6256,9 @@ AC_CONFIG_COMMANDS([default],
            if test -f setup.h; then
              mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
            fi
-            
-            if test -f wx-config; then
-                chmod +x wx-config
-                mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
-                ( cd lib/wx/config ; 
-                  rm -f ${TOOLCHAIN_NAME}
-                  ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
-            fi
-            if test -f wx-config-wrapper; then
-                chmod +x wx-config-wrapper
-                mv -f wx-config-wrapper wx-config
-                rm -f wx${TOOLCHAIN_NAME}-config
-                ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
-            fi
          ],
          [
            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
-            WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
            LN_S="${LN_S}"
          ]
         )
--- a/contrib/build/foldbar/foldbar.bkl
+++ b/contrib/build/foldbar/foldbar.bkl
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="FOLDBAR_SRC">
-        captionbar.cpp
-        foldpanelbar.cpp
-        foldpanelitem.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/foldbar/captionbar.h
-            wx/foldbar/foldpanelbar.h
-            wx/foldbar/foldpanelitem.h
-        </files>
-    </headers>
-
-    <dll id="foldbardll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_FOLDBAR</define>
-        <sources>$(FOLDBAR_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-    
-    <lib id="foldbarlib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(FOLDBAR_SRC)</sources>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">foldbar=foldbarlib+foldbardll</set>
-
-</makefile>
--- a/contrib/build/foldbar/foldbar.dsp
+++ b/contrib/build/foldbar/foldbar.dsp
@@ -1,474 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foldbar" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=foldbar - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "foldbar.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "foldbar.mak" CFG="foldbar - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "foldbar - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25u_foldbar.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 oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25ud_foldbar.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 oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25ud_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25_foldbar.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 oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25d_foldbar.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 oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv252d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv25d_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25u_foldbar.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 oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25ud_foldbar.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 oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25ud_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25_foldbar.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 oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\include" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25d_foldbar.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 oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw252d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw25d_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25u_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25ud_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25ud_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25d_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv25d_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswu" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswu" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25u_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25ud_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25ud_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\msw" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\msw" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\src\foldbar\..\..\..\include" /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25d_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw25d_foldbar.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "foldbar - Win32 DLL Universal Unicode Release"
-# Name "foldbar - Win32 DLL Universal Unicode Debug"
-# Name "foldbar - Win32 DLL Universal Release"
-# Name "foldbar - Win32 DLL Universal Debug"
-# Name "foldbar - Win32 DLL Unicode Release"
-# Name "foldbar - Win32 DLL Unicode Debug"
-# Name "foldbar - Win32 DLL Release"
-# Name "foldbar - Win32 DLL Debug"
-# Name "foldbar - Win32 Universal Unicode Release"
-# Name "foldbar - Win32 Universal Unicode Debug"
-# Name "foldbar - Win32 Universal Release"
-# Name "foldbar - Win32 Universal Debug"
-# Name "foldbar - Win32 Unicode Release"
-# Name "foldbar - Win32 Unicode Debug"
-# Name "foldbar - Win32 Release"
-# Name "foldbar - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/foldbar\captionbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\..\..\..\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/foldbar\foldpanelbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\foldpanelitem.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
--- a/contrib/build/foldbar/foldbar.dsw
+++ b/contrib/build/foldbar/foldbar.dsw
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "foldbar"=foldbar.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/build/foldbar/makefile.bcc
+++ b/contrib/build/foldbar/makefile.bcc
@@ -1,217 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
-	-I..\..\src\foldbar\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FOLDBAR -Hu \
-	-H=$(OBJS)\wxprec_foldbardll.csm $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.obj \
-	$(OBJS)\foldbardll_captionbar.obj \
-	$(OBJS)\foldbardll_foldpanelbar.obj \
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
-	-I..\..\src\foldbar\..\..\include -Hu -H=$(OBJS)\wxprec_foldbarlib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.obj \
-	$(OBJS)\foldbarlib_captionbar.obj \
-	$(OBJS)\foldbarlib_foldpanelbar.obj \
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "1"
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(SHARED)" == "0"
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\bcc_dll$(CFG)
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_bcc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj  $(FOLDBARDLL_OBJECTS)
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,,
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib: $(OBJS)\foldbarlib_dummy.obj  $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(FOLDBARLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) -H $**
-
-$(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) -H $**
-
-$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
--- a/contrib/build/foldbar/makefile.gcc
+++ b/contrib/build/foldbar/makefile.gcc
@@ -1,211 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
-	-Wall -I..\..\src\foldbar\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FOLDBAR \
-	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.o \
-	$(OBJS)\foldbardll_captionbar.o \
-	$(OBJS)\foldbardll_foldpanelbar.o \
-	$(OBJS)\foldbardll_foldpanelitem.o
-FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
-	-Wall -I..\..\src\foldbar\..\..\include $(__EXCEPTIONSFLAG) \
-	$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.o \
-	$(OBJS)\foldbarlib_captionbar.o \
-	$(OBJS)\foldbarlib_foldpanelbar.o \
-	$(OBJS)\foldbarlib_foldpanelitem.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),1)
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_gcc$(VENDORTAG).dll
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(SHARED),0)
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-rtti
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_0 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_0 = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\gcc_dll$(CFG)
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS)
-	$(CXX) -shared -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.a: $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(FOLDBARLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_captionbar.o: ../../src/foldbar/captionbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_captionbar.o: ../../src/foldbar/captionbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-.PHONY: all clean
--- a/contrib/build/foldbar/makefile.vc
+++ b/contrib/build/foldbar/makefile.vc
@@ -1,296 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_4) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-	/I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \
-	/I..\..\src\foldbar\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FOLDBAR \
-	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_foldbardll.pch" $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.obj \
-	$(OBJS)\foldbardll_captionbar.obj \
-	$(OBJS)\foldbardll_foldpanelbar.obj \
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.pdb \
-	$(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-	/I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \
-	/I..\..\src\foldbar\..\..\include $(__EXCEPTIONSFLAG) \
-	$(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_foldbarlib.pch" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.obj \
-	$(OBJS)\foldbarlib_captionbar.obj \
-	$(OBJS)\foldbarlib_foldpanelbar.obj \
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "1"
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = $(__DEBUGINFO)
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(SHARED)" == "0"
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_15_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_15_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_15_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_16 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_16 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_16 = $(__DEBUGINFO)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = T
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_0 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_0 = /GX
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\vc_dll$(CFG)
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_vc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj  $(FOLDBARDLL_OBJECTS)
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  /LIBPATH:$(LIBDIRNAME) @<<
-	$(FOLDBARDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) 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 oleacc.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib: $(OBJS)\foldbarlib_dummy.obj  $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	lib /NOLOGO /OUT:$@ @<<
-	$(FOLDBARLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
--- a/contrib/build/foldbar/makefile.wat
+++ b/contrib/build/foldbar/makefile.wat
@@ -1,271 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-__foldbardll___depname =
-!ifeq SHARED 1
-__foldbardll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__foldbarlib___depname =
-!ifeq SHARED 0
-__foldbarlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_dll$(CFG)
-!endif
-
-### Variables: ###
-
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
-	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) -i=..\..\src\foldbar\..\..\..\include &
-	-i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\include -dWXUSINGDLL &
-	-dWXMAKINGDLL_FOLDBAR /fh=$(OBJS)\wxprec_foldbardll.pch &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  &
-	$(OBJS)\foldbardll_dummy.obj &
-	$(OBJS)\foldbardll_captionbar.obj &
-	$(OBJS)\foldbardll_foldpanelbar.obj &
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=..\..\src\foldbar\..\..\..\include -i=$(SETUPHDIR) &
-	-i=..\..\src\foldbar\..\..\include /fh=$(OBJS)\wxprec_foldbarlib.pch &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  &
-	$(OBJS)\foldbarlib_dummy.obj &
-	$(OBJS)\foldbarlib_captionbar.obj &
-	$(OBJS)\foldbarlib_foldpanelbar.obj &
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar_wat$(VENDORTAG).dll :  $(FOLDBARDLL_OBJECTS)
-	@%create $(OBJS)\foldbardll.lbc
-	@%append $(OBJS)\foldbardll.lbc option quiet
-	@%append $(OBJS)\foldbardll.lbc name $^@
-	@%append $(OBJS)\foldbardll.lbc option caseexact
-	@%append $(OBJS)\foldbardll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i
-	@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).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  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
-	@%append $(OBJS)\foldbardll.lbc
-	@%append $(OBJS)\foldbardll.lbc system nt_dll
-	wlink @$(OBJS)\foldbardll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib :  $(FOLDBARLIB_OBJECTS)
-	@%create $(OBJS)\foldbarlib.lbc
-	@for %i in ($(FOLDBARLIB_OBJECTS)) do @%append $(OBJS)\foldbarlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\foldbarlib.lbc
-!endif
-
-$(OBJS)\foldbardll_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
--- a/contrib/build/net/net.bkl
+++ b/contrib/build/net/net.bkl
@@ -26,12 +26,10 @@
        <sources>$(NETUTILS_SRC)</sources>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
-        <cppflags-dmars>-w3</cppflags-dmars>
    </dll>
    
    <lib id="netutilslib" template="wx_contrib_lib" cond="SHARED=='0'">
        <sources>$(NETUTILS_SRC)</sources>
-        <cppflags-dmars>-w3</cppflags-dmars>
    </lib>
    
    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilslib+netutilsdll</set>
--- a/contrib/include/wx/deprecated/treelay.h
+++ b/contrib/include/wx/deprecated/treelay.h
@@ -83,7 +83,7 @@ protected:
    long          m_ySpacing;
    long          m_topMargin;
    long          m_leftMargin;
-    bool          m_orientation; // true for top-to-bottom, false for left-to-right
+    bool          m_orientation; // TRUE for top-to-bottom, FALSE for left-to-right
    
 private:
    DECLARE_ABSTRACT_CLASS(wxTreeLayout)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -7,7 +7,7 @@
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __CONTROLBAR_G__
@@ -142,7 +142,7 @@ public:

    wxFrameLayout( wxWindow* pParentFrame,
                   wxWindow* pFrameClient = NULL,
-                   bool      activateNow  = true );
+                   bool      activateNow  = TRUE );

        // Destructor. It does not destroy the bar windows.

@@ -150,7 +150,7 @@ public:

        // Enables floating behaviour. By default floating of control bars is on.

-    virtual void EnableFloating( bool enable = true );
+    virtual void EnableFloating( bool enable = TRUE );

        // Activate can be called after some other layout has been deactivated,
        // and this one must take over the current contents of the frame window.
@@ -223,10 +223,10 @@ public:

        // name is a name by which the bar can be referred in layout customization dialogs.

-        // If spyEvents is true, input events for the bar should be "spyed" in order
+        // If spyEvents is TRUE, input events for the bar should be "spyed" in order
        // to forward unhandled mouse clicks to the frame layout, for example to enable
        // easy draggablity of toolbars just by clicking on their interior regions.
-        // For widgets like text/tree control this value should be false,
+        // For widgets like text/tree control this value should be FALSE,
        // since there's no certain way to detect  whether the event was actually handled.

        // state is the initial state, such as wxCBAR_DOCKED_HORIZONTALLY,
@@ -240,7 +240,7 @@ public:
                         int rowNo        = 0,
                         int columnPos    = 0,
                         const wxString& name = wxT("bar"),
-                         bool spyEvents    = false,
+                         bool spyEvents    = FALSE,
                         int state        = wxCBAR_DOCKED_HORIZONTALLY
                       );

@@ -250,7 +250,7 @@ public:
        // To dock a bar which is floating, use the wxFrameLayout::DockBar method.

    virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,
-                            cbDockPane* pToPane = NULL, bool updateNow = true );
+                            cbDockPane* pToPane = NULL, bool updateNow = TRUE );

        // Finds the bar in the framelayout, by name.

@@ -284,7 +284,7 @@ public:

        // Recalculates the layout of panes, and all bars/rows in each pane.

-    virtual void RecalcLayout( bool repositionBarsNow = false );
+    virtual void RecalcLayout( bool repositionBarsNow = FALSE );

        // Returns the client height.

@@ -331,7 +331,7 @@ public:

        // Recalculates layout and performs on-screen update of all panes.

-    void RefreshNow( bool recalcLayout = true );
+    void RefreshNow( bool recalcLayout = TRUE );

        // Event handler for a size event.

@@ -565,7 +565,7 @@ public: /* protected really (accessed only by plugins) */
                    cbDockPane** ppPane );


-        // Returns true if the position is within the given pane.
+        // Returns TRUE if the position is within the given pane.

    bool HitTestPane( cbDockPane* pPane, int x, int y );

@@ -600,7 +600,7 @@ public: /* protected really (accessed only by plugins) */

    void HookUpToFrame();

-        // Returns true if the platform allows reparenting. This may not return true
+        // Returns TRUE if the platform allows reparenting. This may not return TRUE
        // for all platforms. Reparenting allows control bars to be floated.

    bool CanReparent();
@@ -659,7 +659,7 @@ public:

    wxObject*  mpCustomData; // any custom data stored by specific updates mgr.

-        // Default constructor. Is-dirty flag is set true initially.
+        // Default constructor. Is-dirty flag is set TRUE initially.

    cbUpdateMgrData();

@@ -669,7 +669,7 @@ public:

        // Set the dirty flag.

-    void SetDirty( bool isDirty = true );
+    void SetDirty( bool isDirty = TRUE );

        // Set custom data.

@@ -751,8 +751,8 @@ public:

    int    mHorizGap;    // NOTE:: gaps are given in frame's coord. orientation

-    // true, if vertical/horizontal dimensions cannot be mannualy adjusted
-    //       by user using resizing handles. If false, the frame-layout
+    // TRUE, if vertical/horizontal dimensions cannot be mannualy adjusted
+    //       by user using resizing handles. If FALSE, the frame-layout
    //       *automatically* places resizing handles among not-fixed bars

    bool   mIsFixed;
@@ -766,8 +766,8 @@ public:
    cbDimInfo(void);

        // Constructor.
-        // isFixed is true if vertical/horizontal dimensions cannot be manually adjusted
-        // by the user using resizing handles. If false, the frame-layout
+        // isFixed is TRUE if vertical/horizontal dimensions cannot be manually adjusted
+        // by the user using resizing handles. If FALSE, the frame-layout
        // automatically places resizing handles among bars that do are not fixed.

    cbDimInfo( cbBarDimHandlerBase* pDimHandler,
@@ -796,7 +796,7 @@ public:
               int dv_x, int dv_y,
               int f_x,  int f_y,

-               bool isFixed  = true,
+               bool isFixed  = TRUE,
               int  horizGap = 6,
               int  vertGap  = 6,

@@ -806,7 +806,7 @@ public:
        // Constructor.

    cbDimInfo( int x, int y,
-               bool isFixed  = true,
+               bool isFixed  = TRUE,
               int  gap = 6,
               cbBarDimHandlerBase* pDimHandler = NULL
             );
@@ -943,11 +943,11 @@ public:

    ~cbBarInfo();

-        // Returns true if this bar is fixed.
+        // Returns TRUE if this bar is fixed.

    inline bool IsFixed() const { return mDimInfo.mIsFixed; }

-        // Returns true if this bar is expanded.
+        // Returns TRUE if this bar is expanded.

    inline bool IsExpanded() const { return this == mpRow->mpExpandedBar; }
 };
@@ -983,7 +983,7 @@ public:

    void Reset();

-        // Advances the iterator and returns true if a bar is available.
+        // Advances the iterator and returns TRUE if a bar is available.

    bool Next();

@@ -1118,7 +1118,7 @@ public: /* protected really (accessed only by plugins) */

    void SyncRowFlags( cbRowInfo* pRow );

-        // Returns true if the bar's dimension information indicates a fixed size.
+        // Returns TRUE if the bar's dimension information indicates a fixed size.
        // Internal function called by plugins.

    bool IsFixedSize( cbBarInfo* pInfo );
@@ -1133,22 +1133,22 @@ public: /* protected really (accessed only by plugins) */

    int GetRowY( cbRowInfo* pRow );

-        // Returns true if there are any variable-sized rows above this one.
+        // Returns TRUE if there are any variable-sized rows above this one.
        // Internal function called by plugins.

    bool HasNotFixedRowsAbove( cbRowInfo* pRow );

-        // Returns true if there are any variable-sized rows below this one.
+        // Returns TRUE if there are any variable-sized rows below this one.
        // Internal function called by plugins.

    bool HasNotFixedRowsBelow( cbRowInfo* pRow );

-        // Returns true if there are any variable-sized rows to the left of this one.
+        // Returns TRUE if there are any variable-sized rows to the left of this one.
        // Internal function called by plugins.

    bool HasNotFixedBarsLeft ( cbBarInfo* pBar );

-        // Returns true if there are any variable-sized rows to the right of this one.
+        // Returns TRUE if there are any variable-sized rows to the right of this one.
        // Internal function called by plugins.

    bool HasNotFixedBarsRight( cbBarInfo* pBar );
@@ -1203,7 +1203,7 @@ public: /* protected really (accessed only by plugins) */

    void PaneToFrame( wxRect* pRect );

-        // Returns true if pos is within the given rectangle.
+        // Returns TRUE if pos is within the given rectangle.
        // Internal function called by plugins.

    inline bool HasPoint( const wxPoint& pos, int x, int y, int width, int height );
@@ -1368,7 +1368,7 @@ public: /* public members */

        { return mRows.GetCount() ? mRows[0] : NULL; }

-        // Returns true if the given bar is present in this pane.
+        // Returns TRUE if the given bar is present in this pane.

    bool BarPresent( cbBarInfo* pBar );

@@ -1381,11 +1381,11 @@ public: /* public members */

    int GetAlignment();

-        // Returns true if the given mask matches the pane's mask.
+        // Returns TRUE if the given mask matches the pane's mask.

    bool MatchesMask( int paneMask );

-        // Returns true if the pane is aligned to the top or bottom.
+        // Returns TRUE if the pane is aligned to the top or bottom.

    inline bool IsHorizontal()
    {
@@ -1660,31 +1660,31 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)

 // Macros for creating event table entries for plugin-events.

-#define EVT_PL_LEFT_DOWN(func)   wxEventTableEntry( cbEVT_PL_LEFT_DOWN,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_UP(func)     wxEventTableEntry( cbEVT_PL_LEFT_UP,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler     ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_DOWN(func)  wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_UP(func)    wxEventTableEntry( cbEVT_PL_RIGHT_UP,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_MOTION(func)      wxEventTableEntry( cbEVT_PL_MOTION,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler     ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_DCLICK(func) wxEventTableEntry( cbEVT_PL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DOWN(func)             wxEventTableEntry( cbEVT_PL_LEFT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler        ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_UP(func)             wxEventTableEntry( cbEVT_PL_LEFT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler          ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_DOWN(func)             wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_UP(func)             wxEventTableEntry( cbEVT_PL_RIGHT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler         ) & func, (wxObject *) NULL ),
+#define EVT_PL_MOTION(func)                 wxEventTableEntry( cbEVT_PL_MOTION,                 -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler          ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DCLICK(func)         wxEventTableEntry( cbEVT_PL_LEFT_DCLICK,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler      ) & func, (wxObject *) NULL ),

-#define EVT_PL_LAYOUT_ROW(func)   wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_ROW(func)   wxEventTableEntry( cbEVT_PL_RESIZE_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_LAYOUT_ROWS(func)  wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_INSERT_BAR(func)   wxEventTableEntry( cbEVT_PL_INSERT_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_BAR(func)   wxEventTableEntry( cbEVT_PL_RESIZE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_REMOVE_BAR(func)   wxEventTableEntry( cbEVT_PL_REMOVE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_SIZE_BAR_WND(func) wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_LAYOUT_ROW(func)             wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_ROW(func)             wxEventTableEntry( cbEVT_PL_RESIZE_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_LAYOUT_ROWS(func)         wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler      ) & func, (wxObject *) NULL ),
+#define EVT_PL_INSERT_BAR(func)             wxEventTableEntry( cbEVT_PL_INSERT_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_BAR(func)             wxEventTableEntry( cbEVT_PL_RESIZE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_REMOVE_BAR(func)             wxEventTableEntry( cbEVT_PL_REMOVE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler       ) & func, (wxObject *) NULL ),
+#define EVT_PL_SIZE_BAR_WND(func)         wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler      ) & func, (wxObject *) NULL ),

-#define EVT_PL_DRAW_BAR_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_DECOR(func)    wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_BAR_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_BKGROUND(func) wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_BAR_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_BAR_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_BKGROUND(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),

-#define EVT_PL_START_BAR_DRAGGING(func) wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_HINT_RECT(func)     wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_START_BAR_DRAGGING(func)  wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_HINT_RECT(func)      wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),


 #define EVT_PL_START_DRAW_IN_AREA(func)  wxEventTableEntry( cbEVT_PL_START_DRAW_IN_AREA,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartDrawInAreaHandler)  & func, (wxObject *) NULL ),
@@ -1713,7 +1713,7 @@ public:

    int            mPaneMask;

-        // Is true when plugin is ready to handle events.
+        // Is TRUE when plugin is ready to handle events.

    bool           mIsReady;

@@ -1724,7 +1724,7 @@ public:

        : mpLayout  ( 0 ),
          mPaneMask( wxALL_PANES ),
-          mIsReady ( false )
+          mIsReady ( FALSE )
    {}

        // Constructor taking layout panel and a mask.
@@ -1733,7 +1733,7 @@ public:

        : mpLayout  ( pPanel ),
          mPaneMask( paneMask ),
-          mIsReady ( false )
+          mIsReady ( FALSE )
    {}

        // Returns the pane mask.
@@ -1748,9 +1748,9 @@ public:
        // At this point plugin is already attached to the frame layout,
        // and pane masks are set.

-    virtual void OnInitPlugin() { mIsReady = true; }
+    virtual void OnInitPlugin() { mIsReady = TRUE; }

-        // Returns true if the plugin is ready to receive events.
+        // Returns TRUE if the plugin is ready to receive events.

    bool IsReady() { return mIsReady; }

--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -148,13 +148,13 @@ public:
    virtual void AddTool( int toolIndex,
                              const wxString& imageFileName,
                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = wxT(""), bool alignTextRight = false,
-                              bool isFlat = true );
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );
        // Adds a tool. See the documentation for wxToolBar for details.

    virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = wxT(""), bool alignTextRight = false,
-                              bool isFlat = true );
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );

        // Unhide method from parent.

@@ -166,7 +166,7 @@ public:
    // See the documentation for wxToolBar for details.

    virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-               const bool toggle = false, const long xPos = wxDefaultCoord, const long yPos = wxDefaultCoord, wxObject *clientData = NULL,
+               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));

        // Adds a separator. See the documentation for wxToolBar for details.
@@ -209,7 +209,7 @@ public:

        // Enables or disables the given tool.

-    virtual void EnableTool(int toolIndex, bool enable = true);
+    virtual void EnableTool(int toolIndex, bool enable = TRUE);

        // Responds to size events, calling Layout.

--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -63,7 +63,7 @@ public:
    void CreateLayout();
    wxFrameLayout* GetLayout();
    void SetLayout( wxFrameLayout* pLayout );
-    void SetToolUpdates( bool doToolUpdates = true );
+    void SetToolUpdates( bool doToolUpdates = TRUE );


    // hooks for specific frame-views
@@ -123,7 +123,7 @@ public:

    int GetActiveViewNo();
    wxFrameView* GetActiveView();
-    wxObjectList::compatibility_iterator GetActiveViewNode();
+    wxNode* GetActiveViewNode();

    wxFrameView* GetView( int viewNo );

--- a/contrib/include/wx/fl/garbagec.h
+++ b/contrib/include/wx/fl/garbagec.h
@@ -25,7 +25,7 @@ struct GCItem
    wxList    mRefs;   // references to other nodes
 };

-inline void* gc_node_to_obj( wxObjectList::compatibility_iterator pGCNode )
+inline void* gc_node_to_obj( wxNode* pGCNode )
 {
    return ( (GCItem*) (pGCNode->GetData()) )->mpObj;
 }
--- a/contrib/include/wx/fl/hintanimpl.h
+++ b/contrib/include/wx/fl/hintanimpl.h
@@ -55,8 +55,8 @@ public:

    int    mInClientHintBorder; // default: 4 pixels

-    bool   mAccelerationOn;     // true, if morph accelerates, otherwise morph
-                                // speed is constant. Default: true
+    bool   mAccelerationOn;     // TRUE, if morph accelerates, otherwise morph
+                                // speed is constant. Default: TRUE

    // TBD:: get/set methods for above members

--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -63,7 +63,7 @@ protected:
                            // labels for particular state

    wxBitmap mFocusedBmp;   // may not be always present -
-                            // only if mHasFocusedBmp is true
+                            // only if mHasFocusedBmp is TRUE

    wxBitmap* mpDepressedImg;
    wxBitmap* mpPressedImg;
@@ -104,7 +104,7 @@ protected:
                            wxPen& upperLeftSidePen,
                            wxPen& lowerRightSidePen );

-        // Returns true if the given point is in the window.
+        // Returns TRUE if the given point is in the window.
    bool IsInWindow( int x, int y );

    virtual void OnIdle(wxIdleEvent& event);
@@ -117,13 +117,13 @@ public:
    wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
                       const wxString& labelText   = wxT(""),
                       int   alignText             = NB_ALIGN_TEXT_BOTTOM,
-                       bool  isFlat                = true,
+                       bool  isFlat                = TRUE,
                       // this is the default type of fired events
                       int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                       int marginX        = NB_DEFAULT_MARGIN,
                       int marginY        = NB_DEFAULT_MARGIN,
                       int textToLabelGap = 2,
-                       bool isSticky      = false
+                       bool isSticky      = FALSE
                     );

        // Use this constructor if buttons have to be persistant
@@ -131,13 +131,13 @@ public:
                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
                           const wxString& labelText      = wxT(""),
                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
-                           bool  isFlat                   = true,
+                           bool  isFlat                   = TRUE,
                           // this is the default type of fired events
                           int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                           int marginX        = NB_DEFAULT_MARGIN,
                           int marginY        = NB_DEFAULT_MARGIN,
                           int textToLabelGap = 2,
-                           bool isSticky      = false
+                           bool isSticky      = FALSE
                             );

        // Destructor.
@@ -169,8 +169,8 @@ public:

        // Renders the label image.
    virtual void RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, 
-                                   bool isEnabled = true,
-                                   bool isPressed = false);
+                                   bool isEnabled = TRUE,
+                                   bool isPressed = FALSE);

        // Renders label images.
    virtual void RenderLabelImages();
--- a/contrib/include/wx/fl/rowlayoutpl.h
+++ b/contrib/include/wx/fl/rowlayoutpl.h
@@ -6,7 +6,7 @@
 // Created:     02/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __ROWLAYOUTPL_G__
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -186,7 +186,7 @@ public:
        // Set the position of the button.
    void SetPos( const wxPoint& pos );

-        // Returns true if the given position was over the button.
+        // Returns TRUE if the given position was over the button.
    bool HitTest( const wxPoint& pos );

        // Responds to a left down event.
@@ -205,7 +205,7 @@ public:
        // the desired appearance.
    virtual void Draw( wxDC& dc );

-        // Returns true if the button was clicked.
+        // Returns TRUE if the button was clicked.
    bool WasClicked();

        // Reset the button.
@@ -214,7 +214,7 @@ public:
        // Enable or disable the button.
    void Enable( bool enable ) { mEnabled = enable; }

-        // Returns true if this button is pressed.
+        // Returns TRUE if this button is pressed.
    bool IsPressed() { return mPressed; }
 };

--- a/contrib/include/wx/fl/updatesmgr.h
+++ b/contrib/include/wx/fl/updatesmgr.h
@@ -6,7 +6,7 @@
 // Created:     19/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __UPDATESMGR_G__
--- a/contrib/include/wx/foldbar/captionbar.h
+++ b/contrib/include/wx/foldbar/captionbar.h
@@ -1,465 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        captionbar.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __FOLDPANELBAR_H__
-#define __FOLDPANELBAR_H__
-
-#define wxFPB_EXTRA_X 10
-#define wxFPB_EXTRA_Y 4
-#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be alligned from the right filled with space
-
-enum
-{
-    /** Specifies the bars as gradient vertical filled caption bars going from top to bottom. The gradient 
-        starts with first colour, and ends with second colour */
-    wxCAPTIONBAR_GRADIENT_V = 1,
-    /** Specifies the gradient going from left to right. The gradient starts with first colour, and 
-        ends with second colour on the right */
-    wxCAPTIONBAR_GRADIENT_H,
-    /** Fills the captionbar with a single colour. The first colour is used for this fill */
-    wxCAPTIONBAR_SINGLE,
-    /** Draws a rectangle only using the second colour. The first colour is not used*/
-    wxCAPTIONBAR_RECTANGLE,
-    /** Fills the captionbar with a single colour (first colour) and draws a rectangle around it 
-        using the second colour. */
-    wxCAPTIONBAR_FILLED_RECTANGLE
-};
-
-/** \class wxCaptionBarStyle
-    This class encapsulates the styles you wish to set for the wxCaptionBar (this is the part of the wxFoldPanel 
-    where the caption is displayed). It can either be applied at creation time be reapplied when styles need to 
-    be changed. 
-    
-    At construction time, all styles are set to their default transparency. This means none of the styles will be 
-    applied to the wxCaptionBar in question, meaning it will be created using the default internals. When setting i.e
-    the color, font or panel style, these styles become active to be used. 
-*/
-class wxCaptionBarStyle
-{
-private:
-    // boolean flags for default transparency on styles
-    bool _firstColourUsed, 
-         _secondColourUsed,
-         _textColourUsed, 
-         _captionFontUsed, 
-         _captionStyleUsed;
-
-    wxFont _captionFont;
-    wxColour _firstColour, _secondColour, _textColour;
-
-    int _captionStyle;
-
-public:
-    /** Default constructor for this class */
-    wxCaptionBarStyle() {
-        ResetDefaults();
-    };
-
-    ~wxCaptionBarStyle() {
-
-    };
-
-    void ResetDefaults() {
-        _firstColourUsed = false;
-        _secondColourUsed = false;
-        _textColourUsed = false;
-        _captionFontUsed = false;
-        _captionStyleUsed = false;
-        _captionStyle = wxCAPTIONBAR_GRADIENT_V;
-    };
-        
-    /** Copy operator. Only the styles in use in the source object are being copied to the destination object. All other 
-        styles are not copied */
-    void operator=(const wxCaptionBarStyle &s) {
-        if(s._captionStyleUsed)
-        {
-            _captionStyleUsed = true;
-            _captionStyle = s._captionStyle;
-        }
-        if(s._captionFontUsed)
-        {
-            _captionFontUsed = true;
-            _captionFont = s._captionFont;
-        }
-        if(s._firstColourUsed)
-        {
-            _firstColourUsed = true;
-            _firstColour = s._firstColour;
-        }
-        if(s._secondColourUsed)
-        {
-            _secondColourUsed = true;
-            _secondColour = s._secondColour;
-        }
-        if(s._textColourUsed)
-        {
-            _textColourUsed = true;
-            _textColour = s._textColour;
-        }
-    };
-
-    // ------- CaptionBar Font -------
-
-    /** Set font for the caption bar. If this is not set, the font property is undefined
-        and will not be used. Use CaptionFontUsed() to check if this style is used */
-    void SetCaptionFont(const wxFont &font) {
-        _captionFont = font;
-        _captionFontUsed = true;
-    };
-
-    /** Checks if the caption bar font is set */
-    bool CaptionFontUsed() const {
-        return _captionFontUsed;
-    };
-
-    /** Returns the font for the caption bar. Please be warned this will result in an assertion failure when
-        this property is not previously set 
-        \sa SetCaptionFont(), CaptionFontUsed() */
-    wxFont GetCaptionFont() const {
-        wxASSERT(_captionFontUsed);
-        return _captionFont;
-    };
-
-    // ------- FirstColour -------
-
-    /** Set first colour for the caption bar. If this is not set, the colour property is 
-        undefined and will not be used. Use FirstColourUsed() to check if this 
-        style is used */
-    void SetFirstColour(const wxColour &col) {
-        _firstColour = col;
-        _firstColourUsed = true;
-    };
-
-    /** Checks if the first colour of the caption bar is set */
-    bool FirstColourUsed() const {
-        return _firstColourUsed;
-    };
-
-    /** Returns the first colour for the caption bar. Please be warned this will 
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionFirstColour(), CaptionFirstColourUsed() */
-    wxColour GetFirstColour() const {
-        wxASSERT(_firstColourUsed);
-        return _firstColour;
-    };
-
-    // ------- SecondColour -------
-
-    /** Set second colour for the caption bar. If this is not set, the colour property is undefined and 
-        will not be used. Use SecondColourUsed() to check if this style is used */
-    void SetSecondColour(const wxColour &col) {
-        _secondColour = col;
-        _secondColourUsed = true;
-    };
-
-    /** Checks if the second colour of the caption bar is set */
-    bool SecondColourUsed() const {
-        return _secondColourUsed;
-    };
-
-    /** Returns the second colour for the caption bar. Please be warned this will result in 
-        an assertion failure when this property is not previously set.
-        \sa SetSecondColour(), SecondColourUsed() */
-    wxColour GetSecondColour() const {
-        wxASSERT(_secondColourUsed);
-        return _secondColour;
-    };
-
-    // ------- Caption Text Colour -------
-
-    /** Set caption colour for the caption bar. If this is not set, the colour property is 
-        undefined and will not be used. Use CaptionColourUsed() to check if this style is used */
-    void SetCaptionColour(const wxColour &col) {
-        _textColour = col;
-        _textColourUsed = true;
-    };
-
-    /** Checks if the caption colour of the caption bar is set */
-    bool CaptionColourUsed() const {
-        return _textColourUsed;
-    };
-
-    /** Returns the caption colour for the caption bar. Please be warned this will 
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionColour(), CaptionColourUsed() */
-    wxColour GetCaptionColour() const {
-        wxASSERT(_textColourUsed);
-        return _textColour;
-    };
-
-    // ------- CaptionStyle  -------
-
-    /** Set caption style for the caption bar. If this is not set, the property is 
-        undefined and will not be used. Use CaptionStyleUsed() to check if this style is used. 
-        The following styles can be applied:
-        - wxCAPTIONBAR_GRADIENT_V: Draws a vertical gradient from top to bottom
-        - wxCAPTIONBAR_GRADIENT_H: Draws a horizontal gradient from left to right
-        - wxCAPTIONBAR_SINGLE: Draws a single filled rectangle to draw the caption
-        - wxCAPTIONBAR_RECTANGLE: Draws a single colour with a rectangle around the caption
-        - wxCAPTIONBAR_FILLED_RECTANGLE: Draws a filled rectangle and a border around it
-    */
-    void SetCaptionStyle(int style) {
-        _captionStyle = style;
-        _captionStyleUsed = true;
-    };
-
-    /** Checks if the caption style of the caption bar is set */
-    bool CaptionStyleUsed() const {
-        return _captionStyleUsed;
-    };
-
-    /** Returns the caption style for the caption bar. Please be warned this will 
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionStyle(), CaptionStyleUsed() */
-    int GetCaptionStyle() const {
-        wxASSERT(_captionStyleUsed);
-        return _captionStyle;
-    };
-};
-
-#ifndef _NO_CAPTIONBAR_
-
-/** \class wxCaptionBar
-    This class is a graphical caption component that consists of a caption and a clickable arrow.
-    
-    The wxCaptionBar fires an event EVT_CAPTIONBAR which is a wxCaptionBarEvent. This event can be caught
-    and the parent window can act upon the collapsed or expanded state of the bar (which is actually just
-    the icon which changed). The parent panel can reduce size or expand again.
-*/
-
-#include <wx/imaglist.h>
-
-/** Defines an empty captionbar style */
-#define wxEmptyCaptionBarStyle wxCaptionBarStyle()
-
-class wxCaptionBar: public wxWindow
-{
-private:
-    wxString _caption;
-    wxImageList *_foldIcons;
-    wxSize _oldSize;
-    //wxFont _captionFont;
-    int _rightIndent;
-    int _iconWidth, _iconHeight;
-    //int _captionStyle;
-
-    //wxColour _firstColour, _secondColour, _textColour;
-
-    /** True when the caption is in collapsed state (means at the bottom of the wxFoldPanel */
-    bool _collapsed;
-
-    wxCaptionBarStyle _style;
-
-    /** Fills the background of the caption with either a gradient, or a solid color */
-    void FillCaptionBackground(wxPaintDC &dc);
-
-    /* Draw methods */
-    void DrawHorizontalGradient(wxDC &dc, const wxRect &rect );
-    void DrawVerticalGradient(wxDC &dc, const wxRect &rect );
-    void DrawSingleColour(wxDC &dc, const wxRect &rect );
-    void DrawSingleRectangle(wxDC &dc, const wxRect &rect );
-
-    void RedrawIconBitmap();
-
-    void ApplyCaptionStyle(const wxCaptionBarStyle &cbstyle, bool applyDefault);
-
-public:
-    /** Constructor of wxCaptionBar. To create a wxCaptionBar with the arrow images, simply pass an image list
-        which contains at least two bitmaps. The bitmaps contain the expanded and collapsed icons needed to 
-        represent it's state. If you don't want images, simply pass a null pointer and the bitmap is disabled. */
-    wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images, 
-                 wxWindowID id = wxID_ANY, const wxCaptionBarStyle &cbstyle = wxEmptyCaptionBarStyle,
-                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
-
-    ~wxCaptionBar();
-
-    /** Set wxCaptionBar styles with wxCapionBarSyle class. All styles that are actually set, are applied. If you 
-        set applyDefault to true, all other (not defined) styles will be set to default. If it is false,
-        the styles which are not set in the wxCaptionBarStyle will be ignored */
-    void SetCaptionStyle(bool applyDefault, wxCaptionBarStyle style = wxEmptyCaptionBarStyle) {
-        ApplyCaptionStyle(style, applyDefault);
-        Refresh();
-    };
-    
-    /** Returns the current style of the captionbar in a wxCaptionBarStyle class. This can be used to change and set back the 
-        changes. */
-    wxCaptionBarStyle GetCaptionStyle() {
-        return _style;
-    };
-
-#if 0
-    /** Sets a pointer to an image list resource (a non owned pointer) to the collapsed and expand icon bitmap.
-        The reason why it will be assigned a pointer is that it is very likely that multiple caption bars will 
-        be used and if they all have their own bitmap resources it will eat up more memory then needed. It will
-        also ease the use of shared icon change, when there is any need to.
-        
-        If no wxImageList is assigned, there will be no fold icons and only the doubleclick on the panel 
-        will work to collapse / expand. 
-        
-        The image list must contain 2 bitmaps. Index 0 will be the expanded state, and index 1 will be the 
-        collapsed state of the bitmap. The size of the bitmap is taken in account when the minimal height and
-        widht is calculated.
-
-        The bitmaps must be the second thing to be done before using it (SetRightIndent should be the first thing),
-        make sure if the icons are larger than the font, that the parent of this window gets a Fit call to resize
-        all the windows accordingly */
-
-    void SetFoldIcons(wxImageList *images) {
-        _foldIcons = images;
-        _iconWidth = _iconHeight = 0;
-        if(_foldIcons)
-            _foldIcons->GetSize(0, _iconWidth, _iconHeight);
-
-        Refresh();
-    };
-
-#endif
-
-    /** Returns wether the status of the bar is expanded or collapsed */
-    bool IsCollapsed() const {
-        return _collapsed;
-    };
-
-    /** Sets the amount of pixels on the right from which the bitmap is trailing. If this is 0, it will be 
-        drawn all the way to the right, default is equal to wxFPB_BMP_RIGHTSPACE. Assign this before 
-        assigning an image list to prevent a redraw */
-
-    void SetRightIndent(int pixels) {
-        wxCHECK2(pixels >= 0, return);
-        _rightIndent = pixels;
-        // issue a refresh (if we have a bmp)
-        if(_foldIcons)
-            Refresh();
-    };
-
-
-    /** Return the best size for this panel, based upon the font assigned to this window, and the 
-        caption string */
-    wxSize DoGetBestSize() const;
-
-    /** This sets the internal state / representation to collapsed. This does not trigger a wxCaptionBarEvent
-        to be sent to the parent */
-    void Collapse() {
-        _collapsed = true;
-        RedrawIconBitmap();
-    };
-
-    /** This sets the internal state / representation to expanded. This does not trigger a wxCaptionBarEvent
-        to be sent to the parent */
-    void Expand() {
-        _collapsed = false;
-        RedrawIconBitmap();
-    };
-
-    void SetBoldFont() {
-        GetFont().SetWeight(wxBOLD);
-    };
-
-    void SetNormalFont() {
-        GetFont().SetWeight(wxNORMAL);
-    };
-
-
-private:
-    /** The paint event for flat or gradient fill */
-    void OnPaint(wxPaintEvent& event);
-        
-    /** For clicking the icon, the mouse event must be intercepted */
-    void OnMouseEvent(wxMouseEvent& event);
-    
-    /** Maybe when focus (don't know how yet) a cursor left or backspace will collapse or expand */
-    void OnChar(wxKeyEvent& event);
-
-    void OnSize(wxSizeEvent &event);
-
-
-protected:
-    DECLARE_NO_COPY_CLASS(wxCaptionBar)
-    DECLARE_EVENT_TABLE()
-};
-
-/***********************************************************************************************************/
-
-/** \class wxCaptionBarEvent
-    This event will be sent when a EVT_CAPTIONBAR is mapped in the parent. It is to notify the parent 
-    that the bar is now in collapsed or expanded state. The parent should re-arrange the associated
-    windows accordingly */
-
-class WXDLLEXPORT wxCaptionBarEvent : public wxCommandEvent
-{
-
-private:
-    bool _collapsed;
-    wxCaptionBar *_bar;
-    void *_tag;
-
-public:
-    wxCaptionBarEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-        : wxCommandEvent(commandType, id)
-        , _collapsed(false)
-        , _bar(0) 
-        , _tag(0)
-    { }
-    
-    /** Constructor for clone copy */
-    wxCaptionBarEvent(const wxCaptionBarEvent &event);
-    
-    /** Clone function */
-    virtual wxEvent *Clone() const {
-        return new wxCaptionBarEvent(*this);
-    };
-
-    /** Returns wether the bar is expanded or collapsed. True means expanded */
-    bool GetFoldStatus() const { 
-        wxCHECK(_bar, false);
-        return !_bar->IsCollapsed();
-    };
-
-    /** Returns the bar associated with this event */
-    wxCaptionBar *GetBar() const {
-        return _bar;
-    };
-
-    void SetTag(void *tag) {
-        _tag = tag;
-    };
-
-    void *GetTag() const {
-        return _tag;
-    };
-
-    /** Sets the bar associated with this event, should not used
-        by any other then the originator of the event */
-    void SetBar(wxCaptionBar *bar) {
-        _bar = bar;
-    };
-
-    DECLARE_DYNAMIC_CLASS(wxCaptionBarEvent)
-
-};
-
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_CAPTIONBAR, 7777)
-END_DECLARE_EVENT_TYPES()
-
-typedef void (wxEvtHandler::*wxCaptionBarEventFunction)(wxCaptionBarEvent&);
-
-#define EVT_CAPTIONBAR(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_CAPTIONBAR, id, wxID_ANY, \
-        (wxObjectEventFunction)(wxEventFunction)(wxCaptionBarEventFunction) \
-        & fn, \
-        (wxObject *) NULL \
-    ),
-
-#endif // _NO_CAPTIONBAR_
-
-#endif
--- a/contrib/include/wx/foldbar/doc_mainpage.h
+++ b/contrib/include/wx/foldbar/doc_mainpage.h
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        doc_mainpage.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/** \author Jorgen Bodde
-    \mainpage
-
-    This is the wxFoldPanel documentation guide. This control is written for wxWidgets (http://www.wxwidgets.com), and 
-    can be used as a side bar with managed panels which can collapse and expand. 
-
-    The wxFoldPanelBar is very easy in it's use and allows great flexibility in manipulating it even after creation. It can 
-    be created in two modes:
-
-    - In place folding: This means that the panels which are collapsed, stay where they are. 
-    - To bottom folding: This means that the panels are collapsed to the bottom
-
-    The caption bars are managed by another stand alone control (which I will fix up to be released soon), called the 
-    wxCaptionBar. You as user don't have to do much with this control right now, all styles are rerouted through the
-    wxFoldPanelBar. The only class of interest is wxCaptionBarStyle which takes care of the visual style of the
-    bar. The caption bar can be drawn in the following modes:
-
-    - Gradient horizontal fill
-    - Gradient vertical fill
-    - Single flat colour
-    - Single colour with border
-    - Single border with background fill
-
-    wxFoldPanelBar is freeware and distributed under the wxWidgets license. wxWidgets is THE toolkit for 
-    (cross platform) C++ / Python programming!
-
-    \section things_done Things to be done
-
-    I would like to add the following features when time allows me. When you really like one of these features to be in the 
-    next release, you can either make that clear to me, or help me with it. They aren't that hard.
-
-    - Single fold which means all other panels are collapsed automatically
-    - Smart size of panels when only one is open, take the whole space, or use sizers to proportionally size
-    - Small icons next to the caption for clarity and make it a bit more visually nice
-    - A bottom bar with visual icon when the bar cannot be completely shown to aid the user that there is more then can be seen
-    - Panels can be hidden. This feature will also need the bottom bar, so that the icons of hidden panels will apear there
-    - Resizable panels, the user can manually size the panels bigger or smaller
-
-    \section how_work How does it work?
-
-    The internals of the wxFoldPanelBar is a list of wxFoldPanelItem classes. Through the reference of wxFoldPanel these
-    panels can be controlled by adding new controls to a wxFoldPanel or adding new wxFoldPanels to the wxFoldPanelBar. The
-    wxCaptionBar fires events to the parent (container of all panel items) when a sub-panel needs resizing (either folding
-    or expanding). The fold or expand process is simply a resize of the panel so it looks like all controls on it are gone.
-    All controls are still child of the wxFoldPanel they are located on. If they don't handle the event (and they won't) 
-    then the owner of the wxFoldPanelBar gets the events. This is what you need to handle the controls. There isn't much to it
-    just a lot of calculations to see what panel belongs where. There are no sizers involved in the panels, everything is
-    purely xy positioning.
-
-    \section what_dp What can it do and what not?
-
-    What it can do:
-
-    - Run-time addition of panels (no deletion just yet)
-    - Run time addition of controls to the panel (it will be resized accordingly)
-    - Creating panels in collapsed mode or expanded mode
-    - Various modes of caption behaviour and filling to make it more appealing
-    - Panels can be folded and collapsed (or all of them) to allow more space
-    
-    What it cannot do:
-
-    - Selection of a panel like in a list ctrl
-    - Dragging and dropping the panels
-    - Re-ordering the panels (not yet)
-
-    Special thanks to Julian Smart et al. for making this great toolkit!
-*/
-
--- a/contrib/include/wx/foldbar/foldpanelbar.h
+++ b/contrib/include/wx/foldbar/foldpanelbar.h
@@ -1,285 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbar.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXFOLDPANELBAR_H__
-#define __WXFOLDPANELBAR_H__
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "foldpanelitem.h"
-
-/** Not yet supported but added for future reference. Single fold forces other panels to close when
-    they are open, and only opens the current panel. This will allow the open panel to gain the full
-    size left in the client area */
-#define wxFPB_SINGLE_FOLD           0x0001
-
-/** All panels are stacked to the bottom. When they are expanded again they show up at the top */
-#define wxFPB_COLLAPSE_TO_BOTTOM    0x0002
-
-/** Not yet supported, but added for future reference. Single fold plus panels will be stacked at the bottom */
-#define wxFPB_EXCLUSIVE_FOLD        wxFPB_SINGLE_FOLD | wxFPB_COLLAPSE_TO_BOTTOM
-
-/** Default style of the wxFoldPanelBar */
-#define wxFPB_DEFAULT_EXTRASTYLE    0
-
-#define wxFPB_DEFAULT_STYLE         wxTAB_TRAVERSAL | wxNO_BORDER
-
-/** \class wxFoldPanel
-    This class is used to return a reference to the fold panel that is added by wxFoldPanelBar::AddFoldPanel(). Use
-    wxFoldPanel::IsOk() to check wether the result is ok to be used in further operations. Use wxFoldPanel::GetItem()
-    to obtain a parent window reference to create the controls on you want to add with wxFoldPanelBar::AddFoldPanelWindow().<br><br>
-*/
-
-class wxFoldPanel
-{
-private:
-    wxFoldPanelItem *_item;
-
-public:
-    /** Constructor, usually not directly used by the developer. */
-    wxFoldPanel(wxFoldPanelItem *item)
-        : _item(item)
-    {
-    }
-
-    /** Returns true if this is a valid wxFoldPanelItem reference. */
-    bool IsOk() const {
-        return (_item != 0);
-    };
-
-    /** Copy operator to assign one instance to the other, this is needed because these classes are passed
-        as instance not by reference. */
-    virtual void operator=(const wxFoldPanel &item) {
-        _item = item._item;
-    };
-
-#ifndef _NO_DOXYGEN_
-    // not allowed to be seen by doxygen
-    wxFoldPanelItem *GetItem() const {
-        return _item;
-    };
-#endif
-
-    /** Use this method to obtain the wxPanel derived class to which you need to add your components. For example;<br>
-
-    \code
-        wxFoldPanel item = _pnl->AddFoldPanel(wxT("Test me"), false);
-        _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), wxID_ANY, wxT("Press Me")));
-    \endcode
-    */
-    wxFoldPanelItem *GetParent() const {
-        wxASSERT(_item);
-        return _item;
-    };
-
-
-};
-
-#include <wx/dynarray.h>
-WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);
-
-/** \class wxFoldPanelBar
-    The wxFoldPanelBar is a class which can maintain a list of collapsable panels. Once a panel is collapsed, only
-    it's panel bar is visible to the user. This will provide more space for the other panels, or allow the user to
-    close panels which are not used often to get the most out of the work area.
-
-    This control is easy to use. Simply create it as a child for a panel or sash window, and populate panels with
-    wxFoldPanelBar::AddFoldPanel(). Then use the wxFoldPanelBar::AddFoldPanelWindow() to add wxWindow derived controls
-    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeperator() to put separators between the groups of
-    controls that need a visual separator to group them together. After all is constructed, the user can fold
-    the panels by doubleclicking on the bar or single click on the arrow, which will indicate the collapsed or
-    expanded state.
-*/
-
-class wxFoldPanelBar: public wxPanel
-{
-private:
-    DECLARE_CLASS( wxFoldPanelBar )
-    DECLARE_EVENT_TABLE()
-
-    wxImageList *_images;
-    wxFoldPanelItemArray _panels;
-    wxBoxSizer* _panelSizer;
-    wxPanel *_foldPanel, *_bottomPanel;
-    wxFlexGridSizer* _mainSizer;
-    bool _controlCreated;
-    wxBitmap *_moreBmp;
-    int _extraStyle;
-
-private:
-    /** Refreshes all the panels from given index down to last one */
-    void RefreshPanelsFrom(size_t i);
-
-    /** Refreshes all the panels from given pointer down to last one in the list */
-    void RefreshPanelsFrom(wxFoldPanelItem *item);
-
-    /** Returns the height of the panels that are expanded and collapsed. This is useful to determine
-        quickly what size is used to display, and what is left at the bottom to allign
-        the collapsed panels. */
-    int GetPanelsHeight(int &collapsed, int &expanded);
-
-    /** Reposition all the collapsed panels to the bottom. When it is not possible to
-        allign them to the bottom, stick them behind the visible panels. The Rect holds the
-        slack area left between last repositioned panel and the bottom panels. This needs to
-        get a refresh */
-    wxRect RepositionCollapsedToBottom();
-
-public:
-    /** Two step constructor used for XRC. Use wxFoldPanelBar::Create() to create the panel. Do not call
-        any other methods before the control is fully created! */
-    wxFoldPanelBar();
-    /** One step creation. Look at wxPanel for the argument and style flags. The extraStyle flags are
-        - wxFPB_DEFAULT_EXTRASTYLE : Takes default styles.
-        - wxFPB_COLLAPSE_TO_BOTTOM : When panels are collapsed, they are put at the bottom of the area. */
-    wxFoldPanelBar( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
-                    long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
-
-    /** wxFoldPanelBar destructor */
-    virtual ~wxFoldPanelBar();
-
-    /** Two step create call. Use this when the control is not created using the wxPanel derived constructor.
-        WARNING: Do not create this component more then once! */
-    virtual void Create( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
-                         long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
-
-    /** Adds a fold panel to the list of panels. If the flag collapsedInitially is set to true, the panel
-        is collapsed initially. The wxFoldPanel item which is returned, can be used as a reference to
-        perform actions upon the fold panel like collapsing it, expanding it, or deleting it from the list.
-
-        Use this foldpanel to add windows to it. Please consult wxFoldPanelBar::AddFoldPanelWindow() and
-        wxFoldPanelBar::AddFoldPanelSeparator() how to add wxWindow items to the panels. */
-    wxFoldPanel AddFoldPanel(const wxString &caption, bool collapsedInitially = false,
-                             const wxCaptionBarStyle &style = wxEmptyCaptionBarStyle);
-
-
-    /** Adds a wxWindow derived class to the referenced wxFoldPanel. IMPORTANT: Make the to be created window,
-        child of the wxFoldPanel. See example that follows. The flags to be used are:
-        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be alligned to fit the width of the
-          wxFoldPanel when it is resized. Very handy for sizer items, buttons and text boxes.
-        - wxFPB_ALIGN_LEFT: Alligns left instead of fitting the width of the child window to be added. Use either
-          this one or wxFPB_ALIGN_WIDTH.
-
-        The wxWindow to be added can be slightly indented from left and right so it is more visibly placed
-        in the wxFoldPanel. Use ySpacing > 0 to give the control an y offset from the previous wxWindow added,
-        use leftSpacing to give it a slight indent from the left, and rightSpacing also reserves a little space
-        on the right so the wxWindow can be properly placed in the wxFoldPanel.
-
-        The following example adds a wxFoldPanel to the wxFoldPanelBar and adds two wxWindow derived controls
-        to the wxFoldPanel:
-
-        \code
-
-            // create the wxFoldPanelBar
-            _pnl = new wxFoldPanelBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, wxFPB_COLLAPSE_TO_BOTTOM);
-
-            // add a foldpanel to the control. "Test me" is the caption and it is initially not collapsed.
-            wxFoldPanel item = _pnl->AddFoldPanel(wxT("Test me"), false);
-
-            // now add a button to the fold panel. Mind that the button should be made child of the
-            // wxFoldPanel and not of the main form.
-            _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, wxT("Collapse Me")));
-
-            // add a separator between the two controls. This is purely a visual line that can have a certain
-            // color and also the indents and width alligning like a control.
-            _pnl->AddFoldPanelSeperator(item);
-
-            // now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider
-            // the text control also sizes along.
-            _pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 20);
-
-        \endcode
-    */
-    int AddFoldPanelWindow(const wxFoldPanel &panel, wxWindow *window, int flags = wxFPB_ALIGN_WIDTH,
-                           int ySpacing = wxFPB_DEFAULT_YSPACING, int leftSpacing = wxFPB_DEFAULT_LEFTSPACING,
-                           int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING);
-
-    /** Adds a seperator line to the current wxFoldPanel. The seperator is a simple line which is drawn and is no
-        real component. It can be used to seperate groups of controls which belong to eachother. The colour is
-        adjustable, and it takes the same ySpacing, leftSpacing and rightSpacing as AddFoldPanelWindow(). */
-    int AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color = wxColour(167,167,167),
-                           int ySpacing = wxFPB_DEFAULT_YSPACING, int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,
-                           int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING);
-
-    /** Returns the number of panels currently present in the wxFoldPanelBar. This is independent if they are
-        visible or hidden. */
-    size_t GetCount() const {
-        return _panels.GetCount();
-    };
-
-    /** Returns the wxFoldPanel reference belonging to the current index. An empty panel is returned when the
-        index is out of bounds. Use GetCount() to get the amount of panels present. Collapsing and folding the
-        panel does not change the order in which they are indexed. So it is safe enough to keep a reference
-        to the panel by number. */
-    wxFoldPanel Item(size_t i) {
-        wxCHECK((int)i >= 0 && i < GetCount(), wxFoldPanel(0));
-        return wxFoldPanel(_panels.Item(i));
-    };
-
-    /** Collapses the given wxFoldPanel reference, and updates the foldpanel bar. In the wxFPB_COLLAPSE_TO_BOTTOM
-        style, all collapsed captions are put at the bottom of the control. In the normal mode, they stay where
-        they are */
-    void Collapse(const wxFoldPanel &item) {
-        wxCHECK2(item.IsOk(), return);
-        item.GetItem()->Collapse();
-
-        RefreshPanelsFrom(item.GetItem());
-    };
-
-    /** Expands the given wxFoldPanel reference, and updates the foldpanel bar. In the wxFPB_COLLAPSE_TO_BOTTOM
-       they will be removed from the bottom and the order where the panel originally was placed is restored.  */
-    void Expand(const wxFoldPanel &item) {
-        wxCHECK2(item.IsOk(), return);
-        item.GetItem()->Expand();
-
-        RefreshPanelsFrom(item.GetItem());
-    };
-
- /** Sets the style of the caption bar (called wxCaptionBar) of the wxFoldPanel. The changes are applied immediately.
-        All styles not set in the wxCaptionBarStyle class are not applied. Use the wxCaptionBar reference to indicate
-        what captionbar you want to apply the style to. To apply one style to all wxCaptionBar items, use
-        ApplyCaptionStyleAll() */
-    void ApplyCaptionStyle(wxFoldPanel &fp, const wxCaptionBarStyle &style) {
-        wxCHECK2(fp.IsOk(), return);
-        fp.GetItem()->ApplyCaptionStyle(style);
-    };
-
-    /** Sets the style of all the caption bars of the wxFoldPanel. The changes are applied immediately */
-    void ApplyCaptionStyleAll(const wxCaptionBarStyle &style) {
-        for(size_t i = 0; i < GetCount(); i++)
-        {
-            wxFoldPanel item = Item(i);
-            ApplyCaptionStyle(item, style);
-        }
-    };
-
-    /** Returns the currently used caption style for the wxFoldPanel. It is returned as a wxCaptionBarStyle class.
-        after modifying it, it can be set again */
-    wxCaptionBarStyle GetCaptionStyle(wxFoldPanel &fp) const {
-        wxCHECK2(fp.IsOk(), wxEmptyCaptionBarStyle);
-        return fp.GetItem()->GetCaptionStyle();
-    };
-
-
-private:
-    void OnPressCaption(wxCaptionBarEvent &event);
-    void OnSizePanel(wxSizeEvent &event);
-
-    /** Resize the fold panels so they match the width */
-    void RedisplayFoldPanelItems();
-
-    void OnPaint(wxPaintEvent &event);
-};
-
-#endif // __WXFOLDPANELBAR_H__
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ b/contrib/include/wx/foldbar/foldpanelitem.h
@@ -1,260 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelitem.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXFOLDPANELITEM_H__
-#define __WXFOLDPANELITEM_H__
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "captionbar.h"
-
-#define wxFPB_ALIGN_LEFT  0 
-#define wxFPB_ALIGN_WIDTH 1
-
-#define wxFPB_DEFAULT_LEFTSPACING  5
-#define wxFPB_DEFAULT_RIGHTSPACING 10
-#define wxFPB_DEFAULT_YSPACING     8
-
-#define wxFPB_DEFAULT_LEFTLINESPACING  2
-#define wxFPB_DEFAULT_RIGHTLINESPACING 2
-
-class wxFoldWindowItem
-{
-private:
-    wxWindow *_wnd;
-    int _type, _flags;
-    int _leftSpacing,
-        _rightSpacing,
-        _ySpacing;
-    int _lineWidth, _lineY;
-    wxColour _sepLineColour;
-
-public:
-    enum 
-    {
-        WINDOW = 0,
-        SEPARATOR
-    };
-
-    // wxWindow constructor. This initialises the class as a wxWindow type
-    wxFoldWindowItem(wxWindow *wnd, int flags = wxFPB_ALIGN_WIDTH, int ySpacing = wxFPB_DEFAULT_YSPACING, 
-                     int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING) 
-        : _wnd(wnd)
-        , _type(WINDOW)
-        , _flags(flags)
-        , _leftSpacing(leftSpacing)
-        , _rightSpacing(rightSpacing)
-        , _ySpacing(ySpacing)
-        , _lineWidth(0)
-        , _lineY(0)
-    {
-    };
-
-    // separator constructor. This initialises the class as a separator type
-    wxFoldWindowItem(int y, const wxColour &lineColor = *wxBLACK, int ySpacing = wxFPB_DEFAULT_YSPACING, 
-                     int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING, 
-                     int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING) 
-        : _wnd(0)
-        , _type(SEPARATOR)
-        , _flags(wxFPB_ALIGN_WIDTH)
-        , _leftSpacing(leftSpacing)
-        , _rightSpacing(rightSpacing)
-        , _ySpacing(ySpacing)
-        , _lineWidth(0)
-        , _lineY(y)
-        , _sepLineColour(lineColor)
-    {
-    };
-
-    // TODO: Make a c'tor for a captioned splitter
-
-    int GetType() const {
-        return _type;
-    };
-
-    int GetLineY() const {
-        return _lineY;
-    };
-
-    int GetLineWidth() const {
-        return _lineWidth;
-    };
-
-    const wxColour &GetLineColour() const {
-        return _sepLineColour;
-    };
-
-    int GetLeftSpacing() const {
-        return _leftSpacing;
-    };
-
-    int GetRightSpacing() const {
-        return _rightSpacing;
-    };
-
-    int GetYSpacing() const {
-        return _ySpacing;
-    };
-
-    // returns the window height if type is wxFoldWindowItem::WINDOW
-    // and returns the total size plus the extra spacing
-
-    int GetWindowHeight() const {
-        int value = 0;
-        if(_type == WINDOW)
-        {
-            wxCHECK(_wnd, 0);
-            wxSize size = _wnd->GetSize();
-            value = size.GetHeight() + _ySpacing;
-        }
-        else if(_type == SEPARATOR)
-            value = 1 + _ySpacing;
-
-        return value;
-    };
-
-    // resize the element, whatever it is. A separator or
-    // line will be always alligned by width
-
-    void ResizeItem(int width) {
-        if((_flags & wxFPB_ALIGN_WIDTH))
-        {
-            // allign by taking full width
-            int myWidth = width - _leftSpacing - _rightSpacing;
-
-            if(myWidth < 0) 
-                myWidth = 10; // can't have negative width
-
-            if(_type == SEPARATOR)
-                _lineWidth = myWidth;
-            else
-            {
-                wxCHECK2(_wnd, return);
-                _wnd->SetSize(wxSize(myWidth, wxDefaultCoord));
-            }
-        }
-    };
-
-};
-
-#include <wx/dynarray.h>
-WX_DECLARE_OBJARRAY(wxFoldWindowItem, wxFoldWindowItemArray);
-
-#ifndef _NO_DOXYGEN_
-
-/** \wxFoldPanelItem
-    This class is a child sibling of the wxFoldPanelBar class. It will be containing a wxCaptionBar class
-    for receiving of events, and a the rest of the area can be populated by a wxPanel derived class. 
-*/
-
-class wxFoldPanelItem: public wxPanel
-{
-private:
-    wxCaptionBar *_captionBar;
-
-    bool _controlCreated;
-    int _yUserSize,
-        _yPanelSize,
-        _yLastInsertPos;
-    int _yPos;
-    bool _userSized;
-
-private:
-    DECLARE_CLASS( wxFoldPanelItem )
-    DECLARE_EVENT_TABLE()
-    
-private:
-    wxFoldWindowItemArray _items;
-
-    void OnSize(wxSizeEvent &event);
-    void OnPressCaption(wxCaptionBarEvent &event);
-    void OnPaint(wxPaintEvent &event);
-
-public:
-    // constructors and destructors
-    wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxImageList *icons = 0, bool collapsedInitially = false, 
-                     const wxCaptionBarStyle &style = wxEmptyCaptionBarStyle);
-    virtual ~wxFoldPanelItem();
-    
-    /** Add a window item to the list of items on this panel. The flags are wxFPB_ALIGN_LEFT for a non sizing
-        window element, and wxFPB_ALIGN_WIDTH for a width alligned item. The ySpacing parameter reserves a number
-        of pixels before the window element, and leftSpacing is an indent. rightSpacing is only relevant when the
-        style wxFPB_ALIGN_WIDTH is chosen. */
-    void AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing);
-    
-    void AddSeparator(const wxColour &color, int ySpacing, int leftSpacing, int rightSpacing);
-
-    /** Repositions this wxFoldPanelBar and reports the height occupied for the next wxFoldPanelBar in the 
-        list */
-    int Reposition(int y);
-
-    void ResizePanel();
-
-    /** Return expanded or collapsed status. If the panel is expanded, true is returned */
-    bool IsExpanded() const {
-        return !_captionBar->IsCollapsed();
-    };
-
-    /** Return Y pos */
-
-    int GetY() const {
-        return _yPos;
-    };
-
-    // this should not be called by the user, because it doesn't trigger the parent 
-    // to tell it that we are collapsed or expanded, it only changes visual state
-    void Collapse() {
-        _captionBar->Collapse();
-        ResizePanel();
-    };
-
-    // this should not be called by the user, because it doesn't trigger the parent 
-    // to tell it that we are collapsed or expanded, it only changes visual state
-    void Expand() {
-        _captionBar->Expand();
-        ResizePanel();
-    };
-
-    /* Return size of panel */
-
-    int GetPanelHeight() const {
-        if(_captionBar->IsCollapsed())
-            return GetCaptionHeight();
-        else if(_userSized)
-            return _yUserSize;
-        return _yPanelSize;
-    };
-
-    // returns height of caption only. This is for folding calulation
-    // purposes
-
-    int GetCaptionHeight() const {
-        wxSize size = _captionBar->GetSize();
-        return size.GetHeight();
-    };
-
-    void ApplyCaptionStyle(const wxCaptionBarStyle &style) {
-        wxCHECK2(_captionBar, return);
-        _captionBar->SetCaptionStyle(false, style);
-    };
-
-    wxCaptionBarStyle GetCaptionStyle() {
-        wxCHECK(_captionBar, wxEmptyCaptionBarStyle);
-        return _captionBar->GetCaptionStyle();
-    };
-};
-
-
-#endif // _NO_DOXYGEN_
-
-#endif // __WXFOLDPANELITEM_H__
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -12,7 +12,7 @@
 #define __WX_EDITLBOX_H__

 #if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "editlbox.h"
+	#pragma interface "editlbox.h"
 #endif

 #include "wx/panel.h"
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxListEvent;

 class WXDLLIMPEXP_GIZMOS wxEditableListBox : public wxPanel
 {
-    DECLARE_CLASS(wxEditableListBox);
+	DECLARE_CLASS(wxEditableListBox);

 public:
    wxEditableListBox(wxWindow *parent, wxWindowID id,
--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/contrib/include/wx/gizmos/ledctrl.h
@@ -33,18 +33,18 @@ enum wxLEDValueAlign
 // wxLEDNumberCtrl
 // ----------------------------------------------------------------------------

-class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl : public wxControl
+class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl :	public wxControl
 {
 public:
    // Constructors.
    wxLEDNumberCtrl();
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
+    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);

    // Create functions.
-    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
+    bool Create(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0);
@@ -53,9 +53,9 @@ public:
    bool GetDrawFaded() const { return m_DrawFaded; }
    const wxString &GetValue() const { return m_Value; }

-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = true);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = true);
-    void SetValue(const wxString &Value, bool Redraw = true);
+    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = TRUE);
+    void SetDrawFaded(bool DrawFaded, bool Redraw = TRUE);
+    void SetValue(const wxString &Value, bool Redraw = TRUE);

 private:
    // Members.
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -16,7 +16,7 @@
 #define __WX_MULTICELL_H__

 #if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "multicell.h"
+	#pragma interface "multicell.h"
 #endif

 #include "wx/gizmos/gizmos.h"
@@ -33,10 +33,10 @@
 // ----------------------------------------------------------------------------
 enum wxResizable
 {
-    wxNOT_RESIZABLE =           0x00,
-    wxHORIZONTAL_RESIZABLE =    0x01,
-    wxVERTICAL_RESIZABLE =      0x10,
-    wxRESIZABLE =               0x11
+	wxNOT_RESIZABLE =           0x00,
+	wxHORIZONTAL_RESIZABLE =    0x01,
+	wxVERTICAL_RESIZABLE =      0x10,
+	wxRESIZABLE =               0x11
 };

 //---------------------------------------------------------------------------
@@ -49,33 +49,33 @@ enum wxResizable

 class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
 {
-    DECLARE_CLASS(wxMultiCellItemHandle);
+	DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
-    int             m_column;
-    int             m_row;
-    int             m_width;
-    int             m_height;
-    wxResizable     m_style;
-    wxSize          m_fixedSize;
-    int             m_alignment;
-    wxSize          m_weight;
+	int             m_column;
+	int             m_row;
+	int             m_width;
+	int             m_height;
+	wxResizable     m_style;
+	wxSize          m_fixedSize;
+	int             m_alignment;
+	wxSize          m_weight;

 public:
-    wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    wxMultiCellItemHandle( int row, int column, int align);
-    int             GetColumn();
-    int             GetRow();
-    int             GetWidth();
-    int             GetHeight();
-    wxResizable     GetStyle();
-    wxSize          GetLocalSize();
-    int             GetAlignment();
-    wxSize          GetWeight();
+	wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+	wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+	wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+	wxMultiCellItemHandle( int row, int column, int align);
+	int             GetColumn();
+	int             GetRow();
+	int             GetWidth();
+	int             GetHeight();
+	wxResizable     GetStyle();
+	wxSize          GetLocalSize();
+	int             GetAlignment();
+	wxSize          GetWeight();

 private:
-    void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+	void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);

 };

@@ -85,43 +85,43 @@ private:

 class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
 {
-    DECLARE_CLASS(wxMultiCellSizer);
+	DECLARE_CLASS(wxMultiCellSizer);

 protected:
-    wxSize m_cell_count;
+	wxSize m_cell_count;

 public:
-    wxMultiCellSizer(wxSize & size);
-    wxMultiCellSizer(int rows, int cols);
-    ~wxMultiCellSizer();
+	wxMultiCellSizer(wxSize & size);
+	wxMultiCellSizer(int rows, int cols);
+	~wxMultiCellSizer();

-    virtual void RecalcSizes();
-    virtual wxSize CalcMin();
-    bool SetDefaultCellSize(wxSize size);
-    bool SetColumnWidth(int column, int colSize = 5, bool expandable = false);
-    bool SetRowHeight(int row, int rowSize = 5, bool expandable = false);
-    bool EnableGridLines(wxWindow *win);
-    bool SetGridPen(wxPen *pen);
-    void OnPaint(wxDC& dc);
+	virtual void 	RecalcSizes();
+	virtual wxSize 	CalcMin();
+	bool 			SetDefaultCellSize(wxSize size);
+	bool 			SetColumnWidth(int column, int colSize = 5, bool expandable = FALSE);
+	bool 			SetRowHeight(int row, int rowSize = 5, bool expandable = FALSE);
+	bool			EnableGridLines(wxWindow *win);
+	bool			SetGridPen(wxPen *pen);
+	void 			OnPaint(wxDC& dc);

 private:
-    void GetMinimums();
-    int Sum(int *array, int x);
+	void 			GetMinimums();
+	int 			Sum(int *array, int x);

 private:
-    int *m_maxHeight;
-    int *m_maxWidth;
-    int *m_rowStretch;
-    int *m_colStretch;
-    wxSize **m_weights;
-    wxSize **m_minSizes;
-    int m_maxWeights;
-    wxSize m_defaultCellSize;
-    wxWindow *m_win; // usually used for debugging
-    wxPen *m_pen;
+	int 			*m_maxHeight;
+	int 			*m_maxWidth;
+	int 			*m_rowStretch;
+	int 			*m_colStretch;
+	wxSize 			**m_weights;
+	wxSize			**m_minSizes;
+	int				m_maxWeights;
+	wxSize			m_defaultCellSize;
+	wxWindow		*m_win; // usually used for debugging
+	wxPen			*m_pen;

-    void DrawGridLines(wxDC& dc);
-    void Initialize(wxSize size);
+	void			DrawGridLines(wxDC& dc);
+	void			Initialize(wxSize size);
 };


@@ -136,23 +136,23 @@ class wxCell;
 class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer
 {
 public:
-    wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
-    void Add(wxWindow *win, unsigned int row, unsigned int col);
+	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
+	void Add(wxWindow *win, unsigned int row, unsigned int col);

-    void Resize(int numRows, int numCols);
-    int MaxRows()
-    {
-        return m_maxRows;
-    };
-    int MaxCols()
-    {
-        return m_maxCols;
-    };
-    void CalculateConstraints();
-    void SetMinCellSize(const wxSize size)
-    {
-        m_minCellSize = size;
-    };
+	void Resize(int numRows, int numCols);
+	int MaxRows()
+	{
+		return m_maxRows;
+	};
+	int MaxCols()
+	{
+		return m_maxCols;
+	};
+	void CalculateConstraints();
+	void SetMinCellSize(const wxSize size)
+	{
+		m_minCellSize = size;
+	};

  /* These are to hide Add() method of parents and to avoid Borland warning about hiding virtual functions */
  void Add( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL )
@@ -165,11 +165,11 @@ public:
       { wxFlexGridSizer::Add( item); }

 private:
-    wxWindow            *m_parent;
-    unsigned int         m_maxRows, m_maxCols;
+	wxWindow            *m_parent;
+	unsigned int         m_maxRows, m_maxCols;

-    wxSize              m_minCellSize;
-    wxCell              **m_cells;
+	wxSize              m_minCellSize;
+	wxCell              **m_cells;
 };

 #endif
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -72,7 +72,7 @@ public:
    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                             int noUnitsX, int noUnitsY,
                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = false );
+                             bool noRefresh = FALSE );

    // In case we're using the generic tree control.
    // Get the view start
@@ -127,7 +127,7 @@ class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow
 public:
    DECLARE_CLASS(wxTreeCompanionWindow)

-    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
+    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = 0);
@@ -166,7 +166,7 @@ class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow
 public:
    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)

-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
+    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = wxSP_3D | wxCLIP_CHILDREN);
@@ -210,7 +210,7 @@ class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow
 public:
    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)

-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
+    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = 0);
--- a/contrib/include/wx/mmedia/sndbase.h
+++ b/contrib/include/wx/mmedia/sndbase.h
@@ -125,7 +125,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream {
  // Returns the best size for IO calls
  virtual wxUint32 GetBestSize() const { return 1024; }

-  // SetSoundFormat returns true when the format can be handled.
+  // SetSoundFormat returns TRUE when the format can be handled.
  virtual bool SetSoundFormat(const wxSoundFormatBase& format);

  // GetSoundFormat returns the current sound format.
@@ -146,7 +146,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream {
  wxUint32 GetLastAccess() const { return m_lastcount; }

  // This is only useful for device (I think).
-  virtual bool QueueFilled() const { return true; }
+  virtual bool QueueFilled() const { return TRUE; }

 protected:
  // Current sound format
--- a/contrib/include/wx/mmedia/sndfile.h
+++ b/contrib/include/wx/mmedia/sndfile.h
@@ -98,7 +98,7 @@ public:
    
    // You should use this function to test whether this file codec can read
    // the stream you passed to it.
-    virtual bool CanRead() { return false; }
+    virtual bool CanRead() { return FALSE; }
    
 protected:
    wxSoundRouterStream m_codec; 
--- a/contrib/include/wx/mmedia/sndpcm.h
+++ b/contrib/include/wx/mmedia/sndpcm.h
@@ -23,7 +23,7 @@
 class wxSoundFormatPcm : public wxSoundFormatBase {
 public:
  wxSoundFormatPcm(wxUint32 srate = 22500, wxUint8 bps = 8,
-                   wxUint16 channels = 2, bool sign = true,
+                   wxUint16 channels = 2, bool sign = TRUE,
                   int order = wxLITTLE_ENDIAN); 
  ~wxSoundFormatPcm();

--- a/contrib/include/wx/mmedia/vidbase.h
+++ b/contrib/include/wx/mmedia/vidbase.h
@@ -5,7 +5,7 @@
 // Created:    1997
 // Updated:    1998
 // Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS:        $Id$
+// CVS:	       $Id$
 // License:    wxWindows license
 // /////////////////////////////////////////////////////////////////////////////
 /* Real -*- C++ -*- */
@@ -68,7 +68,7 @@ public:
    // Dtor
    virtual ~wxVideoBaseDriver();
    
-    // Usual functions ... They all return false in case of errors.
+    // Usual functions ... They all return FALSE in case of errors.
    virtual bool Play() = 0;
    virtual bool Stop() = 0;
    virtual bool Pause() = 0;
@@ -79,7 +79,7 @@ public:
    virtual bool GetSize(wxSize& size) const = 0;
    
    // Test the capability of the driver to handle the specified type
-    virtual bool IsCapable(wxVideoType WXUNUSED(v_type)) const { return false; }
+    virtual bool IsCapable(wxVideoType WXUNUSED(v_type)) const { return FALSE; }

    // Return the video codec name
    virtual wxString GetMovieCodec() const = 0;
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "msg.h"
+#endif
+
 #ifndef _WX_MSG_H_
 #define _WX_MSG_H_

--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BASIC_H_
@@ -145,7 +145,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnDelete();
  virtual void OnDraw(wxDC& dc);
  virtual void OnDrawContents(wxDC& dc);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = false);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);
  virtual void OnMoveLinks(wxDC& dc);
  virtual void OnErase(wxDC& dc);
  virtual void OnEraseContents(wxDC& dc);
@@ -154,8 +154,8 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);

  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -166,7 +166,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
  virtual void OnDrawControlPoints(wxDC& dc);
  virtual void OnEraseControlPoints(wxDC& dc);
-  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
+  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);

  // Control points ('handles') redirect control to the actual shape, to make it easier
  // to override sizing behaviour.
@@ -234,8 +234,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {}
  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);

  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -268,24 +268,24 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual void MakeMandatoryControlPoints();
  virtual void ResetMandatoryControlPoints();

-  inline virtual bool Recompute() { return true; };
+  inline virtual bool Recompute() { return TRUE; };
  // Calculate size recursively, if size changes. Size might depend on children.
  inline virtual void CalculateSize() { };
-  virtual void Select(bool select = true, wxDC* dc = NULL);
-  virtual void SetHighlight(bool hi = true, bool recurse = false);
+  virtual void Select(bool select = TRUE, wxDC* dc = NULL);
+  virtual void SetHighlight(bool hi = TRUE, bool recurse = FALSE);
  inline virtual bool IsHighlighted() const { return m_highlighted; };
  virtual bool Selected() const;
  virtual bool AncestorSelected() const;
-  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = false);
+  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE);
  int GetSensitivityFilter() const { return m_sensitivity; }
-  void SetDraggable(bool drag, bool recursive = false);
+  void SetDraggable(bool drag, bool recursive = FALSE);
  inline  void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; };
  inline  void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; };
  inline  bool GetFixedWidth() const { return m_fixedWidth; }
  inline  bool GetFixedHeight() const { return m_fixedHeight; }
  inline  void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; };
  inline  bool GetSpaceAttachments() const { return m_spaceAttachments; };
-  void SetShadowMode(int mode, bool redraw = false);
+  void SetShadowMode(int mode, bool redraw = FALSE);
  inline int GetShadowMode() const { return m_shadowMode; }
  virtual bool HitTest(double x, double y, int *attachment, double *distance);
  inline void SetCentreResize(bool cr) { m_centreResize = cr; }
@@ -305,19 +305,19 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler

  virtual void Show(bool show);
  virtual bool IsShown() const { return m_visible; }
-  virtual void Move(wxDC& dc, double x1, double y1, bool display = true);
+  virtual void Move(wxDC& dc, double x1, double y1, bool display = TRUE);
  virtual void Erase(wxDC& dc);
  virtual void EraseContents(wxDC& dc);
  virtual void Draw(wxDC& dc);
  virtual void Flash();
  virtual void MoveLinks(wxDC& dc);
  virtual void DrawContents(wxDC& dc);  // E.g. for drawing text label
-  virtual void SetSize(double x, double y, bool recursive = true);
+  virtual void SetSize(double x, double y, bool recursive = TRUE);
  virtual void SetAttachmentSize(double x, double y);
  void Attach(wxShapeCanvas *can);
  void Detach();

-  inline virtual bool Constrain() { return false; } ;
+  inline virtual bool Constrain() { return FALSE; } ;

  void AddLine(wxLineShape *line, wxShape *other,
               int attachFrom = 0, int attachTo = 0,
@@ -413,13 +413,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
    int nth, int noArcs, wxLineShape* line);

-  // Returns true if pt1 <= pt2 in the sense that one point comes before another on an
+  // Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an
  // edge of the shape.
  // attachmentPoint is the attachment point (= side) in question.
  virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);

-  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = false);
-  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = false);
+  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);

  virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
                                       double x, double y);
@@ -462,8 +462,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual int GetAttachmentLineCount(int attachment) const;

  // Draw the branches (not the actual arcs though)
-  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = false);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = false);
+  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = FALSE);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);

  // Branching attachment settings
  inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; }
@@ -490,13 +490,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  // This is really to distinguish between lines and other images.
  // For lines, want to pass drag to canvas, since lines tend to prevent
  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return true; }
+  virtual bool Draggable() const { return TRUE; }

-  // Returns true if image is a descendant of this image
+  // Returns TRUE if image is a descendant of this image
  bool HasDescendant(wxShape *image);

  // Creates a copy of this shape.
-  wxShape *CreateNewCopy(bool resetMapping = true, bool recompute = true);
+  wxShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE);

  // Does the copying for this object
  virtual void Copy(wxShape& copy);
@@ -549,11 +549,11 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  bool                  m_draggable;
  int                   m_attachmentMode;   // 0 for no attachments, 1 if using normal attachments,
                                            // 2 for branching attachments
-  bool                  m_spaceAttachments; // true if lines at one side should be spaced
+  bool                  m_spaceAttachments; // TRUE if lines at one side should be spaced
  bool                  m_fixedWidth;
  bool                  m_fixedHeight;
-  bool                  m_centreResize;    // Default is to resize keeping the centre constant (true)
-  bool                  m_drawHandles;     // Don't draw handles if false, usually true
+  bool                  m_centreResize;    // Default is to resize keeping the centre constant (TRUE)
+  bool                  m_drawHandles;     // Don't draw handles if FALSE, usually TRUE
  wxList                m_children;      // In case it's composite
  wxShape*              m_parent;      // In case it's a child
  int                   m_formatMode;
@@ -589,7 +589,7 @@ class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
                                 double x2, double y2,
                                 double *x3, double *y3);
  bool HitTest(double x, double y, int *attachment, double *distance);
-  void SetSize(double x, double y, bool recursive = true);
+  void SetSize(double x, double y, bool recursive = TRUE);
  void OnDraw(wxDC& dc);
  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);

@@ -661,7 +661,7 @@ class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
                                 double x2, double y2,
                                 double *x3, double *y3);
  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = true);
+  void SetSize(double x, double y, bool recursive = TRUE);
  void SetCornerRadius(double rad); // If > 0, rounded corners
  double GetCornerRadius() const { return m_cornerRadius; }

@@ -715,7 +715,7 @@ class WXDLLIMPEXP_OGL wxEllipseShape: public wxShape
                                 double *x3, double *y3);

  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = true);
+  void SetSize(double x, double y, bool recursive = TRUE);

 #if wxUSE_PROLOGIO
  void WriteAttributes(wxExpr *clause);
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BASICP_H_
@@ -73,7 +73,7 @@ public:
  double         m_yoffset;
  wxShape*      m_shape;
  wxCursor*     m_oldCursor;
-  bool          m_eraseObject; // If true, erases object before dragging handle.
+  bool          m_eraseObject; // If TRUE, erases object before dragging handle.

 /*
 * Store original top-left, bottom-right coordinates
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BITMAP_H_
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
  // Does the copying for this object
  void Copy(wxShape& copy);

-  void SetSize(double w, double h, bool recursive = true);
+  void SetSize(double w, double h, bool recursive = TRUE);
  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
  void SetBitmap(const wxBitmap& bm);
  inline void SetFilename(const wxString& f) { m_filename = f; };
--- a/contrib/include/wx/ogl/canvas.h
+++ b/contrib/include/wx/ogl/canvas.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_CANVAS_H_
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_OGL wxShapeCanvas: public wxScrolledWindow
 {
 DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
 public:
-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxBORDER | wxRETAINED,
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_COMPOSIT_H_
@@ -36,16 +36,16 @@ public:
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
  void OnErase(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);

  void OnRightClick(double x, double y, int keys, int attachment = 0);

-  void SetSize(double w, double h, bool recursive = true);
+  void SetSize(double w, double h, bool recursive = TRUE);

-  // Returns true if it settled down
+  // Returns TRUE if it settled down
  bool Recompute();

  // New members
@@ -69,7 +69,7 @@ public:
  // in case it had to find it recursively.
  wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);

-  // Returns true if something changed
+  // Returns TRUE if something changed
  bool Constrain();

  // Make this composite into a container by creating one wxDivisionShape
@@ -93,7 +93,7 @@ public:
  // of the composite that is not in the divisions list.
  wxShape *FindContainerImage();

-  // Returns true if division is a descendant of this container
+  // Returns TRUE if division is a descendant of this container
  bool ContainsDivision(wxDivisionShape *division);

  inline wxList& GetDivisions() const { return (wxList&) m_divisions; }
@@ -133,7 +133,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape

  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
@@ -142,7 +142,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape

  // Don't want this kind of composite to resize its subdiagrams, so
  // override composite's SetSize.
-  void SetSize(double w, double h, bool recursive = true);
+  void SetSize(double w, double h, bool recursive = TRUE);

  // Similarly for calculating size: it's fixed at whatever SetSize
  // set it to, not in terms of children.
@@ -163,12 +163,12 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
  // Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL)
  bool Divide(int direction);

-  // Resize adjoining divisions at the given side. If test is true,
+  // Resize adjoining divisions at the given side. If test is TRUE,
  // just see whether it's possible for each adjoining region,
-  // returning false if it's not.
+  // returning FALSE if it's not.
  bool ResizeAdjoining(int side, double newPos, bool test);

-  // Adjust a side, returning false if it's not physically possible.
+  // Adjust a side, returning FALSE if it's not physically possible.
  bool AdjustLeft(double left, bool test);
  bool AdjustTop(double top, bool test);
  bool AdjustRight(double right, bool test);
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/contrib/include/wx/ogl/constrnt.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_CONSTRNT_H_
@@ -69,7 +69,7 @@ class WXDLLIMPEXP_OGL wxOGLConstraint: public wxObject
  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
  ~wxOGLConstraint();

-  // Returns true if anything changed
+  // Returns TRUE if anything changed
  bool Evaluate();
  inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
  bool Equals(double a, double b);
--- a/contrib/include/wx/ogl/divided.h
+++ b/contrib/include/wx/ogl/divided.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DIVIDED_H_
@@ -39,7 +39,7 @@ class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);

-  void SetSize(double w, double h, bool recursive = true);
+  void SetSize(double w, double h, bool recursive = TRUE);

  void MakeControlPoints();
  void ResetControlPoints();
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DRAWN_H_
@@ -100,8 +100,8 @@ public:
  virtual void SetClippingRect(const wxRect& rect);
  virtual void DestroyClippingRect();

-  virtual void SetPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.
+  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
  virtual void SetFont(wxFont* font);
  virtual void SetTextColour(const wxColour& colour);
  virtual void SetBackgroundColour(const wxColour& colour);
@@ -155,7 +155,7 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
  // Get current rotation
  inline double GetRotation() const { return m_rotation; }

-  void SetSize(double w, double h, bool recursive = true);
+  void SetSize(double w, double h, bool recursive = TRUE);
  bool LoadFromMetaFile(const wxString& filename);

  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
@@ -188,8 +188,8 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
  virtual void SetClippingRect(const wxRect& rect);
  virtual void DestroyClippingRect();

-  virtual void SetDrawnPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.
+  virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
  virtual void SetDrawnFont(wxFont* font);
  virtual void SetDrawnTextColour(const wxColour& colour);
  virtual void SetDrawnBackgroundColour(const wxColour& colour);
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DRAWNP_H_
@@ -70,9 +70,9 @@ public:
 #endif
  inline int GetOp() const { return m_op; }

-  // Draw an outline using the current operation. By default, return false (not drawn)
+  // Draw an outline using the current operation. By default, return FALSE (not drawn)
  virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h),
-    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return false; }
+    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return FALSE; }

  // Get the perimeter point using this data
  virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
@@ -80,7 +80,7 @@ public:
                                     double *WXUNUSED(x3), double *WXUNUSED(y3),
                                     double WXUNUSED(xOffset), double WXUNUSED(yOffset),
                                     int WXUNUSED(attachmentMode))
-  { return false; }
+  { return FALSE; }

 protected:
  int           m_op;
--- a/contrib/include/wx/ogl/lines.h
+++ b/contrib/include/wx/ogl/lines.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_LINES_H_
@@ -83,7 +83,7 @@ class WXDLLIMPEXP_OGL wxArrowHead: public wxObject
  double             m_spacing;          // Spacing from the last arrowhead
  double             m_arrowSize;        // Length of arrowhead
  wxString          m_arrowName;        // Name of arrow
-  bool              m_saveToFile;       // true if we want to save custom arrowheads to file.
+  bool              m_saveToFile;       // TRUE if we want to save custom arrowheads to file.
  wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
  long              m_id;               // identifier
 };
@@ -102,14 +102,14 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // correct position
  // moveControlPoints must be disabled when a control point is being
  // dragged.
-  void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
  void OnDrawControlPoints(wxDC& dc);
  void OnEraseControlPoints(wxDC& dc);
  void OnErase(wxDC& dc);
-  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return false; }
+  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return FALSE; }
  virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
  virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
@@ -176,9 +176,9 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);

  // Override select, to create/delete temporary label-moving objects
-  void Select(bool select = true, wxDC* dc = NULL);
+  void Select(bool select = TRUE, wxDC* dc = NULL);

-  // Set to spline (true) or line (false)
+  // Set to spline (TRUE) or line (FALSE)
  inline void SetSpline(bool spl) { m_isSpline = spl; }
  inline bool IsSpline() const { return m_isSpline; }

@@ -204,7 +204,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // This is really to distinguish between lines and other images.
  // For lines, want to pass drag to canvas, since lines tend to prevent
  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return false; }
+  virtual bool Draggable() const { return FALSE; }

  // Does the copying for this object
  void Copy(wxShape& copy);
@@ -221,7 +221,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // E.g. reference list:      a b c d e
  //      Current line list:   a d
  // Add c, then line list is: a c d
-  // If no legal arrowhead position, return false.
+  // If no legal arrowhead position, return FALSE.
  // Assume reference list is for one end only, since it potentially defines
  // the ordering for any one of the 3 positions. So we don't check
  // the reference list for arrowhead position.
--- a/contrib/include/wx/ogl/linesp.h
+++ b/contrib/include/wx/ogl/linesp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_LINESP_H_
@@ -68,7 +68,7 @@ class WXDLLIMPEXP_OGL wxLabelShape: public wxRectangleShape
  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);

 public:
  wxLineShape*      m_lineShape;
--- a/contrib/include/wx/ogl/mfutils.h
+++ b/contrib/include/wx/ogl/mfutils.h
@@ -7,7 +7,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _MFUTILS_H_
@@ -21,253 +21,253 @@
 #include <wx/metafile.h>

 #ifndef GetRValue
-#define GetRValue(rgb) ((unsigned char)(rgb))
-#define GetGValue(rgb) ((unsigned char)(((int)(rgb)) >> 8))
-#define GetBValue(rgb) ((unsigned char)((rgb)>>16))
+#define GetRValue(rgb)	    ((unsigned char)(rgb))
+#define GetGValue(rgb)      ((unsigned char)(((int)(rgb)) >> 8))
+#define GetBValue(rgb)	    ((unsigned char)((rgb)>>16))
 #endif

 /* Metafile Functions */
 // some compilers have them in their include files

 #ifndef META_SETBKCOLOR
-  #define META_SETBKCOLOR            0x0201
+  #define META_SETBKCOLOR		     0x0201
 #endif
 #ifndef META_SETBKMODE
-  #define META_SETBKMODE             0x0102
+  #define META_SETBKMODE		     0x0102
 #endif
 #ifndef META_SETMAPMODE
-  #define META_SETMAPMODE            0x0103
+  #define META_SETMAPMODE		     0x0103
 #endif
 #ifndef META_SETROP2
-  #define META_SETROP2               0x0104
+  #define META_SETROP2		     0x0104
 #endif
 #ifndef META_SETRELABS
-  #define META_SETRELABS             0x0105
+  #define META_SETRELABS		     0x0105
 #endif
 #ifndef META_SETPOLYFILLMODE
-  #define META_SETPOLYFILLMODE       0x0106
+  #define META_SETPOLYFILLMODE	     0x0106
 #endif
 #ifndef META_SETSTRETCHBLTMODE
-  #define META_SETSTRETCHBLTMODE     0x0107
+  #define META_SETSTRETCHBLTMODE	     0x0107
 #endif
 #ifndef META_SETTEXTCHAREXTRA
-  #define META_SETTEXTCHAREXTRA      0x0108
+  #define META_SETTEXTCHAREXTRA	     0x0108
 #endif
 #ifndef META_SETTEXTCOLOR
-  #define META_SETTEXTCOLOR          0x0209
+  #define META_SETTEXTCOLOR	     0x0209
 #endif
 #ifndef META_SETTEXTJUSTIFICATION
-  #define META_SETTEXTJUSTIFICATION  0x020A
+  #define META_SETTEXTJUSTIFICATION    0x020A
 #endif
 #ifndef META_SETWINDOWORG
-  #define META_SETWINDOWORG          0x020B
+  #define META_SETWINDOWORG	     0x020B
 #endif
 #ifndef META_SETWINDOWEXT
-  #define META_SETWINDOWEXT          0x020C
+  #define META_SETWINDOWEXT	     0x020C
 #endif
 #ifndef META_SETVIEWPORTORG
-  #define META_SETVIEWPORTORG        0x020D
+  #define META_SETVIEWPORTORG	     0x020D
 #endif
 #ifndef META_SETVIEWPORTEXT
-  #define META_SETVIEWPORTEXT        0x020E
+  #define META_SETVIEWPORTEXT	     0x020E
 #endif
 #ifndef META_OFFSETWINDOWORG
-  #define META_OFFSETWINDOWORG       0x020F
+  #define META_OFFSETWINDOWORG	     0x020F
 #endif
 #ifndef META_SCALEWINDOWEXT
-  #define META_SCALEWINDOWEXT        0x0410
+  #define META_SCALEWINDOWEXT	     0x0410
 #endif
 #ifndef META_OFFSETVIEWPORTORG
-  #define META_OFFSETVIEWPORTORG     0x0211
+  #define META_OFFSETVIEWPORTORG	     0x0211
 #endif
 #ifndef META_SCALEVIEWPORTEXT
-  #define META_SCALEVIEWPORTEXT      0x0412
+  #define META_SCALEVIEWPORTEXT	     0x0412
 #endif
 #ifndef META_LINETO
-  #define META_LINETO                0x0213
+  #define META_LINETO		     0x0213
 #endif
 #ifndef META_MOVETO
-  #define META_MOVETO                0x0214
+  #define META_MOVETO		     0x0214
 #endif
 #ifndef META_EXCLUDECLIPRECT
-  #define META_EXCLUDECLIPRECT       0x0415
+  #define META_EXCLUDECLIPRECT	     0x0415
 #endif
 #ifndef META_INTERSECTCLIPRECT
-  #define META_INTERSECTCLIPRECT     0x0416
+  #define META_INTERSECTCLIPRECT	     0x0416
 #endif
 #ifndef META_ARC
-  #define META_ARC                   0x0817
+  #define META_ARC		     0x0817
 #endif
 #ifndef META_ELLIPSE
-  #define META_ELLIPSE               0x0418
+  #define META_ELLIPSE		     0x0418
 #endif
 #ifndef META_FLOODFILL
-  #define META_FLOODFILL             0x0419
+  #define META_FLOODFILL		     0x0419
 #endif
 #ifndef META_PIE
-  #define META_PIE                   0x081A
+  #define META_PIE		     0x081A
 #endif
 #ifndef META_RECTANGLE
-  #define META_RECTANGLE             0x041B
+  #define META_RECTANGLE		     0x041B
 #endif
 #ifndef META_ROUNDRECT
-  #define META_ROUNDRECT             0x061C
+  #define META_ROUNDRECT		     0x061C
 #endif
 #ifndef META_PATBLT
-  #define META_PATBLT                0x061D
+  #define META_PATBLT		     0x061D
 #endif
 #ifndef META_SAVEDC
-  #define META_SAVEDC                0x001E
+  #define META_SAVEDC		     0x001E
 #endif
 #ifndef META_SETPIXEL
-  #define META_SETPIXEL              0x041F
+  #define META_SETPIXEL		     0x041F
 #endif
 #ifndef META_OFFSETCLIPRGN
-  #define META_OFFSETCLIPRGN         0x0220
+  #define META_OFFSETCLIPRGN	     0x0220
 #endif
 #ifndef META_TEXTOUT
-  #define META_TEXTOUT               0x0521
+  #define META_TEXTOUT		     0x0521
 #endif
 #ifndef META_BITBLT
-  #define META_BITBLT                0x0922
+  #define META_BITBLT		     0x0922
 #endif
 #ifndef META_STRETCHBLT
-  #define META_STRETCHBLT            0x0B23
+  #define META_STRETCHBLT		     0x0B23
 #endif
 #ifndef META_POLYGON
-  #define META_POLYGON               0x0324
+  #define META_POLYGON		     0x0324
 #endif
 #ifndef META_POLYLINE
-  #define META_POLYLINE              0x0325
+  #define META_POLYLINE		     0x0325
 #endif
 #ifndef META_ESCAPE
-  #define META_ESCAPE                0x0626
+  #define META_ESCAPE		     0x0626
 #endif
 #ifndef META_RESTOREDC
-  #define META_RESTOREDC             0x0127
+  #define META_RESTOREDC		     0x0127
 #endif
 #ifndef META_FILLREGION
-  #define META_FILLREGION            0x0228
+  #define META_FILLREGION		     0x0228
 #endif
 #ifndef META_FRAMEREGION
-  #define META_FRAMEREGION           0x0429
+  #define META_FRAMEREGION	     0x0429
 #endif
 #ifndef META_INVERTREGION
-  #define META_INVERTREGION          0x012A
+  #define META_INVERTREGION	     0x012A
 #endif
 #ifndef META_PAINTREGION
-  #define META_PAINTREGION           0x012B
+  #define META_PAINTREGION	     0x012B
 #endif
 #ifndef META_SELECTCLIPREGION
-  #define META_SELECTCLIPREGION      0x012C
+  #define META_SELECTCLIPREGION	     0x012C
 #endif
 #ifndef META_SELECTOBJECT
-  #define META_SELECTOBJECT          0x012D
+  #define META_SELECTOBJECT	     0x012D
 #endif
 #ifndef META_SETTEXTALIGN
-  #define META_SETTEXTALIGN          0x012E
+  #define META_SETTEXTALIGN	     0x012E
 #endif
 #ifndef META_DRAWTEXT
-  #define META_DRAWTEXT              0x062F
+  #define META_DRAWTEXT		     0x062F
 #endif

 #ifndef META_CHORD
-  #define META_CHORD                 0x0830
+  #define	META_CHORD		     0x0830
 #endif
 #ifndef META_SETMAPPERFLAGS
-  #define META_SETMAPPERFLAGS        0x0231
+  #define	META_SETMAPPERFLAGS	     0x0231
 #endif
 #ifndef META_EXTTEXTOUT
-  #define META_EXTTEXTOUT            0x0a32
+  #define	META_EXTTEXTOUT		     0x0a32
 #endif
 #ifndef META_SETDIBTODEV
-  #define META_SETDIBTODEV           0x0d33
+  #define	META_SETDIBTODEV	     0x0d33
 #endif
 #ifndef META_SELECTPALETTE
-  #define META_SELECTPALETTE         0x0234
+  #define	META_SELECTPALETTE	     0x0234
 #endif
 #ifndef META_REALIZEPALETTE
-  #define META_REALIZEPALETTE        0x0035
+  #define	META_REALIZEPALETTE	     0x0035
 #endif
 #ifndef META_ANIMATEPALETTE
-  #define META_ANIMATEPALETTE        0x0436
+  #define	META_ANIMATEPALETTE	     0x0436
 #endif
 #ifndef META_SETPALENTRIES
-  #define META_SETPALENTRIES         0x0037
+  #define	META_SETPALENTRIES	     0x0037
 #endif
 #ifndef META_POLYPOLYGON
-  #define META_POLYPOLYGON           0x0538
+  #define	META_POLYPOLYGON	     0x0538
 #endif
 #ifndef META_RESIZEPALETTE
-  #define META_RESIZEPALETTE         0x0139
+  #define	META_RESIZEPALETTE	     0x0139
 #endif

 #ifndef META_DIBBITBLT
-  #define META_DIBBITBLT             0x0940
+  #define	META_DIBBITBLT		     0x0940
 #endif
 #ifndef META_DIBSTRETCHBLT
-  #define META_DIBSTRETCHBLT         0x0b41
+  #define	META_DIBSTRETCHBLT	     0x0b41
 #endif
 #ifndef META_DIBCREATEPATTERNBRUSH
-  #define META_DIBCREATEPATTERNBRUSH 0x0142
+  #define	META_DIBCREATEPATTERNBRUSH   0x0142
 #endif
 #ifndef META_STRETCHDIB
-  #define META_STRETCHDIB            0x0f43
+  #define	META_STRETCHDIB		     0x0f43
 #endif

 #ifndef META_EXTFLOODFILL
-  #define META_EXTFLOODFILL          0x0548
+  #define META_EXTFLOODFILL	     0x0548
 #endif

 #ifndef META_RESETDC
-  #define META_RESETDC               0x014C
+  #define META_RESETDC		     0x014C
 #endif
 #ifndef META_STARTDOC
-  #define META_STARTDOC              0x014D
+  #define META_STARTDOC		     0x014D
 #endif
 #ifndef META_STARTPAGE
-  #define META_STARTPAGE             0x004F
+  #define META_STARTPAGE		     0x004F
 #endif
 #ifndef META_ENDPAGE
-  #define META_ENDPAGE               0x0050
+  #define META_ENDPAGE		     0x0050
 #endif
 #ifndef META_ABORTDOC
-  #define META_ABORTDOC              0x0052
+  #define META_ABORTDOC		     0x0052
 #endif
 #ifndef META_ENDDOC
-  #define META_ENDDOC                0x005E
+  #define META_ENDDOC		     0x005E
 #endif

 #ifndef META_DELETEOBJECT
-  #define META_DELETEOBJECT          0x01f0
+  #define	META_DELETEOBJECT	     0x01f0
 #endif

 #ifndef META_CREATEPALETTE
-  #define META_CREATEPALETTE         0x00f7
+  #define	META_CREATEPALETTE	     0x00f7
 #endif
 #ifndef META_CREATEBRUSH
-  #define META_CREATEBRUSH           0x00F8
+  #define META_CREATEBRUSH	     0x00F8
 #endif
 #ifndef META_CREATEPATTERNBRUSH
-  #define META_CREATEPATTERNBRUSH    0x01F9
+  #define META_CREATEPATTERNBRUSH	     0x01F9
 #endif
 #ifndef META_CREATEPENINDIRECT
-  #define META_CREATEPENINDIRECT     0x02FA
+  #define META_CREATEPENINDIRECT	     0x02FA
 #endif
 #ifndef META_CREATEFONTINDIRECT
-  #define META_CREATEFONTINDIRECT    0x02FB
+  #define META_CREATEFONTINDIRECT	     0x02FB
 #endif
 #ifndef META_CREATEBRUSHINDIRECT
-  #define META_CREATEBRUSHINDIRECT   0x02FC
+  #define META_CREATEBRUSHINDIRECT     0x02FC
 #endif
 #ifndef META_CREATEBITMAPINDIRECT
-  #define META_CREATEBITMAPINDIRECT  0x02FD
+  #define META_CREATEBITMAPINDIRECT    0x02FD
 #endif
 #ifndef META_CREATEBITMAP
-  #define META_CREATEBITMAP          0x06FE
+  #define META_CREATEBITMAP	     0x06FE
 #endif
 #ifndef META_CREATEREGION
-  #define META_CREATEREGION          0x06FF
+  #define META_CREATEREGION	     0x06FF
 #endif

 /* Background Modes */
@@ -280,25 +280,25 @@

 /* Pen Styles */
 #ifndef PS_SOLID
-  #define PS_SOLID        0
+  #define PS_SOLID	    0
 #endif
 #ifndef PS_DASH
-  #define PS_DASH         1
+  #define PS_DASH             1
 #endif
 #ifndef PS_DOT
-  #define PS_DOT          2
+  #define PS_DOT              2
 #endif
 #ifndef PS_DASHDOT
-  #define PS_DASHDOT      3
+  #define PS_DASHDOT          3
 #endif
 #ifndef PS_DASHDOTDOT
-  #define PS_DASHDOTDOT   4
+  #define PS_DASHDOTDOT       4
 #endif
 #ifndef PS_NULL
-  #define PS_NULL         5
+  #define PS_NULL 	    5
 #endif
 #ifndef PS_INSIDEFRAME
-  #define PS_INSIDEFRAME  6
+  #define PS_INSIDEFRAME 	    6
 #endif

 /* PitchAndFamily family values (high 4 bits) */
@@ -323,25 +323,25 @@

 /* Brush Styles */
 #ifndef BS_SOLID
-  #define BS_SOLID        0
+  #define BS_SOLID	    0
 #endif
 #ifndef BS_NULL
-  #define BS_NULL         1
+  #define BS_NULL		    1
 #endif
 #ifndef BS_HOLLOW
-  #define BS_HOLLOW       BS_NULL
+  #define BS_HOLLOW	    BS_NULL
 #endif
 #ifndef BS_HATCHED
-  #define BS_HATCHED      2
+  #define BS_HATCHED	    2
 #endif
 #ifndef BS_PATTERN
-  #define BS_PATTERN      3
+  #define BS_PATTERN	    3
 #endif
 #ifndef BS_INDEXED
-  #define BS_INDEXED      4
+  #define BS_INDEXED	    4
 #endif
 #ifndef BS_DIBPATTERN
-  #define BS_DIBPATTERN   5
+  #define	BS_DIBPATTERN	    5
 #endif

 /* Hatch Styles */
--- a/contrib/include/wx/ogl/misc.h
+++ b/contrib/include/wx/ogl/misc.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_MISC_H_
--- a/contrib/include/wx/ogl/ogl.h
+++ b/contrib/include/wx/ogl/ogl.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_OGL_H_
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_OGLDIAG_H_
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1311,14 +1311,14 @@ public:
    %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
    %pythonAppend wxStyledTextCtrl() ""

-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxPySTCNameStr);
    %name(PreStyledTextCtrl) wxStyledTextCtrl();
    
 #else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxSTCNameStr);
@@ -1327,7 +1327,7 @@ public:
    
 #endif

-    void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
+    void Create(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxSTCNameStr);
@@ -2730,7 +2730,6 @@ private:
    void OnListBox(wxCommandEvent& evt);
    void OnIdle(wxIdleEvent& evt);
    
-    virtual wxSize DoGetBestSize() const;

    // Turn notifications from Scintilla into events
    void NotifyChange();
@@ -2867,6 +2866,7 @@ BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD,        1660)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK,        1661)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN,          1662)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_POSCHANGED,         1663)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED,            1664)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION,  1665)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED,         1666)
@@ -2895,6 +2895,7 @@ END_DECLARE_EVENT_TYPES()
        wxEVT_STC_MACRORECORD,
        wxEVT_STC_MARGINCLICK,
        wxEVT_STC_NEEDSHOWN,
+        wxEVT_STC_POSCHANGED,
        wxEVT_STC_PAINTED,
        wxEVT_STC_USERLISTSELECTION,
        wxEVT_STC_URIDROPPED,
@@ -2928,6 +2929,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_MACRORECORD(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_MARGINCLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_NEEDSHOWN(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_STC_POSCHANGED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED,            id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_PAINTED(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_USERLISTSELECTION(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_URIDROPPED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
--- a/contrib/include/wx/xrc/xh_gauge.h
+++ b/contrib/include/wx/xrc/xh_gauge.h
@@ -24,7 +24,7 @@

 class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
    enum
    {
        wxGAUGE_DEFAULT_RANGE = 100
--- a/contrib/include/wx/xrc/xh_menu.h
+++ b/contrib/include/wx/xrc/xh_menu.h
@@ -31,7 +31,7 @@ private:

 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
    public:
        wxMenuBarXmlHandler();
        virtual wxObject *DoCreateResource();
--- a/contrib/include/wx/xrc/xh_scrol.h
+++ b/contrib/include/wx/xrc/xh_scrol.h
@@ -22,7 +22,7 @@

 class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
    enum
    {
        wxSL_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xh_sizer.h
+++ b/contrib/include/wx/xrc/xh_sizer.h
@@ -33,7 +33,7 @@ public:
 private:
    bool m_isInside;
    bool m_isGBS;
-
+    
    wxSizer *m_parentSizer;

    bool IsSizerNode(wxXmlNode *node);
@@ -52,7 +52,7 @@ private:
    wxGBSpan GetGBSpan(const wxString& param);
    wxSizerItem* MakeSizerItem();
    void SetSizerItemAttributes(wxSizerItem* sitem);
-    void AddSizerItem(wxSizerItem* sitem);
+    void AddSizerItem(wxSizerItem* sitem);    
 };


--- a/contrib/include/wx/xrc/xh_slidr.h
+++ b/contrib/include/wx/xrc/xh_slidr.h
@@ -22,7 +22,7 @@

 class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
    enum
    {
        wxSL_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xh_spin.h
+++ b/contrib/include/wx/xrc/xh_spin.h
@@ -21,7 +21,7 @@
 #if wxUSE_SPINBTN
 class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
    enum
    {
        wxSP_DEFAULT_VALUE = 0,
@@ -39,7 +39,7 @@ public:
 #if wxUSE_SPINCTRL
 class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
+	DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
    enum
    {
        wxSP_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -93,8 +93,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
 enum wxXmlResourceFlags
 {
    wxXRC_USE_LOCALE     = 1,
-    wxXRC_NO_SUBCLASSING = 2,
-    wxXRC_NO_RELOADING   = 4
+    wxXRC_NO_SUBCLASSING = 2
 };

 // This class holds XML resources from one or more .xml files
@@ -241,7 +240,7 @@ protected:
    bool UpdateResources();

    // Finds a resource (calls UpdateResources) and returns a node containing it.
-    wxXmlNode *FindResource(const wxString& name, const wxString& classname, bool recursive = false);
+    wxXmlNode *FindResource(const wxString& name, const wxString& classname, bool recursive = FALSE);

    // Helper function: finds a resource (calls UpdateResources) and returns a node containing it.
    wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
@@ -330,8 +329,8 @@ public:
    // were filled.
    virtual wxObject *DoCreateResource() = 0;

-    // Returns true if it understands this node and can create
-    // a resource from it, false otherwise.
+    // Returns TRUE if it understands this node and can create
+    // a resource from it, FALSE otherwise.
    virtual bool CanHandle(wxXmlNode *node) = 0;

    // Sets the parent resource.
@@ -386,7 +385,7 @@ protected:
    // - replaces \n, \r, \t by respective chars (according to C syntax)
    // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
    // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param, bool translate = true);
+    wxString GetText(const wxString& param, bool translate = TRUE);

    // Returns the XRCID.
    int GetID();
@@ -394,8 +393,8 @@ protected:
    // Returns the resource name.
    wxString GetName();

-    // Gets a bool flag (1, t, yes, on, true are true, everything else is false).
-    bool GetBool(const wxString& param, bool defaultv = false);
+    // Gets a bool flag (1, t, yes, on, true are TRUE, everything else is FALSE).
+    bool GetBool(const wxString& param, bool defaultv = FALSE);

    // Gets the integer value from the parameter.
    long GetLong( const wxString& param, long defaultv = 0 );
@@ -429,7 +428,7 @@ protected:
    void SetupWindow(wxWindow *wnd);

    // Creates children.
-    void CreateChildren(wxObject *parent, bool this_hnd_only = false);
+    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);

    // Helper function.
    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
--- a/contrib/samples/animate/anitest.cpp
+++ b/contrib/samples/animate/anitest.cpp
@@ -93,9 +93,7 @@ bool MyApp::OnInit()
    // Associate the menu bar with the frame
    frame->SetMenuBar(menu_bar);

-#if wxUSE_STATUSBAR
    frame->CreateStatusBar();
-#endif // wxUSE_STATUSBAR

    frame->Show(TRUE);

--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -75,7 +75,7 @@ bool MyApp::OnInit(void)
  m_mainFrame->Show(true);

  SetTopWindow(m_mainFrame);
-
+    
  return true;
 }

@@ -266,7 +266,7 @@ void MyApp::PropertyFormTest(bool useDialog)
        panel->SetConstraints(c);
    }
 #endif
-
+ 
    // Add items to the panel
    wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxDefaultPosition,
        wxSize(80, 26), 0, wxDefaultValidator, _T("ok"));
@@ -306,8 +306,8 @@ void MyApp::PropertyFormTest(bool useDialog)
    okButton->SetConstraints(c);

    // The name of this text item matches the "fred" property
-    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,
-        wxSize( 200, wxDefaultCoord), 0, wxDefaultValidator, _T("fred"));
+    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition, 
+        wxSize( 200, wxDefaultSize.y), 0, wxDefaultValidator, _T("fred"));

    c = new wxLayoutConstraints;
    c->left.SameAs(panel, wxLeft, 4);
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -103,14 +103,12 @@ bool MyApp::OnInit(void)
 #endif

    // Create the main frame window
-    frame = new MyFrame( (wxFrame *) NULL, wxID_ANY,
+    frame = new MyFrame( (wxFrame *) NULL, -1,
                         wxT("wxWidgets Resource Sample"),
-                         wxDefaultPosition, wxSize(300, 250) );
+                         wxPoint(-1, -1), wxSize(300, 250) );

-#if wxUSE_STATUSBAR
    // Give it a status line
    frame->CreateStatusBar(2);
-#endif // wxUSE_STATUSBAR

    wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1"));

@@ -118,13 +116,13 @@ bool MyApp::OnInit(void)
    frame->SetMenuBar(menu_bar);

    // Make a panel
-    frame->panel = new MyPanel( frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400),
+    frame->panel = new MyPanel( frame, -1, wxPoint(0, 0), wxSize(400, 400),
                                0, wxT("MyMainFrame") );
-    frame->Show(true);
+    frame->Show(TRUE);

    SetTopWindow(frame);

-    return true;
+    return TRUE;
 }

 MyApp::~MyApp()
@@ -181,7 +179,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Close(true);
+    Close(TRUE);
 }

 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
@@ -199,7 +197,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
        dialog->ShowModal();
    }

-    dialog->Close(true);
+    dialog->Close(TRUE);
 }

 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ b/contrib/samples/deprecated/treelay/treelay.cpp
@@ -41,12 +41,10 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
  // Create the main frame window
-  MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxDefaultPosition, wxSize(400, 550));
+  MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxPoint(-1, -1), wxSize(400, 550));

-#if wxUSE_STATUSBAR
  // Give it a status line
  frame->CreateStatusBar(2);
-#endif // wxUSE_STATUSBAR

  // Give it an icon
 #ifdef __WINDOWS__
@@ -85,14 +83,12 @@ bool MyApp::OnInit()
  dc.SetFont(font);
  TreeTest(*myTree, dc);

-  frame->Show(true);
+  frame->Show(TRUE);

-#if wxUSE_STATUSBAR
  frame->SetStatusText(_T("Hello, tree!"));
-#endif // wxUSE_STATUSBAR

  // Return the main frame window
-  return true;
+  return TRUE;
 }

 int MyApp::OnExit()
@@ -152,20 +148,20 @@ END_EVENT_TABLE()

 // Define my frame constructor
 MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, wxID_ANY, title, pos, size)
+  wxFrame(parent, -1, title, pos, size)
 {
 }

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(true);
+    Close(TRUE);
 }

 void MyFrame::OnLeftRight(wxCommandEvent& WXUNUSED(event))
 {
      if (myTree)
      {
-        myTree->SetOrientation(false);
+        myTree->SetOrientation(FALSE);
        wxClientDC dc(canvas);
        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
        dc.SetFont(font);
@@ -178,7 +174,7 @@ void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
 {
      if (myTree)
      {
-        myTree->SetOrientation(true);
+        myTree->SetOrientation(TRUE);
        wxClientDC dc(canvas);
        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
        dc.SetFont(font);
@@ -203,7 +199,7 @@ END_EVENT_TABLE()

 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent):
- wxScrolledWindow(parent, wxID_ANY)
+ wxScrolledWindow(parent, -1)
 {
    SetBackgroundColour(*wxWHITE);
 }
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -49,7 +49,7 @@
 char  wxDummyChar;


-IMPLEMENT_APP (MyApp)
+IMPLEMENT_APP	(MyApp)

 bool MyApp::OnInit(void)
 {
@@ -69,11 +69,9 @@ bool MyApp::OnInit(void)
    
    frame->SetMenuBar(menu_bar);
    
-#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
    
-    frame->Show(true);
+    frame->Show(TRUE);
    
    frame->mpClientWnd->Refresh();
    
@@ -85,7 +83,7 @@ The ONLY purpose is to demonstrate self-layouting toolbars,\nflat-bitmapped-butt
 (cbRowDragPlugin & cbBarHintsPlugin)\n\n\
 BTW, disabled images and label-text are rendered at run-time") );
    
-    return true;
+    return TRUE;
 }

 /***** Implementation for class MyFrame *****/
@@ -99,7 +97,7 @@ BEGIN_EVENT_TABLE( MyFrame, wxFrame )
 END_EVENT_TABLE()

 void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
+{						
    wxMessageBox(_T("Hey - you found a BIG question-mark !!"));
 }

@@ -117,7 +115,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
    wxTextCtrl* pCtrl = 
        
-        new wxTextCtrl( this, wxID_ANY, value, 
+        new wxTextCtrl( this, -1, value, 
        wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -126,7 +124,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 }

 MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, wxID_ANY, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
+    : wxFrame( frame, -1, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
          wxSize( 700, 500 ), 
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | 
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION, 
@@ -140,7 +138,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbCommonPaneProperties props;
    mpLayout->GetPaneProperties( props );
    
-    props.mRealTimeUpdatesOn = false; // real-time OFF!!!
+    props.mRealTimeUpdatesOn = FALSE; // real-time OFF!!!
    
    mpLayout->SetPaneProperties( props, wxALL_PANES );
 #endif
@@ -163,7 +161,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes0( 200,45, // when docked horizontally      
                      200,85, // when docked vertically        
                      175,35, // when floated                  
-                      false,  // the bar is not fixed-size
+                      FALSE,  // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4       // horizontal gap (bar border)
                    ); 
@@ -171,7 +169,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes1( 150,35, // when docked horizontally      
                      150,85, // when docked vertically        
                      175,35, // when floated                  
-                      true,   // the bar is not fixed-size
+                      TRUE,   // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4       // horizontal gap (bar border)
                    ); 
@@ -179,7 +177,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes2( 195,35, // when docked horizontally      
                      185,37, // when docked vertically        
                      195,35, // when floated                  
-                      true,   // the bar is not fixed-size
+                      TRUE,   // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4,      // horizontal gap (bar border)
                      new cbDynToolBarDimHandler()
@@ -190,7 +188,7 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("InfoViewer1"),            // name to refer in customization pop-ups
-                      true
+                      TRUE
                    );
    
    mpLayout->AddBar( CreateTextCtrl(_("Bye")),    // bar window
@@ -198,7 +196,7 @@ MyFrame::MyFrame(wxFrame *frame)
                      1,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("InfoViewer2"),            // name to refer in customization pop-ups
-                      true
+                      TRUE
                    );
    
    mpLayout->AddBar( CreateTextCtrl(_("Fixed0")), // bar window
@@ -206,12 +204,12 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("ToolBar1"),               // name to refer in customization pop-ups
-                      true
+                      TRUE
                    );
    
    wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
    
-    pToolBar->Create( this, wxID_ANY );
+    pToolBar->Create( this, -1 );
    
    // 1001-1006 ids of command events fired by added tool-buttons

@@ -219,9 +217,7 @@ MyFrame::MyFrame(wxFrame *frame)
    pToolBar->AddSeparator();
    pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
    pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
-#if wxUSE_STATLINE
-    pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));    
-#endif // wxUSE_STATLINE
+    pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, -1));    
    pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
    pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
    pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
@@ -232,10 +228,10 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                    // insert into 0th row (vert. position)
                      0,                    // offset from the start of row (in pixels)
                      wxT("ToolBar2"),           // name to refer in customization pop-ups
-                      false
+                      FALSE
                    );
    
-    mpLayout->EnableFloating( true ); // off, thinking about wxGtk...
+    mpLayout->EnableFloating( TRUE ); // off, thinking about wxGtk...
 }

 MyFrame::~MyFrame()
@@ -245,7 +241,6 @@ MyFrame::~MyFrame()
 }

 #define LINE_SIZE 3
-#if wxUSE_STATLINE
 void wxMySeparatorLine::DoSetSize( int x, int y,
                                   int width, int height,
                                   int sizeFlags)
@@ -263,4 +258,3 @@ void wxMySeparatorLine::DoSetSize( int x, int y,
    
    wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
 }
-#endif // wxUSE_STATLINE
--- a/contrib/samples/fl/fl_demo1.h
+++ b/contrib/samples/fl/fl_demo1.h
@@ -43,7 +43,7 @@ public:
    MyFrame(wxFrame *frame);
    virtual ~MyFrame();
    
-    bool OnClose(void) { Show(false); return true; }
+    bool OnClose(void) { Show(FALSE); return TRUE; }
    
    void OnLoad( wxCommandEvent& event );
    void OnSave( wxCommandEvent& event );
@@ -52,7 +52,6 @@ public:
    DECLARE_EVENT_TABLE()
 };

-#if wxUSE_STATLINE
 /*
 * Quick example of your own Separator class...
 */
@@ -70,7 +69,6 @@ protected:
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
 };
-#endif // wxUSE_STATLINE

 #endif

--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -96,9 +96,7 @@ bool MyApp::OnInit(void)
    menu_bar->Append(file_menu,   _("&File"));
    menu_bar->Append(active_menu, _("Active &Layout"));

-#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR

    frame->SetMenuBar(menu_bar);

@@ -205,7 +203,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h

    // Create all layouts
    for( i = 0; i != MAX_LAYOUTS; ++i )
-    {
+    {	
        CreateLayout( i );
    }
    // hide others
@@ -491,17 +489,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
 {
    wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, wxID_ANY );

-    const wxTreeItemId rootid = pTree->AddRoot(label);
+    const wxTreeItemId rootid = pTree->AppendItem( (long)0, label, 0);

-    if ( label.StartsWith(_T("X")) )
+    if ( label[0] != 'X' )
    {
-        pTree->AppendItem(rootid, _("Scully"));
-        pTree->AppendItem(rootid, _("Mulder"));
+        pTree->AppendItem(rootid, _("Leaf1"), 0);
+        pTree->AppendItem(rootid, _("Leaf2"), 0);
    }
    else
    {
-        pTree->AppendItem(rootid, _("Leaf1"));
-        pTree->AppendItem(rootid, _("Leaf2"));
+        pTree->AppendItem(rootid, _("Scully"), 0);
+        pTree->AppendItem(rootid, _("Mulder"), 0);
    }

    return pTree;
@@ -673,7 +671,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
    pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );

    // now create "output" window
-    wxNotebook* pTabbedArea = new wxNotebook(pParent, wxID_ANY);
+    wxNotebook*	pTabbedArea = new wxNotebook(pParent, wxID_ANY);
    // SEB: originally here was a wxpp (wxWorkshop) class used
    //    wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
    //    pTabbedArea->Create( pParent, wxID_ANY );
--- a/contrib/samples/fl/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2.h
@@ -6,7 +6,7 @@
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
+// Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __FLDEMO_G__
@@ -14,7 +14,7 @@

 // ID for the menu commands

-#define MINIMAL_QUIT    1
+#define MINIMAL_QUIT 	1
 #define MINIMAL_ABOUT 102

 #define ID_LOAD      103
@@ -25,7 +25,7 @@
 #define ID_REMOVEALL 108
 #define ID_RECREATE  109
 #define ID_ACTIVATE  110
-#define ID_FIRST     111
+#define ID_FIRST	 111
 #define ID_SECOND    112
 #define ID_THIRD     113

@@ -144,10 +144,10 @@ class StartButton95 : public wxPanel
    wxBitmap m_DBmp;
    
 public:
-    StartButton95(void) : m_bPressed(false) {}
+    StartButton95(void) : m_bPressed(FALSE) {}
    
    StartButton95(wxWindow* parent) 
-        : m_bPressed(false) { wxPanel::Create(parent,wxID_ANY); }
+        : m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
    
    void OnMouseDown( wxMouseEvent& event );
    void OnMouseUp( wxMouseEvent& event );
--- a/contrib/samples/fl/fl_sample1.cpp
+++ b/contrib/samples/fl/fl_sample1.cpp
@@ -56,7 +56,7 @@ public:
    void OnStore( wxCommandEvent& event );
    void OnQuit( wxCommandEvent& event );
    
-    bool OnClose(void) { return true; }
+    bool OnClose(void) { return TRUE; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -83,16 +83,14 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
-#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(true);
+    frame->Show(TRUE);
    
    SetTopWindow(frame);
    
-    return true;
+    return TRUE;
 }

 /***** Immlementation for class MyFrame *****/
@@ -104,7 +102,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
+    : wxFrame( parent, -1, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
@@ -124,7 +122,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbCommonPaneProperties props;
    mpLayout->GetPaneProperties( props );
    
-    props.mRealTimeUpdatesOn = false; // off
+    props.mRealTimeUpdatesOn = FALSE; // off
    
    mpLayout->SetPaneProperties( props, wxALL_PANES );    
 #endif
@@ -136,7 +134,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbDimInfo sizes( 80,65, // when docked horizontally      
                     80,65, // when docked vertically        
                     80,30, // when floated                  
-                     true,  // the bar is fixed-size
+                     TRUE,  // the bar is fixed-size
                     5,     // vertical gap (bar border)
                     5      // horizontal gap (bar border)
                   ); 
@@ -171,7 +169,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, wxID_ANY, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, -1, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -191,8 +189,8 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
+    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(true);
+    Close(TRUE);
 }

--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -57,7 +57,7 @@ public:
    void OnStore( wxCommandEvent& event );
    void OnQuit( wxCommandEvent& event );
    
-    bool OnClose(void) { return true; }
+    bool OnClose(void) { return TRUE; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -84,16 +84,14 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
-#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(true);
+    frame->Show(TRUE);
    SetTopWindow(frame);
    frame->populateMyFrame();
    
-    return true;
+    return TRUE;
 }

 /***** Immlementation for class MyFrame *****/
@@ -105,7 +103,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
+    : wxFrame( parent, -1, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
@@ -126,7 +124,7 @@ void MyFrame::populateMyFrame()
    cbDimInfo sizes( 80,65,     // when docked horizontally      
                     80,165,    // when docked vertically        
                     180,30,    // when floated                  
-                     true,      // the bar is fixed-size
+                     TRUE,      // the bar is fixed-size
                     5,         // vertical gap (bar border)
                     5          // horizontal gap (bar border)
                   ); 
@@ -146,7 +144,7 @@ void MyFrame::populateMyFrame()
        
        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
-        mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
+        mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
                          sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                          0,                   // insert into 0th row (vert. position)
                          0,                   // offset from the start of row (in pixels)
@@ -169,7 +167,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -189,8 +187,8 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
+    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(true);
+    Close(TRUE);
 }

--- a/contrib/samples/fl/fl_sample3.cpp
+++ b/contrib/samples/fl/fl_sample3.cpp
@@ -61,7 +61,7 @@ public:
    
    void OnButt( wxCommandEvent& event );
    void OnButt2( wxCommandEvent& event );
-    bool OnClose(void) { return true; }
+    bool OnClose(void) { return TRUE; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -88,15 +88,13 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
-#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(true);
+    frame->Show(TRUE);
    SetTopWindow(frame);
    
-    return true;
+    return TRUE;
 }

 /***** Immlementation for class MyFrame *****/
@@ -110,14 +108,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
+    : wxFrame( parent, -1, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
          wxT("freimas") )
 {
    
-    mpClientWnd = new wxWindow(this, wxID_ANY);    
+    mpClientWnd = new wxWindow(this, -1);    
    mpLayout = new wxFrameLayout( this, mpClientWnd );
    
    ///  mpLayout->PushDefaultPlugins();
@@ -127,7 +125,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbDimInfo sizes( 80,65,     // when docked horizontally      
                     80,165,    // when docked vertically        
                     180,30,    // when floated                  
-                     true,      // the bar is fixed-size
+                     TRUE,      // the bar is fixed-size
                     5,         // vertical gap (bar border)
                     5          // horizontal gap (bar border)
                   ); 
@@ -147,7 +145,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
        if(i != 4 && i!= 5 && i!=11) {
-            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
+            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
                              sizes, 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
@@ -155,8 +153,8 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
                              name          // name to refere in customization pop-ups
                            );
        } else if(i==4){
-            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
-                              cbDimInfo( 100,100, 100,100, 100,100, true, 5, 5), 
+            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
+                              cbDimInfo( 100,100, 100,100, 100,100, TRUE, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -165,7 +163,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
        } else if(i==5) {
            my_butt = new wxButton(this, ID_BUTT, name);
            mpLayout->AddBar( my_butt,// bar window
-                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 
+                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -173,7 +171,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
                            );
        } else if(i==11) {
            mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+wxT("_2")),
-                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 
+                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -196,7 +194,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -216,9 +214,9 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
+    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(true);
+    Close(TRUE);
 }

 void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) )
@@ -244,18 +242,18 @@ void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) )
            {
                if(i % 4 == 1) 
                {
-                    mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
+                    mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
                    //mpLayout->RecalcLayout(true);
                    mpLayout->RepositionFloatedBar(x);
                } 
                else 
                {
-                    mpLayout->SetBarState(x, 0, true);
+                    mpLayout->SetBarState(x, 0, TRUE);
                    //mpLayout->RecalcLayout(true);
                    //mpLayout->RepositionFloatedBar(x);
                }
-                //  //  //  x->mState = wxCBAR_FLOATING;
-                //  //  //  mpLayout->ApplyBarProperties(x);
+                //  //  //  		x->mState = wxCBAR_FLOATING;
+                //  //  //  		mpLayout->ApplyBarProperties(x);
            } 
            else 
            {
@@ -286,10 +284,10 @@ void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
                    x->mDimInfo.mSizes[a].y = 200;
                }
                x->mpBarWnd->SetSize(200,200);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
-                mpLayout->SetBarState(x, 0, true);                // HACK !!!
+                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
+                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
+                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
            }
            else    
            {
@@ -311,20 +309,20 @@ void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
                    x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap;
                }
                x->mpBarWnd->SetSize(10,10);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
-                mpLayout->SetBarState(x, 0, true);                // HACK !!!
+                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
+                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
+                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
                
-                //  //  mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
-                //  //  mpLayout->RecalcLayout(true);
-                //  //  mpLayout->RepositionFloatedBar(x);
-                //  //  mpLayout->RecalcLayout(true);
-                //  //  mpLayout->RepositionFloatedBar(x);
-                //  //  mpLayout->SetBarState(x, 0, true);
-                //  //  wxYield();
-                //  //  mpLayout->RefreshNow( true );
-                //  //  mpLayout->RecalcLayout(true);
+                //  //  		mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
+                //  //  		mpLayout->RecalcLayout(true);
+                //  //  		//		mpLayout->RepositionFloatedBar(x);
+                //  //  		mpLayout->RecalcLayout(true);
+                //  //  		mpLayout->RepositionFloatedBar(x);
+                //  //  		  mpLayout->SetBarState(x, 0, TRUE);	
+                //  //  		  wxYield();
+                //  //  		  mpLayout->RefreshNow( TRUE );
+                //  //  		  mpLayout->RecalcLayout(true);
            }
            else    
            {
--- a/contrib/samples/foldbar/extended/extended.cpp
+++ b/contrib/samples/foldbar/extended/extended.cpp
@@ -1,532 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        expended.cpp
-// Purpose:     Layout/foldpanelbar sample
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     24/07/2004
-// Copyright:   (c) Jorgen Bodde based upon FoldPanelBarTest (c) Julian Smart
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/laywin.h"
-#include <wx/spinctrl.h>
-#include <wx/slider.h>
-
-#include "extended.h"
-
-MyFrame *frame = NULL;
-wxList my_children;
-
-IMPLEMENT_APP(MyApp)
-
-// For drawing lines in a canvas
-long xpos = -1;
-long ypos = -1;
-
-int winNumber = 1;
-
-// Initialise this in OnInit, not statically
-bool MyApp::OnInit(void)
-{
-	// Create the main frame window
-
-	frame = new MyFrame(NULL, -1, _T("FoldPanelBar Extended Demo"), wxPoint(-1, -1), wxSize(500, 600),
-						wxDEFAULT_FRAME_STYLE |
-						wxNO_FULL_REPAINT_ON_RESIZE |
-						wxHSCROLL | wxVSCROLL);
-
-	// Give it an icon (this is ignored in MDI mode: uses resources)
-
-#ifdef __WXMSW__
-	frame->SetIcon(wxIcon(_T("sashtest_icn")));
-#endif
-
-	// Associate the menu bar with the frame
-	frame->SetMenuBar(CreateMenuBar(false));
-
-	frame->CreateStatusBar();
-
-	frame->Show(TRUE);
-
-	SetTopWindow(frame);
-
-	return TRUE;
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
-    EVT_MENU(FPBTEST_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(FPBTEST_NEW_WINDOW, MyFrame::OnNewWindow)
-    EVT_SIZE(MyFrame::OnSize)
-    EVT_MENU(FPBTEST_QUIT, MyFrame::OnQuit)
-    EVT_MENU(FPBTEST_TOGGLE_WINDOW, MyFrame::OnToggleWindow)
-    EVT_SASH_DRAGGED_RANGE(ID_WINDOW_TOP, ID_WINDOW_BOTTOM, MyFrame::OnFoldPanelBarDrag)
-    EVT_MENU(FPB_BOTTOM_STICK, MyFrame::OnCreateBottomStyle)
-    EVT_MENU(FPB_SINGLE_FOLD, MyFrame::OnCreateNormalStyle)
-	EVT_BUTTON(ID_COLLAPSEME, MyFrame::OnCollapseMe)
-	EVT_BUTTON(ID_APPLYTOALL, MyFrame::OnExpandMe)
-	EVT_SCROLL(MyFrame::OnSlideColour)
-	EVT_RADIOBUTTON(ID_USE_HGRADIENT, MyFrame::OnStyleChange)
-	EVT_RADIOBUTTON(ID_USE_VGRADIENT, MyFrame::OnStyleChange)
-	EVT_RADIOBUTTON(ID_USE_SINGLE, MyFrame::OnStyleChange)
-	EVT_RADIOBUTTON(ID_USE_RECTANGLE, MyFrame::OnStyleChange)
-	EVT_RADIOBUTTON(ID_USE_FILLED_RECTANGLE, MyFrame::OnStyleChange)
-END_EVENT_TABLE()
-
-
-// Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
-    const long style)
-  : wxMDIParentFrame(parent, id, title, pos, size, style)
-  , _flags(0)
-{  
-	m_leftWindow1 = new wxSashLayoutWindow(this, ID_WINDOW_LEFT1,
-								wxDefaultPosition, wxSize(200, 30),
-								wxNO_BORDER | wxSW_3D | wxCLIP_CHILDREN);
-
-	m_leftWindow1->SetDefaultSize(wxSize(160, 1000));
-	m_leftWindow1->SetOrientation(wxLAYOUT_VERTICAL);
-	m_leftWindow1->SetAlignment(wxLAYOUT_LEFT);
-	m_leftWindow1->SetSashVisible(wxSASH_RIGHT, TRUE);
-	m_leftWindow1->SetExtraBorderSize(0);
-
-	_pnl = 0;
-	ReCreateFoldPanel(0);
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-      Close(TRUE);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-	(void)wxMessageBox(_T("wxWidgets 2.0 FoldPanelBar Demo\nAuthor: Julian Smart (c) 1998"), _T("About FoldPanelBar Demo"));
-}
-
-void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
-{
-  	m_leftWindow1->Show(!m_leftWindow1->IsShown());
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-}
-
-void MyFrame::OnFoldPanelBarDrag(wxSashEvent& event)
-{
-    if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
-        return;
-
-    if(event.GetId() == ID_WINDOW_LEFT1)
-        m_leftWindow1->SetDefaultSize(wxSize(event.GetDragRect().width, 1000));
-
-	wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-
-    // Leaves bits of itself behind sometimes
-    GetClientWindow()->Refresh();
-}
-
-void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
-{
-      // Make another frame, containing a canvas
-      MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
-                                      wxPoint(10, 10), wxSize(300, 300),
-                                      wxDEFAULT_FRAME_STYLE |
-                                      wxNO_FULL_REPAINT_ON_RESIZE);
-
-      subframe->SetTitle(wxString::Format(_T("Canvas Frame %d"), winNumber));
-      winNumber ++;
-
-      // Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WXMSW__
-      subframe->SetIcon(wxIcon(_T("sashtest_icn")));
-#endif
-
-	// Give it a status line
-	subframe->CreateStatusBar();
-
-	// Associate the menu bar with the frame
-	subframe->SetMenuBar(CreateMenuBar(true));
-
-	int width, height;
-	subframe->GetClientSize(&width, &height);
-	MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
-	canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
-	subframe->canvas = canvas;
-
-	// Give it scrollbars
-	canvas->SetScrollbars(20, 20, 50, 50);
-
-	subframe->Show(TRUE);
-}
-
-void MyFrame::ReCreateFoldPanel(int fpb_flags)
-{
-    // delete earlier panel
-	m_leftWindow1->DestroyChildren();
-
-	// recreate the foldpanelbar
-
-	_pnl = new wxFoldPanelBar(m_leftWindow1, -1, wxDefaultPosition, wxSize(-1,-1), wxFPB_DEFAULT_STYLE, fpb_flags);
-		
-	wxFoldPanel item = _pnl->AddFoldPanel("Caption colours", false);
-
-	_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), -1, _T("Adjust the first colour")), 
-		                     wxFPB_ALIGN_WIDTH, 5, 20); 
-
-	// RED color spin control
-	_rslider1 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _rslider1, wxFPB_ALIGN_WIDTH, 
-							 2, 20); 
-
-	// GREEN color spin control
-	_gslider1 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _gslider1, wxFPB_ALIGN_WIDTH, 
-							 0, 20); 
-
-	// BLUE color spin control
-	_bslider1 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _bslider1, wxFPB_ALIGN_WIDTH, 
-							 0, 20); 
-	
-	_pnl->AddFoldPanelSeperator(item);
-
-	_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), -1, _T("Adjust the second colour")), 
-		                     wxFPB_ALIGN_WIDTH, 5, 20); 
-
-	// RED color spin control
-	_rslider2 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _rslider2, wxFPB_ALIGN_WIDTH, 
-							 2, 20); 
-
-	// GREEN color spin control
-	_gslider2 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _gslider2, wxFPB_ALIGN_WIDTH, 
-							 0, 20); 
-
-	// BLUE color spin control
-	_bslider2 = new wxSlider(item.GetParent(), -1, 0, 0, 255);
-	_pnl->AddFoldPanelWindow(item, _bslider2, wxFPB_ALIGN_WIDTH, 
-							 0, 20); 
-
-	_pnl->AddFoldPanelSeperator(item);
-	
-	_btn = new wxButton(item.GetParent(), ID_APPLYTOALL, "Apply to all");
-	_pnl->AddFoldPanelWindow(item, _btn); 
-
-	// read back current gradients and set the sliders
-	// for the colour which is now taken as default
-
-	wxCaptionBarStyle style = _pnl->GetCaptionStyle(item);
-	wxColour col = style.GetFirstColour();
-	_rslider1->SetValue(col.Red());
-	_gslider1->SetValue(col.Green());
-	_bslider1->SetValue(col.Blue());
-
-	col = style.GetSecondColour();
-	_rslider2->SetValue(col.Red());
-	_gslider2->SetValue(col.Green());
-	_bslider2->SetValue(col.Blue());
-
-	// put down some caption styles from which the user can
-	// select to show how the current or all caption bars will look like
-
-	item = _pnl->AddFoldPanel("Caption style", false);
-
-	wxRadioButton *currStyle =  new wxRadioButton(item.GetParent(), ID_USE_VGRADIENT, "&Vertical gradient");
-	_pnl->AddFoldPanelWindow(item, currStyle,  wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-	currStyle->SetValue(true);
-
-	_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_HGRADIENT, "&Horizontal gradient"), 
-							 wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-	_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_SINGLE, "&Single colour"), 
-							 wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-	_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_RECTANGLE, "&Rectangle box"), 
-							 wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-	_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_FILLED_RECTANGLE, "&Filled rectangle box"), 
-							 wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-
-	_pnl->AddFoldPanelSeperator(item);
-
-	_single = new wxCheckBox(item.GetParent(), -1, "&Only this caption");
-	_pnl->AddFoldPanelWindow(item, _single, wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-
-
-	// one more panel to finish it
-
-	wxCaptionBarStyle cs;
-	cs.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
-
-	item = _pnl->AddFoldPanel("Misc stuff", true, cs);
-
-	_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, "Collapse All")); 
-
-	_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), -1, _T("Enter some comments")), 
-		                     wxFPB_ALIGN_WIDTH, 5, 20); 
-	
-	_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), -1, "Comments"), 
-							 wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 10); 
-
-	m_leftWindow1->SizeWindows();
-
-}
-
-void MyFrame::OnCreateBottomStyle(wxCommandEvent& event)
-{
-	// recreate with style collapse to bottom, which means
-	// all panels that are collapsed are placed at the bottom,
-	// or normal
-	
-	if(event.IsChecked())
-		_flags |= wxFPB_COLLAPSE_TO_BOTTOM;
-	else
-		_flags &= ~wxFPB_COLLAPSE_TO_BOTTOM;
-
-	ReCreateFoldPanel(_flags);
-}
-
-void MyFrame::OnCreateNormalStyle(wxCommandEvent& event)
-{
-	// receate with style where only one panel at the time is
-	// allowed to be opened
-	
-	// TODO: Not yet implemented!
-
-	if(event.IsChecked())
-		_flags |= wxFPB_SINGLE_FOLD;
-	else
-		_flags &= ~wxFPB_SINGLE_FOLD;
-
-	ReCreateFoldPanel(_flags);
-}
-
-void MyFrame::OnCollapseMe(wxCommandEvent &event)
-{
-	wxFoldPanel item(0);
-	for(size_t i = 0; i < _pnl->GetCount(); i++)
-	{
-		item = _pnl->Item(i);
-		_pnl->Collapse(item);
-	}
-}
-
-void MyFrame::OnExpandMe(wxCommandEvent &event)
-{
-	wxColour col1(_rslider1->GetValue(), _gslider1->GetValue(), _bslider1->GetValue()),
-		     col2(_rslider2->GetValue(), _gslider2->GetValue(), _bslider2->GetValue());
-
-	wxCaptionBarStyle style;
-
-	style.SetFirstColour(col1);
-	style.SetSecondColour(col2);
-
-	_pnl->ApplyCaptionStyleAll(style);
-}
-
-wxMenuBar *CreateMenuBar(bool with_window)
-{
-	// Make a menubar
-	wxMenu *file_menu = new wxMenu;
-
-	file_menu->Append(FPBTEST_NEW_WINDOW, _T("&New window"));
-	if(with_window)
-		file_menu->Append(FPBTEST_CHILD_QUIT, _T("&Close child"));
-
-	file_menu->AppendSeparator();
-	file_menu->Append(FPBTEST_QUIT, _T("&Exit"));
-
-	wxMenu *option_menu = 0;
-	if(with_window)
-	{
-		// Dummy option
-		option_menu = new wxMenu;
-		option_menu->Append(FPBTEST_REFRESH, _T("&Refresh picture"));
-	}
-
-	// make fold panel menu
-	
-	wxMenu *fpb_menu = new wxMenu;
-	fpb_menu->AppendCheckItem(FPB_BOTTOM_STICK, _T("Create with &wxFPB_COLLAPSE_TO_BOTTOM"));
-	//fpb_menu->AppendCheckItem(FPB_SINGLE_FOLD, _T("Create with &wxFPB_SINGLE_FOLD"));
-
-	fpb_menu->AppendSeparator();
-	fpb_menu->Append(FPBTEST_TOGGLE_WINDOW, _T("&Toggle FoldPanelBar"));
-
-	wxMenu *help_menu = new wxMenu;
-	help_menu->Append(FPBTEST_ABOUT, _T("&About"));
-
-	wxMenuBar *menu_bar = new wxMenuBar;
-
-	menu_bar->Append(file_menu, _T("&File"));
-	menu_bar->Append(fpb_menu, _T("&FoldPanel"));
-	if(option_menu)
-		menu_bar->Append(option_menu, _T("&Options"));
-	menu_bar->Append(help_menu, _T("&Help"));
-
-	return menu_bar;
-}
-
-void MyFrame::OnSlideColour(wxScrollEvent &event)
-{
-	wxColour col1(_rslider1->GetValue(), _gslider1->GetValue(), _bslider1->GetValue()),
-		     col2(_rslider2->GetValue(), _gslider2->GetValue(), _bslider2->GetValue());
-	//_btn->SetBackgroundColour(col);
-
-	wxCaptionBarStyle style;
-
-	style.SetFirstColour(col1);
-	style.SetSecondColour(col2);
-
-	wxFoldPanel item = _pnl->Item(0);
-	_pnl->ApplyCaptionStyle(item, style);
-}
-
-void MyFrame::OnStyleChange(wxCommandEvent &event)
-{
-	wxCaptionBarStyle style;
-	switch(event.GetId())
-	{
-	case ID_USE_HGRADIENT:
-		style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_H);
-		break;
-
-	case ID_USE_VGRADIENT:
-		style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
-		break;
-
-	case ID_USE_SINGLE:
-		style.SetCaptionStyle(wxCAPTIONBAR_SINGLE);
-		break;
-
-	case ID_USE_RECTANGLE:
-		style.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
-		break;
-
-	case ID_USE_FILLED_RECTANGLE:
-		style.SetCaptionStyle(wxCAPTIONBAR_FILLED_RECTANGLE);
-		break;
-			
-	default:
-		break;
-	}
-
-	if(_single->GetValue())
-	{
-		wxFoldPanel item = _pnl->Item(1);
-		_pnl->ApplyCaptionStyle(item, style);
-	}
-	else
-		_pnl->ApplyCaptionStyleAll(style);
-
-}
-
-/* ----------------------------------------------------------------------------------------------- */
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
-        : wxScrolledWindow(parent, -1, pos, size,
-                           wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE)
-{
-    SetBackgroundColour(* wxWHITE);
-}
-
-// Define the repainting behaviour
-void MyCanvas::OnDraw(wxDC& dc)
-{
-  dc.SetFont(*wxSWISS_FONT);
-  dc.SetPen(*wxGREEN_PEN);
-  dc.DrawLine(0, 0, 200, 200);
-  dc.DrawLine(200, 0, 0, 200);
-
-  dc.SetBrush(*wxCYAN_BRUSH);
-  dc.SetPen(*wxRED_PEN);
-  dc.DrawRectangle(100, 100, 100, 50);
-  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
-
-  dc.DrawEllipse(250, 250, 100, 50);
-#if wxUSE_SPLINES
-  dc.DrawSpline(50, 200, 50, 100, 200, 10);
-#endif // wxUSE_SPLINES
-  dc.DrawLine(50, 230, 200, 230);
-  dc.DrawText(_T("This is a test string"), 50, 230);
-
-  wxPoint points[3];
-  points[0].x = 200; points[0].y = 300;
-  points[1].x = 100; points[1].y = 400;
-  points[2].x = 300; points[2].y = 400;
-  
-  dc.DrawPolygon(3, points);
-}
-
-// This implements a tiny doodling program! Drag the mouse using
-// the left button.
-void MyCanvas::OnEvent(wxMouseEvent& event)
-{
-  wxClientDC dc(this);
-  PrepareDC(dc);
-
-  wxPoint pt(event.GetLogicalPosition(dc));
-
-  if (xpos > -1 && ypos > -1 && event.Dragging())
-  {
-    dc.SetPen(*wxBLACK_PEN);
-    dc.DrawLine(xpos, ypos, pt.x, pt.y);
-  }
-  xpos = pt.x;
-  ypos = pt.y;
-}
-
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-}
-
-// Note that FPBTEST_NEW_WINDOW and FPBTEST_ABOUT commands get passed
-// to the parent window for processing, so no need to
-// duplicate event handlers here.
-
-BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
-  EVT_MENU(FPBTEST_CHILD_QUIT, MyChild::OnQuit)
-END_EVENT_TABLE()
-
-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size,
-const long style):
-  wxMDIChildFrame(parent, -1, title, pos, size, style)
-{
-  canvas = NULL;
-  my_children.Append(this);
-}
-
-MyChild::~MyChild(void)
-{
-  my_children.DeleteObject(this);
-}
-
-void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-      Close(TRUE);
-}
-
-void MyChild::OnActivate(wxActivateEvent& event)
-{
-  if (event.GetActive() && canvas)
-    canvas->SetFocus();
-}
-
--- a/contrib/samples/foldbar/extended/extended.h
+++ b/contrib/samples/foldbar/extended/extended.h
@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        extended.h
-// Purpose:     Layout/foldpanelbar sample
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     24/07/2004
-// Copyright:   Jorgen Bodde based upon FoldPanelBar sample (c) Julian Smart
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/toolbar.h"
-#include "foldpanelbar.h"
-
-wxMenuBar *CreateMenuBar(bool with_window);
-
-enum
-{
-	ID_COLLAPSEME = 10000,
-	ID_APPLYTOALL,
-	ID_USE_HGRADIENT,
-	ID_USE_VGRADIENT,
-	ID_USE_SINGLE,
-	ID_USE_RECTANGLE,
-	ID_USE_FILLED_RECTANGLE
-};
-
-// Define a new application
-class MyApp: public wxApp
-{
-  public:
-    bool OnInit(void);
-};
-
-class MyCanvas: public wxScrolledWindow
-{
-  public:
-    MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-    virtual void OnDraw(wxDC& dc);
-    void OnEvent(wxMouseEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-// Define a new frame
-class MyFrame: public wxMDIParentFrame
-{
-  public:
-
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
-    void OnSize(wxSizeEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnNewWindow(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnToggleWindow(wxCommandEvent& event);
-    void OnFoldPanelBarDrag(wxSashEvent& event);
-    void OnCreateBottomStyle(wxCommandEvent& event);
-    void OnCreateNormalStyle(wxCommandEvent& event);
-
-	void OnCollapseMe(wxCommandEvent &event);
-	void OnExpandMe(wxCommandEvent &event);
-
-	void OnSlideColour(wxScrollEvent &event);
-
-	void OnStyleChange(wxCommandEvent &event);
-
-protected:
-    wxSashLayoutWindow* m_leftWindow1;
-
-private:
-	void ReCreateFoldPanel(int fpb_flags);
-	wxFoldPanelBar *_pnl;
-	wxButton *_btn;
-	wxCheckBox *_single;
-	wxSlider *_rslider1, *_gslider1, *_bslider1, *_rslider2, *_gslider2, *_bslider2; 
-	int _flags;
-
-DECLARE_EVENT_TABLE()
-};
-
-class MyChild: public wxMDIChildFrame
-{
-  public:
-    MyCanvas *canvas;
-    MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-    ~MyChild(void);
-    void OnActivate(wxActivateEvent& event);
-    void OnQuit(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#define FPBTEST_QUIT          1
-#define FPBTEST_NEW_WINDOW    2
-#define FPBTEST_REFRESH       3
-#define FPBTEST_CHILD_QUIT    4
-#define FPBTEST_ABOUT         5
-#define FPBTEST_TOGGLE_WINDOW 6
-#define FPB_BOTTOM_STICK      7
-#define FPB_SINGLE_FOLD       8
-
-#define ID_WINDOW_TOP       100
-#define ID_WINDOW_LEFT1     101
-#define ID_WINDOW_LEFT2     102
-#define ID_WINDOW_BOTTOM    103
-
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in
@@ -1,191 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
-SETFILE = @SETFILE@
-NM = @NM@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-
-### Variables: ###
-
-DESTDIR = 
-WX_VERSION = 2.5.2
-LIBDIRNAME = $(top_builddir)lib
-FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
-	-I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS =  \
-	$(__foldtest_os2_lib_res) \
-	foldtest_foldpanelbartest.o \
-	foldtest_foldtestpanel.o \
-	foldtest_layouttest.o \
-	foldtest_test.o \
-	$(__foldtest___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_MAC_1@__foldtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C foldtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__foldtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___foldtest___os2_emxbindcmd = $(NM) foldtest$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep foldtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__foldtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___foldtest___os2_emxbindcmd)
-@COND_PLATFORM_OS2_1@__foldtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__foldtest_bundle___depname = foldtest_bundle
-@COND_TOOLKIT_COCOA@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	foldtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	foldtest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_PLATFORM_WIN32_1@__foldtest___win32rc = \
-@COND_PLATFORM_WIN32_1@	foldtest_foldpanelbartest_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
-	$(srcdir)/../../../include -o foldtest$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: foldtest$(EXEEXT) $(__foldtest_bundle___depname) data
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f foldtest$(EXEEXT)
-	rm -rf foldtest.app
-
-distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
-	$(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-	$(__foldtest___mac_rezcmd)
-	$(__foldtest___mac_setfilecmd)
-	$(__foldtest___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p foldtest.app/Contents
-	mkdir -p foldtest.app/Contents/MacOS
-	mkdir -p foldtest.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/foldtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >foldtest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >foldtest.app/Contents/PkgInfo
-	
-	
-	ln -f foldtest$(EXEEXT) foldtest.app/Contents/MacOS/foldtest
-	
-	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc foldtest.app/Contents/Resources/foldtest.rsrc
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns foldtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@foldtest_bundle: $(____foldtest_BUNDLE_TGT_REF_DEP)
-
-data: 
-	@mkdir -p .
-	@for f in mondrian.ico; do \
-	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-	cp -pRf $(srcdir)/$$f . ; \
-	fi; \
-	done
-
-foldtest_foldpanelbartest.o: $(srcdir)/foldpanelbartest.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-foldtest_foldtestpanel.o: $(srcdir)/foldtestpanel.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-foldtest_layouttest.o: $(srcdir)/layouttest.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-foldtest_test.o: $(srcdir)/test.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-foldtest_foldpanelbartest_rc.o: $(srcdir)/foldpanelbartest.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean foldtest_bundle data
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
+++ b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
@@ -1,209 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbartest.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-enum
-{
-    ID_COLLAPSEME = 10000,
-    ID_EXPANDME
-};
-
-#include "wx/foldbar/foldpanelbar.h"
-#include "foldtestpanel.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
-
-// ----------------------------------------------------------------------------
-// MyApp Class
-// ----------------------------------------------------------------------------
-
-class MyApp : public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Class
-// ----------------------------------------------------------------------------
-
-class MyAppFrame : public wxFrame
-{
-public:
-    MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
-            long style = wxDEFAULT_FRAME_STYLE);
-
-private:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-    // extra handlers for the bar, to show how it works
-
-    void OnCollapseMe(wxCommandEvent &event);
-    void OnExpandMe(wxCommandEvent &event);
-
-private:
-    wxMenuBar *CreateMenuBar();
-    wxFoldPanelBar *_pnl;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-enum
-{
-    // menu items
-    FoldPanelBarTest_Quit = 1,
-    FoldPanelBarTest_About = wxID_ABOUT
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyAppFrame, wxFrame)
-    EVT_MENU(FoldPanelBarTest_Quit,  MyAppFrame::OnQuit)
-    EVT_MENU(FoldPanelBarTest_About, MyAppFrame::OnAbout)
-    EVT_BUTTON(ID_COLLAPSEME, MyAppFrame::OnCollapseMe)
-    EVT_BUTTON(ID_EXPANDME, MyAppFrame::OnExpandMe)
-END_EVENT_TABLE()
-
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// MyApp Implementation
-// ----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
-    MyAppFrame *frame = new MyAppFrame(_T("FoldPanelBarTest wxWindows Test Application"),
-                                 wxPoint(50, 50), wxSize(200, 500));
-
-    SetTopWindow(frame);
-
-    frame->Show(true);
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Implementation
-// ----------------------------------------------------------------------------
-
-MyAppFrame::MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
-       : wxFrame(NULL, wxID_ANY, title, pos, size, style)
-{
-    SetIcon(wxICON(mondrian));
-
-    SetMenuBar(CreateMenuBar());
-
-    CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
-
-    _pnl = new wxFoldPanelBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, wxFPB_COLLAPSE_TO_BOTTOM);
-
-    wxFoldPanel item = _pnl->AddFoldPanel(_T("Test me"), false);
-    _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, _T("Collapse Me")));
-
-    item = _pnl->AddFoldPanel(_T("Test me too!"), true);
-    _pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_EXPANDME, _T("Expand first one")));
-    _pnl->AddFoldPanelSeperator(item);
-    _pnl->AddFoldPanelWindow(item, new FoldTestPanel(item.GetParent(), wxID_ANY));
-
-    _pnl->AddFoldPanelSeperator(item);
-
-    _pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 20);
-
-    item = _pnl->AddFoldPanel(_T("Some opinions ..."), false);
-    _pnl->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("I like this")));
-    _pnl->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And also this")));
-    _pnl->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And gimme this too")));
-
-    _pnl->AddFoldPanelSeperator(item);
-
-    _pnl->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("Check this too if you like")));
-    _pnl->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("What about this")));
-
-
-    item = _pnl->AddFoldPanel(_T("Choose one ..."), false);
-    _pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Enter your comment")));
-    _pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_YSPACING, 20);
-
-}
-
-wxMenuBar *MyAppFrame::CreateMenuBar()
-{
-    wxMenu *menuFile = new wxMenu;
-    menuFile->Append(FoldPanelBarTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(FoldPanelBarTest_About, _T("&About...\tF1"), _T("Show about dialog"));
-
-    wxMenuBar *value = new wxMenuBar();
-    value->Append(menuFile, _T("&File"));
-    value->Append(helpMenu, _T("&Help"));
-
-    return value;
-}
-
-// event handlers
-
-
-
-void MyAppFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MyAppFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( _T("This is the About dialog of the FoldPanelBarTest application.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, _T("About FoldPanelBarTest"), wxOK | wxICON_INFORMATION, this);
-}
-
-void MyAppFrame::OnCollapseMe(wxCommandEvent &WXUNUSED(event))
-{
-    wxFoldPanel item = _pnl->Item(0);
-    _pnl->Collapse(item);
-}
-
-void MyAppFrame::OnExpandMe(wxCommandEvent &WXUNUSED(event))
-{
-    _pnl->Expand(_pnl->Item(0));
-    _pnl->Collapse(_pnl->Item(1));
-}
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
+++ b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
@@ -1,6 +0,0 @@
-mondrian ICON "sample.ico"
-
-#define FOLDPANELBARTEST_QUIT     1
-#define FOLDPANELBARTEST_ABOUT    102
-
-#include "wx/msw/wx.rc"
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
+++ b/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="foldtest" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            foldpanelbartest.cpp
-            foldtestpanel.cpp
-            layouttest.cpp
-            test.cpp
-        </sources>
-        <wx-lib>foldbar</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>foldpanelbartest.rc</win32-res>
-    </exe>
-
-    <wx-data id="data">
-        <dstdir>$(BUILDDIR)</dstdir>
-        <srcdir>$(SRCDIR)</srcdir>
-        <files>
-            mondrian.ico
-        </files>
-    </wx-data>
-
-</makefile>
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
+++ b/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foldtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=foldtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "foldtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "foldtest.mak" CFG="foldtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "foldtest - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25u_foldbar.lib wxmswuniv25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv25u_foldbar.lib wxmswuniv25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25ud_foldbar.lib wxmswuniv25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv25ud_foldbar.lib wxmswuniv25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25_foldbar.lib wxmswuniv25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv25_foldbar.lib wxmswuniv25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25d_foldbar.lib wxmswuniv25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv25d_foldbar.lib wxmswuniv25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25u_foldbar.lib wxmsw25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw25u_foldbar.lib wxmsw25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25ud_foldbar.lib wxmsw25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw25ud_foldbar.lib wxmsw25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25_foldbar.lib wxmsw25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw25_foldbar.lib wxmsw25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25d_foldbar.lib wxmsw25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw25d_foldbar.lib wxmsw25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25u_foldbar.lib wxmswuniv25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv25u_foldbar.lib wxmswuniv25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25ud_foldbar.lib wxmswuniv25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv25ud_foldbar.lib wxmswuniv25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25_foldbar.lib wxmswuniv25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv25_foldbar.lib wxmswuniv25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv25d_foldbar.lib wxmswuniv25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv25d_foldbar.lib wxmswuniv25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25u_foldbar.lib wxmsw25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw25u_foldbar.lib wxmsw25u_core.lib wxbase25u.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25ud_foldbar.lib wxmsw25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw25ud_foldbar.lib wxmsw25ud_core.lib wxbase25ud.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\foldtest.pdb /O1 /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\msw" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\msw" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25_foldbar.lib wxmsw25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw25_foldbar.lib wxmsw25_core.lib wxbase25.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\foldtest.pdb /Od /GR /GX /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw25d_foldbar.lib wxmsw25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw25d_foldbar.lib wxmsw25d_core.lib wxbase25d.lib 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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "foldtest - Win32 DLL Universal Unicode Release"
-# Name "foldtest - Win32 DLL Universal Unicode Debug"
-# Name "foldtest - Win32 DLL Universal Release"
-# Name "foldtest - Win32 DLL Universal Debug"
-# Name "foldtest - Win32 DLL Unicode Release"
-# Name "foldtest - Win32 DLL Unicode Debug"
-# Name "foldtest - Win32 DLL Release"
-# Name "foldtest - Win32 DLL Debug"
-# Name "foldtest - Win32 Universal Unicode Release"
-# Name "foldtest - Win32 Universal Unicode Debug"
-# Name "foldtest - Win32 Universal Release"
-# Name "foldtest - Win32 Universal Debug"
-# Name "foldtest - Win32 Unicode Release"
-# Name "foldtest - Win32 Unicode Debug"
-# Name "foldtest - Win32 Release"
-# Name "foldtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldtestpanel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\layouttest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.dsw
+++ b/contrib/samples/foldbar/foldpanelbar/foldtest.dsw
@@ -1,61 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "foldtest"=foldtest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name foldbar
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "foldbar"=..\..\..\..\build\msw\wx_foldbar.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "core"=..\..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
+++ b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
@@ -1,168 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldtestpanel.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "foldtestpanel.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "foldtestpanel.h"
-
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * FoldTestPanel type definition
- */
-
-IMPLEMENT_CLASS( FoldTestPanel, wxPanel )
-
-/*!
- * FoldTestPanel event table definition
- */
-BEGIN_EVENT_TABLE( FoldTestPanel, wxPanel )
-
-////@begin FoldTestPanel event table entries
-////@end FoldTestPanel event table entries
-
-    //EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
-    EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
-
-
-END_EVENT_TABLE()
-
-/*!
- * FoldTestPanel constructors
- */
-
-FoldTestPanel::FoldTestPanel( )
-{
-    delete _images;
-}
-
-FoldTestPanel::FoldTestPanel( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * FoldTestPanel creator
- */
-
-bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin FoldTestPanel member initialisation
-    blaat = NULL;
-////@end FoldTestPanel member initialisation
-
-////@begin FoldTestPanel creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxPanel::Create( parent, id, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end FoldTestPanel creation
-    return true;
-}
-
-/*!
- * Control creation for FoldTestPanel
- */
-
-void FoldTestPanel::CreateControls()
-{
-
-////@begin FoldTestPanel content construction
-
-    FoldTestPanel* item1 = this;
-
-    wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
-    blaat = item2;
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    /* wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); */
-    wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL );
-    item2->Add(item3, 1, wxGROW|wxADJUST_MINSIZE, 5);
-    wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
-    item3->SetSizer(item4);
-    item3->SetAutoLayout(true);
-    wxString item5Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item5 = new wxChoice( item3, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item5Strings, 0 );
-    item4->Add(item5, 0, wxGROW|wxALL, 5);
-    wxTextCtrl* item6 = new wxTextCtrl( item3, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-    item4->Add(item6, 1, wxGROW|wxALL, 5);
-    wxRadioButton* item7 = new wxRadioButton( item3, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item7->SetValue(true);
-    item4->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item8 = new wxRadioButton( item3, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->SetValue(false);
-    item4->Add(item8, 0, wxALIGN_LEFT|wxALL, 5);
-////@end FoldTestPanel content construction
-}
-
-void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &WXUNUSED(event))
-{
-    // TODO: What else
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool FoldTestPanel::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap FoldTestPanel::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin FoldTestPanel bitmap retrieval
-    return wxNullBitmap;
-////@end FoldTestPanel bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon FoldTestPanel::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin FoldTestPanel icon retrieval
-    return wxNullIcon;
-////@end FoldTestPanel icon retrieval
-}
-
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
+++ b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldtestpanel.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _FOLDTESTPANEL_H_
-#define _FOLDTESTPANEL_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "foldtestpanel.cpp"
-#endif
-
-/*!
- * Includes
- */
-
-#include "wx/foldbar/captionbar.h"
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_TESTPANEL 10000
-#define SYMBOL_FOLDTESTPANEL_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_FOLDTESTPANEL_TITLE _("FoldTestPanel")
-#define SYMBOL_FOLDTESTPANEL_IDNAME ID_TESTPANEL
-#define SYMBOL_FOLDTESTPANEL_SIZE wxSize(400, 300)
-#define SYMBOL_FOLDTESTPANEL_POSITION wxDefaultPosition
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_TEXTCTRL 10016
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * FoldTestPanel class declaration
- */
-
-class FoldTestPanel: public wxPanel
-{
-    DECLARE_CLASS( FoldTestPanel )
-    DECLARE_EVENT_TABLE()
-
-private:
-    wxImageList *_images;
-    wxRect _oldsize;
-
-    void OnCaptionPanel(wxCaptionBarEvent &event);
-
-public:
-    /// Constructors
-    FoldTestPanel( );
-    FoldTestPanel( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin FoldTestPanel event handler declarations
-
-////@end FoldTestPanel event handler declarations
-
-////@begin FoldTestPanel member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end FoldTestPanel member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin FoldTestPanel member variables
-    wxBoxSizer* blaat;
-////@end FoldTestPanel member variables
-};
-
-#endif
-    // _FOLDTESTPANEL_H_
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
+++ b/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
@@ -1,145 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        layouttest.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     25/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "layouttest.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "layouttest.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * LayoutTest type definition
- */
-
-IMPLEMENT_CLASS( LayoutTest, wxPanel )
-
-/*!
- * LayoutTest event table definition
- */
-
-BEGIN_EVENT_TABLE( LayoutTest, wxPanel )
-
-////@begin LayoutTest event table entries
-////@end LayoutTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * LayoutTest constructors
- */
-
-LayoutTest::LayoutTest( )
-{
-}
-
-LayoutTest::LayoutTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * LayoutTest creator
- */
-
-bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin LayoutTest member initialisation
-////@end LayoutTest member initialisation
-
-////@begin LayoutTest creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxPanel::Create( parent, id, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end LayoutTest creation
-    return true;
-}
-
-/*!
- * Control creation for LayoutTest
- */
-
-void LayoutTest::CreateControls()
-{
-////@begin LayoutTest content construction
-
-    LayoutTest* item1 = this;
-
-    wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    wxStaticText* item3 = new wxStaticText( item1, wxID_STATIC, _("lbaaaaaa"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetBackgroundColour(wxColour(139, 139, 139));
-    item2->Add(item3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxPanel* item4 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 80), wxTAB_TRAVERSAL );
-    item2->Add(item4, 0, wxGROW, 5);
-    wxBoxSizer* item5 = new wxBoxSizer(wxVERTICAL);
-    item4->SetSizer(item5);
-    item4->SetAutoLayout(true);
-    wxStaticText* item6 = new wxStaticText( item4, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add(item6, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    wxButton* item7 = new wxButton( item4, ID_BUTTON, _("Button"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
-////@end LayoutTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool LayoutTest::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap LayoutTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin LayoutTest bitmap retrieval
-    return wxNullBitmap;
-////@end LayoutTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon LayoutTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin LayoutTest icon retrieval
-    return wxNullIcon;
-////@end LayoutTest icon retrieval
-}
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.h
+++ b/contrib/samples/foldbar/foldpanelbar/layouttest.h
@@ -1,101 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        layouttest.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     25/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _LAYOUTTEST_H_
-#define _LAYOUTTEST_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "layouttest.cpp"
-#endif
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_LAYOUTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_LAYOUTTEST_TITLE _("Layout Test")
-#define SYMBOL_LAYOUTTEST_IDNAME ID_DIALOG
-#define SYMBOL_LAYOUTTEST_SIZE wxSize(400, 300)
-#define SYMBOL_LAYOUTTEST_POSITION wxDefaultPosition
-#define ID_PANEL1 10006
-#define ID_BUTTON 10007
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * LayoutTest class declaration
- */
-
-class LayoutTest: public wxPanel
-{
-    DECLARE_CLASS( LayoutTest )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    LayoutTest( );
-    LayoutTest( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin LayoutTest event handler declarations
-
-////@end LayoutTest event handler declarations
-
-////@begin LayoutTest member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end LayoutTest member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin LayoutTest member variables
-////@end LayoutTest member variables
-};
-
-#endif
-    // _LAYOUTTEST_H_
--- a/Show More
+++ b/Show More