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

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

Makefile.in

@@ -436,8 +436,8 @@ ALL_BASE_SOURCES =  \
 	src/common/sckstrm.cpp \
 	src/common/socket.cpp \
 	src/common/url.cpp \
-	src/unix/gsocket.cpp \
-	src/msw/gsocket.cpp \
+	src/unix/gsocket.c \
+	src/msw/gsocket.c \
 	src/msw/urlmsw.cpp \
 	$(NET_WINCE_SRC) \
 	src/xml/xml.cpp \
@@ -751,6 +751,10 @@ BASELIB_OBJECTS =  \
 	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
 	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
 BASELIB_ODEP =  $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname)
+NETDLL_CFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
+	-DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
 NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
@@ -768,6 +772,10 @@ NETDLL_OBJECTS =  \
 	netdll_url.o \
 	$(__NET_PLATFORM_SRC_OBJECTS_2)
 NETDLL_ODEP =  $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname)
+NETLIB_CFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \
+	$(CFLAGS)
 NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \
@@ -2264,20 +2272,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
 	monodll_macnotfy.o \
 	monodll_MoreFilesX.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
-	monodll_baseunix.o \
-	monodll_dir.o \
-	monodll_mimetype.o \
-	monodll_snglinst.o \
-	monodll_threadpsx.o
-@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
-COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
-	monodll_baseunix.o \
-	monodll_dir.o \
-	monodll_mimetype.o \
-	monodll_snglinst.o \
-	monodll_threadpsx.o
-@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@	= monodll_utilsunx.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
@@ -3138,20 +3132,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	monolib_macnotfy.o \
 	monolib_MoreFilesX.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
-	monolib_baseunix.o \
-	monolib_dir.o \
-	monolib_mimetype.o \
-	monolib_snglinst.o \
-	monolib_threadpsx.o
-@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
-COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
-	monolib_baseunix.o \
-	monolib_dir.o \
-	monolib_mimetype.o \
-	monolib_snglinst.o \
-	monolib_threadpsx.o
-@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@	= monolib_utilsunx.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
@@ -4047,20 +4027,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	basedll_macnotfy.o \
 	basedll_MoreFilesX.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
-COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
-	basedll_baseunix.o \
-	basedll_dir.o \
-	basedll_mimetype.o \
-	basedll_snglinst.o \
-	basedll_threadpsx.o
-@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
-COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
-	basedll_baseunix.o \
-	basedll_dir.o \
-	basedll_mimetype.o \
-	basedll_snglinst.o \
-	basedll_threadpsx.o
-@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@	= basedll_utilsunx.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
@@ -4130,20 +4096,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	baselib_macnotfy.o \
 	baselib_MoreFilesX.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
-COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
-	baselib_baseunix.o \
-	baselib_dir.o \
-	baselib_mimetype.o \
-	baselib_snglinst.o \
-	baselib_threadpsx.o
-@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
-COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
-	baselib_baseunix.o \
-	baselib_dir.o \
-	baselib_mimetype.o \
-	baselib_snglinst.o \
-	baselib_threadpsx.o
-@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@	= baselib_utilsunx.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
@@ -8148,8 +8100,8 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
 monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(MONODLL_ODEP)
+	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
 	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
@@ -8238,8 +8190,8 @@ monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP)
 monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONODLL_ODEP)
+	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8412,12 +8364,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8427,12 +8373,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8448,12 +8388,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monodll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8469,12 +8403,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8490,12 +8418,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -8562,17 +8484,17 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -9102,8 +9024,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -9408,11 +9330,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -9495,8 +9417,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
@@ -10497,11 +10419,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -11127,8 +11049,8 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
 monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(MONOLIB_ODEP)
+	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP)
 	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
@@ -11217,8 +11139,8 @@ monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP)
 monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONOLIB_ODEP)
+	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -11391,12 +11313,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11406,12 +11322,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11427,12 +11337,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monolib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11448,12 +11352,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11469,12 +11367,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11541,17 +11433,17 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -12081,8 +11973,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -12387,11 +12279,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -12474,8 +12366,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
@@ -13476,11 +13368,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -14070,12 +13962,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -14085,12 +13971,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -14106,12 +13986,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@basedll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -14127,12 +14001,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@basedll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -14145,12 +14013,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -14406,12 +14268,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -14421,12 +14277,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -14442,12 +14292,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@baselib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -14463,12 +14307,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@baselib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -14481,12 +14319,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
-
 @COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -14556,17 +14388,17 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
 netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP)
 	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
 
-@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_UNIX_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
-@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
-@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
 netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
 	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
@@ -14604,17 +14436,17 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
 netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
 	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_UNIX_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
-@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
-@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -14652,8 +14484,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
 coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(COREDLL_ODEP)
+	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
 	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
@@ -14748,8 +14580,8 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(COREDLL_ODEP)
 coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(COREDLL_ODEP)
+	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 coredll_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -15360,8 +15192,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk/icon.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -15666,11 +15498,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -15753,8 +15585,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
@@ -16755,11 +16587,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -17085,8 +16917,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
 corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CORELIB_ODEP)
+	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
 	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
@@ -17181,8 +17013,8 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(CORELIB_ODEP)
 corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CORELIB_ODEP)
+	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 corelib_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -17793,8 +17625,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk/icon.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -18099,11 +17931,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -18186,8 +18018,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
@@ -19188,11 +19020,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -20449,11 +20281,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
@@ -20754,13 +20581,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

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

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">

build/bakefiles/files.bkl

@@ -307,14 +307,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 +329,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
@@ -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
@@ -873,7 +873,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 +966,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 +1005,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 +1085,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
@@ -1445,7 +1446,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 +1606,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
@@ -1927,7 +1928,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
@@ -2353,8 +2354,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">

build/bakefiles/make_dist.mk

@@ -834,13 +834,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

build/msw/makefile.bcc

@@ -536,6 +536,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 +562,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 +587,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 +609,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 \
@@ -3567,8 +3589,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 +3972,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"
@@ -5037,8 +5059,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 +5442,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"
@@ -6723,8 +6745,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 +6784,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 +7068,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"
@@ -8168,8 +8190,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"

build/msw/makefile.gcc

@@ -521,6 +521,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 +546,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 +571,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 +592,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 \
@@ -3609,8 +3629,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 +4012,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)
@@ -5179,8 +5199,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 +5582,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)
@@ -6965,8 +6985,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 +7024,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 +7308,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)
@@ -8510,8 +8530,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)

build/msw/makefile.vc

@@ -555,6 +555,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 +587,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 +618,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 +646,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 \
@@ -4112,8 +4144,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 +4527,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"
@@ -5582,8 +5614,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 +5997,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"
@@ -7268,8 +7300,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 +7339,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 +7623,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"
@@ -8713,8 +8745,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"

build/msw/makefile.wat

@@ -2525,6 +2525,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 +2551,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 +2576,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 +2598,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 &
@@ -3797,8 +3819,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 +4202,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
@@ -5367,8 +5389,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 +5772,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
@@ -7153,8 +7175,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 +7214,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 +7498,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
@@ -8698,8 +8720,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

build/msw/wx_core.dsp

@@ -1953,7 +1953,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
 

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

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
 

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
@@ -1574,7 +1573,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.])
@@ -5773,7 +5772,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
@@ -5955,18 +5953,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 $WEBKIT_LINK | sed 's/ \+/ /g'`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
     EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -6138,7 +6136,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)

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>

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
-

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>
-{{{
-}}}
-
-###############################################################################
-

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) $**

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

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) $**

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) $<

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>

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

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!
-*/
-

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__

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__

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();
-}
-

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
-

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

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));
-}

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"

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>

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
-

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>
-{{{
-}}}
-
-###############################################################################
-

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
-}
-

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_

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
-}

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_

contrib/samples/foldbar/foldpanelbar/makefile.bcc

@@ -1,193 +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)
-FOLDTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
-	-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \
-	-I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.obj \
-	$(OBJS)\foldtest_foldtestpanel.obj \
-	$(OBJS)\foldtest_layouttest.obj \
-	$(OBJS)\foldtest_test.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!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 "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_6 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_6 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -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 "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!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 "$(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 "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\..\..\lib\bcc_dll$(CFG)
-!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
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-	-if exist $(OBJS)\foldtest.tds del $(OBJS)\foldtest.tds
-	-if exist $(OBJS)\foldtest.ilc del $(OBJS)\foldtest.ilc
-	-if exist $(OBJS)\foldtest.ild del $(OBJS)\foldtest.ild
-	-if exist $(OBJS)\foldtest.ilf del $(OBJS)\foldtest.ilf
-	-if exist $(OBJS)\foldtest.ils del $(OBJS)\foldtest.ils
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS)  $(OBJS)\foldtest_foldpanelbartest.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FOLDTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\foldtest_foldpanelbartest.res
-|
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -i.\..\..\..\include $**

contrib/samples/foldbar/foldpanelbar/makefile.gcc

@@ -1,192 +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)
-FOLDTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
-	$(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \
-	$(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.o \
-	$(OBJS)\foldtest_foldtestpanel.o \
-	$(OBJS)\foldtest_layouttest.o \
-	$(OBJS)\foldtest_test.o \
-	$(OBJS)\foldtest_foldpanelbartest_rc.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 ($(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 ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_4 = -fno-rtti
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_4 = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_5 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_5 = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __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 ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-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 ($(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 ($(SHARED),0)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_dll$(CFG)
-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
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest_rc.o
-	$(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (mondrian.ico) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\foldtest_foldpanelbartest.o: ./foldpanelbartest.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldtestpanel.o: ./foldtestpanel.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_layouttest.o: ./layouttest.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_test.o: ./test.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldpanelbartest_rc.o: ./foldpanelbartest.rc
-	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --include-dir ./../../../include
-
-.PHONY: all clean data

contrib/samples/foldbar/foldpanelbar/makefile.vc

@@ -1,277 +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)
-FOLDTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\foldtest.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \
-	/I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \
-	/I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \
-	$(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.obj \
-	$(OBJS)\foldtest_foldtestpanel.obj \
-	$(OBJS)\foldtest_layouttest.obj \
-	$(OBJS)\foldtest_test.obj \
-	$(OBJS)\foldtest_foldpanelbartest.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_3)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = T
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_8 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_8 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_9 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_9 = /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 "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /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 "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!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 "$(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 "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\..\..\lib\vc_dll$(CFG)
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-	-if exist $(OBJS)\foldtest.ilk del $(OBJS)\foldtest.ilk
-	-if exist $(OBJS)\foldtest.pdb del $(OBJS)\foldtest.pdb
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FOLDTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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
-<<
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /i .\..\..\..\include $**

contrib/samples/foldbar/foldpanelbar/makefile.wat

@@ -1,229 +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
-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
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__RUNTIME_LIBS_5 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_5 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_5 = 
-!endif
-__EXCEPTIONSFLAG_7 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_7 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_7 = -xs
-!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
-__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
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\..\..\..\lib\wat_dll$(CFG)
-!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
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
-	$(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. &
-	$(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include &
-	$(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS =  &
-	$(OBJS)\foldtest_foldpanelbartest.obj &
-	$(OBJS)\foldtest_foldtestpanel.obj &
-	$(OBJS)\foldtest_layouttest.obj &
-	$(OBJS)\foldtest_test.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\foldtest.exe data
-
-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 $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe :  $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
-	@%create $(OBJS)\foldtest.lbc
-	@%append $(OBJS)\foldtest.lbc option quiet
-	@%append $(OBJS)\foldtest.lbc name $^@
-	@%append $(OBJS)\foldtest.lbc option caseexact
-	@%append $(OBJS)\foldtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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 ) do @%append $(OBJS)\foldtest.lbc library %i
-	@%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res
-	wlink @$(OBJS)\foldtest.lbc
-
-data : .SYMBOLIC 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\foldtest_foldpanelbartest.obj :  .AUTODEPEND .\foldpanelbartest.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldtestpanel.obj :  .AUTODEPEND .\foldtestpanel.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_layouttest.obj :  .AUTODEPEND .\layouttest.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_test.obj :  .AUTODEPEND .\test.cpp
-	$(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldpanelbartest.res :  .AUTODEPEND .\foldpanelbartest.rc
-	wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $<

contrib/samples/foldbar/foldpanelbar/test.cpp

@@ -1,211 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     27/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "test.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 "test.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * TestTest type definition
- */
-
-IMPLEMENT_CLASS( TestTest, wxDialog )
-
-/*!
- * TestTest event table definition
- */
-
-BEGIN_EVENT_TABLE( TestTest, wxDialog )
-
-////@begin TestTest event table entries
-////@end TestTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * TestTest constructors
- */
-
-TestTest::TestTest( )
-{
-}
-
-TestTest::TestTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * TestTest creator
- */
-
-bool TestTest::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin TestTest member initialisation
-    blaat = NULL;
-    blaat = NULL;
-////@end TestTest member initialisation
-
-////@begin TestTest creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxDialog::Create( parent, id, caption, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end TestTest creation
-    return true;
-}
-
-/*!
- * Control creation for TestTest
- */
-
-void TestTest::CreateControls()
-{
-////@begin TestTest content construction
-
-    TestTest* item1 = this;
-
-    wxFlexGridSizer* item2 = new wxFlexGridSizer(2, 1, 0, 0);
-    item2->AddGrowableRow(0);
-    item2->AddGrowableCol(0);
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    wxPanel* item3 = new wxPanel( item1, ID_PANEL7, wxDefaultPosition, wxSize(100, 50), wxNO_BORDER|wxTAB_TRAVERSAL );
-    item2->Add(item3, 1, wxGROW|wxGROW|wxADJUST_MINSIZE, 5);
-    wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
-    item3->SetSizer(item4);
-    item3->SetAutoLayout(true);
-    wxPanel* item5 = new wxPanel( item3, ID_PANEL6, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item4->Add(item5, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxFlexGridSizer* item6 = new wxFlexGridSizer(2, 1, 0, 0);
-    item6->AddGrowableRow(1);
-    item6->AddGrowableCol(0);
-    item5->SetSizer(item6);
-    item5->SetAutoLayout(true);
-    wxStaticText* item7 = new wxStaticText( item5, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item6->Add(item7, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxPanel* item8 = new wxPanel( item5, ID_PANEL3, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    item6->Add(item8, 1, wxGROW|wxGROW|wxALL, 5);
-    wxBoxSizer* item9 = new wxBoxSizer(wxVERTICAL);
-    blaat = item9;
-    item8->SetSizer(item9);
-    item8->SetAutoLayout(true);
-    wxPanel* item10 = new wxPanel( item8, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item9->Add(item10, 1, wxGROW, 5);
-    wxBoxSizer* item11 = new wxBoxSizer(wxVERTICAL);
-    item10->SetSizer(item11);
-    item10->SetAutoLayout(true);
-    wxString item12Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item12 = new wxChoice( item10, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item12Strings, 0 );
-    item11->Add(item12, 0, wxGROW|wxALL, 5);
-    wxRadioButton* item13 = new wxRadioButton( item10, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->SetValue(true);
-    item11->Add(item13, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item14 = new wxRadioButton( item10, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetValue(false);
-    item11->Add(item14, 0, wxALIGN_LEFT|wxALL, 5);
-    wxPanel* item15 = new wxPanel( item3, ID_PANEL2, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item4->Add(item15, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxFlexGridSizer* item16 = new wxFlexGridSizer(2, 1, 0, 0);
-    item16->AddGrowableRow(1);
-    item16->AddGrowableCol(0);
-    item15->SetSizer(item16);
-    item15->SetAutoLayout(true);
-    wxStaticText* item17 = new wxStaticText( item15, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add(item17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE|wxFIXED_MINSIZE, 5);
-    wxPanel* item18 = new wxPanel( item15, ID_PANEL4, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    item16->Add(item18, 0, wxGROW|wxGROW|wxALL, 5);
-    wxBoxSizer* item19 = new wxBoxSizer(wxVERTICAL);
-    blaat = item19;
-    item18->SetSizer(item19);
-    item18->SetAutoLayout(true);
-    wxPanel* item20 = new wxPanel( item18, ID_PANEL5, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item19->Add(item20, 1, wxGROW, 5);
-    wxBoxSizer* item21 = new wxBoxSizer(wxVERTICAL);
-    item20->SetSizer(item21);
-    item20->SetAutoLayout(true);
-    wxString item22Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item22 = new wxChoice( item20, ID_CHOICE1, wxDefaultPosition, wxDefaultSize, 3, item22Strings, 0 );
-    item21->Add(item22, 0, wxGROW|wxALL, 5);
-    wxRadioButton* item23 = new wxRadioButton( item20, ID_RADIOBUTTON2, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item23->SetValue(true);
-    item21->Add(item23, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item24 = new wxRadioButton( item20, ID_RADIOBUTTON3, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item24->SetValue(false);
-    item21->Add(item24, 0, wxALIGN_LEFT|wxALL, 5);
-    wxPanel* item25 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 20), wxNO_BORDER|wxTAB_TRAVERSAL );
-    item25->SetBackgroundColour(wxColour(98, 98, 98));
-    item2->Add(item25, 0, wxGROW|wxGROW|wxFIXED_MINSIZE, 5);
-////@end TestTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool TestTest::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap TestTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin TestTest bitmap retrieval
-    return wxNullBitmap;
-////@end TestTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon TestTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin TestTest icon retrieval
-    return wxNullIcon;
-////@end TestTest icon retrieval
-}

contrib/samples/foldbar/foldpanelbar/test.h

@@ -1,115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        test.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     27/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TEST_H_
-#define _TEST_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "test.cpp"
-#endif
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_TESTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_TESTTEST_TITLE _("Test Me")
-#define SYMBOL_TESTTEST_IDNAME ID_DIALOG
-#define SYMBOL_TESTTEST_SIZE wxSize(400, 200)
-#define SYMBOL_TESTTEST_POSITION wxDefaultPosition
-#define ID_PANEL7 10015
-#define ID_PANEL6 10014
-#define ID_PANEL3 10008
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-#define ID_PANEL2 10007
-#define ID_PANEL4 10009
-#define ID_PANEL5 10010
-#define ID_CHOICE1 10011
-#define ID_RADIOBUTTON2 10012
-#define ID_RADIOBUTTON3 10013
-#define ID_PANEL1 10006
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * TestTest class declaration
- */
-
-class TestTest: public wxDialog
-{
-    DECLARE_CLASS( TestTest )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    TestTest( );
-    TestTest( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin TestTest event handler declarations
-
-////@end TestTest event handler declarations
-
-////@begin TestTest member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end TestTest member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin TestTest member variables
-    wxBoxSizer* blaat;
-////@end TestTest member variables
-};
-
-#endif
-    // _TEST_H_

contrib/src/foldbar/Makefile.in

@@ -1,251 +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@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-AR = @AR@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-
-### Variables: ###
-
-DESTDIR = 
-WX_VERSION = 2.5.2
-LIBDIRNAME = $(top_builddir)lib
-FOLDBARDLL_CXXFLAGS = $(__foldbardll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_FOLDBAR $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	foldbardll_captionbar.o \
-	foldbardll_foldpanelbar.o \
-	foldbardll_foldpanelitem.o
-FOLDBARDLL_ODEP =  $(___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname)
-FOLDBARLIB_CXXFLAGS = $(__foldbarlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	foldbarlib_captionbar.o \
-	foldbarlib_foldpanelbar.o \
-	foldbarlib_foldpanelitem.o
-FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname)
-
-### 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_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
-@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_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)252
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-COND_SHARED_1___foldbardll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_SHARED_1@__foldbardll___depname = $(COND_SHARED_1___foldbardll___depname)
-@COND_SHARED_1@__install_foldbardll___depname = install_foldbardll
-COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__foldbardll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd)
-COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
-COND_PLATFORM_WIN32_1___foldbardll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__foldbardll___importlib = $(COND_PLATFORM_WIN32_1___foldbardll___importlib)
-@COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
-@COND_GCC_PCH_1@___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@	= .pch/wxprec_foldbardll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).2
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__foldbardll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).2.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__foldbardll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___foldbardll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__foldbardll___soname_flags = $(COND_USE_SOVERLINUX_1___foldbardll___soname_flags)
-COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__foldbardll___soname_flags = $(COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
-	-f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd)
-@COND_PLATFORM_MACOSX_1@__foldbardll___macver = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version $(WX_VERSION) \
-@COND_PLATFORM_MACOSX_1@	-current_version $(WX_VERSION)
-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_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_SHARED_0___foldbarlib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__foldbarlib___depname = $(COND_SHARED_0___foldbarlib___depname)
-@COND_SHARED_0@__install_foldbarlib___depname = install_foldbarlib
-@COND_GCC_PCH_1@__foldbarlib_PCH_INC = -I.pch/wxprec_foldbarlib
-@COND_GCC_PCH_1@___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@	= .pch/wxprec_foldbarlib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-install: all $(__install_foldbardll___depname) $(__install_foldbarlib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
-	for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.h; do \
-	if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
-	fi; \
-	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
-	done
-
-uninstall: 
-
-install-strip: install
-	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(__foldbardll___macver)  $(__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) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-@COND_SHARED_1@	
-@COND_SHARED_1@	$(__foldbardll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_foldbardll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_inst_cmd))
-
-@COND_GCC_PCH_1@.pch/wxprec_foldbardll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) rcu $@ $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_foldbarlib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_GCC_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
-
-foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-foldbardll_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-foldbardll_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
-
-foldbarlib_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-foldbarlib_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-foldbarlib_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_foldbardll install_foldbarlib

contrib/src/foldbar/captionbar.cpp

@@ -1,399 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        captionbar.cpp
-// Purpose:     wxCaptionBar class belonging to the wxFoldPanel (but can be used independent)
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "foldpanelbar.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/dcmemory.h"
-#include "wx/dcclient.h"
-#endif
-
-#include <wx/app.h>
-
-#include "wx/foldbar/captionbar.h"
-
-/*
- * wxCaptionBar
- */
-
-BEGIN_EVENT_TABLE(wxCaptionBar, wxWindow)
-    EVT_PAINT(wxCaptionBar::OnPaint)
-    EVT_CHAR(wxCaptionBar::OnChar)
-    EVT_MOUSE_EVENTS(wxCaptionBar::OnMouseEvent)
-    EVT_SIZE(wxCaptionBar::OnSize)
-END_EVENT_TABLE()
-
-wxCaptionBar::wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images, wxWindowID id,
-                           const wxCaptionBarStyle &cbstyle, const wxPoint& pos, const wxSize& size, long style)
-    : wxWindow(parent, id, pos, size, style)
-    , _caption(caption)
-    , _foldIcons(images)
-    , _rightIndent(wxFPB_BMP_RIGHTSPACE)
-    , _iconWidth(16)
-    , _iconHeight(16)
-    , _collapsed(false)
-{
-    // do initialisy thingy stuff
-
-    ApplyCaptionStyle(cbstyle, true);
-
-    // set initial size
-    if(_foldIcons)
-    {
-        wxASSERT(_foldIcons->GetImageCount() > 1);
-        _foldIcons->GetSize(0, _iconWidth, _iconHeight);
-    }
-}
-
-wxCaptionBar::~wxCaptionBar()
-{
-
-}
-
-void wxCaptionBar::ApplyCaptionStyle(const wxCaptionBarStyle &cbstyle, bool applyDefault)
-{
-    wxASSERT(GetParent());
-
-    wxCaptionBarStyle newstyle = cbstyle;
-
-    // set defaults in newly created style copy if needed
-    if(applyDefault)
-    {
-        // get first colour from style or make it default
-        if(!newstyle.FirstColourUsed())
-            newstyle.SetFirstColour(*wxWHITE);
-
-        // get second colour from style or make it default
-        if(!newstyle.SecondColourUsed())
-        {
-            // make the second colour slightly darker then the background
-            wxColour col = GetParent()->GetBackgroundColour();
-            col.Set((col.Red() >> 1) + 20, (col.Green() >> 1) + 20, (col.Blue() >> 1) + 20);
-            newstyle.SetSecondColour(col);
-        }
-
-        // get text colour
-        if(!newstyle.CaptionColourUsed())
-            newstyle.SetCaptionColour(*wxBLACK);
-
-        // get font colour
-        if(!newstyle.CaptionFontUsed())
-            newstyle.SetCaptionFont(GetParent()->GetFont());
-
-        // apply caption style
-        if(!newstyle.CaptionStyleUsed())
-            newstyle.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
-    }
-
-    // apply the style
-    _style = newstyle;
-}
-
-void wxCaptionBar::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-
-    // TODO: Maybe first a memory DC should draw all, and then paint it on the
-    // caption. This way a flickering arrow during resize is not visible
-
-    // draw basics
-
-    FillCaptionBackground(dc);
-
-    dc.SetFont(_style.GetCaptionFont());
-    dc.DrawText(_caption, 4, (wxFPB_EXTRA_Y / 2));
-
-    // draw small icon, either collapsed or expanded
-    // based on the state of the bar. If we have
-    // any bmp's
-
-    if(_foldIcons)
-    {
-        wxCHECK2(_foldIcons->GetImageCount() > 1, return);
-
-        int index = 0;
-        if(_collapsed)
-            index = 1;
-
-        wxRect wndRect = GetRect();
-        _foldIcons->Draw(index, dc, wndRect.GetRight() - _iconWidth - _rightIndent, (wndRect.GetHeight() - _iconHeight) / 2,
-                         wxIMAGELIST_DRAW_TRANSPARENT);
-    }
-}
-
-void wxCaptionBar::FillCaptionBackground(wxPaintDC &dc)
-{
-    // dispatch right style for caption drawing
-
-    switch(_style.GetCaptionStyle())
-    {
-    case wxCAPTIONBAR_GRADIENT_V:
-        DrawVerticalGradient(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_GRADIENT_H:
-        DrawHorizontalGradient(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_SINGLE:
-        DrawSingleColour(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_RECTANGLE:
-    case wxCAPTIONBAR_FILLED_RECTANGLE:
-        DrawSingleRectangle(dc, GetRect());
-        break;
-    default:
-        break;
-    }
-}
-
-void wxCaptionBar::OnMouseEvent(wxMouseEvent& event)
-{
-    // if clicked on the arrow (single) or double on the caption
-    // we change state and an event must be fired to let this
-    // panel collapse or expand
-
-    bool send_event = false;
-
-    if (event.LeftDown() && _foldIcons)
-    {
-        wxPoint pt(event.GetPosition());
-        wxRect rect = GetRect();
-
-        if(pt.x > (rect.GetWidth() - _iconWidth - _rightIndent))
-            send_event = true;
-    }
-    else if(event.LeftDClick())
-        send_event = true;
-
-    // send the collapse, expand event to the parent
-
-    if(send_event)
-    {
-        wxCaptionBarEvent event(wxEVT_CAPTIONBAR);
-        event.SetBar(this);
-
-        ::wxPostEvent(this, event);
-
-    }
-}
-
-void wxCaptionBar::OnChar(wxKeyEvent &event)
-{
-    // TODO: Anything here?
-
-    event.Skip();
-}
-
-wxSize wxCaptionBar::DoGetBestSize() const
-{
-    int x,y;
-
-    GetTextExtent(_caption, &x, &y);
-
-    if(x < _iconWidth)
-        x = _iconWidth;
-
-    if(y < _iconHeight)
-        y = _iconHeight;
-
-    // TODO: The extra wxFPB_EXTRA_X constants should be adjustable as well
-
-    return wxSize(x + wxFPB_EXTRA_X, y + wxFPB_EXTRA_Y);
-}
-
-
-void wxCaptionBar::DrawVerticalGradient(wxDC &dc, const wxRect &rect )
-{
-    // gradient fill from colour 1 to colour 2 with top to bottom
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-
-    // calculate gradient coefficients
-    wxColour col2 = _style.GetSecondColour(),
-             col1 = _style.GetFirstColour();
-
-    double rstep = double((col2.Red() -   col1.Red())) / double(rect.height), rf = 0,
-           gstep = double((col2.Green() - col1.Green())) / double(rect.height), gf = 0,
-           bstep = double((col2.Blue() -  col1.Blue())) / double(rect.height), bf = 0;
-
-    wxColour currCol;
-    for(int y = rect.y; y < rect.y + rect.height; y++)
-    {
-        currCol.Set(
-            (unsigned char)(col1.Red() + rf),
-            (unsigned char)(col1.Green() + gf), 
-            (unsigned char)(col1.Blue() + bf)
-        );
-        dc.SetBrush( wxBrush( currCol, wxSOLID ) );
-        dc.DrawRectangle( rect.x, rect.y + (y - rect.y), rect.width, rect.height );
-        //currCol.Set(currCol.Red() + rstep, currCol.Green() + gstep, currCol.Blue() + bstep);
-        rf += rstep; gf += gstep; bf += bstep;
-    }
-}
-
-void wxCaptionBar::DrawHorizontalGradient(wxDC &dc, const wxRect &rect )
-{
-    // gradient fill from colour 1 to colour 2 with left to right
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    // calculate gradient coefficients
-    wxColour col2 = _style.GetSecondColour(),
-             col1 = _style.GetFirstColour();
-
-    double rstep = double((col2.Red() -   col1.Red())) / double(rect.width), rf = 0,
-           gstep = double((col2.Green() - col1.Green())) / double(rect.width), gf = 0,
-           bstep = double((col2.Blue() -  col1.Blue())) / double(rect.width), bf = 0;
-
-    wxColour currCol;
-    for(int x = rect.x; x < rect.x + rect.width; x++)
-    {
-        currCol.Set(
-            (unsigned char)(col1.Red() + rf), 
-            (unsigned char)(col1.Green() + gf), 
-            (unsigned char)(col1.Blue() + bf)
-        );
-        dc.SetBrush( wxBrush( currCol, wxSOLID ) );
-        dc.DrawRectangle( rect.x + (x - rect.x), rect.y, 1, rect.height );
-        rf += rstep; gf += gstep; bf += bstep;
-    }
-}
-
-void wxCaptionBar::DrawSingleColour(wxDC &dc, const wxRect &rect )
-{
-    // single colour fill. This is the most easy one to find
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    // draw simple rectangle
-    dc.SetBrush( wxBrush( _style.GetFirstColour(), wxSOLID ) );
-    dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height );
-}
-
-void wxCaptionBar::DrawSingleRectangle(wxDC &dc, const wxRect &rect )
-{
-    wxASSERT(GetParent());
-
-    // single colour fill. This is the most easy one to find
-
-    if(rect.height < 2 || rect.width < 1)
-        return;
-
-    // single frame, set up internal fill colour
-
-    wxBrush br;
-    br.SetStyle(wxSOLID);
-
-    if(_style.GetCaptionStyle() == wxCAPTIONBAR_RECTANGLE)
-        br.SetColour(GetParent()->GetBackgroundColour());
-    else
-        br.SetColour(_style.GetFirstColour());
-
-    // setup the pen frame
-
-    wxPen pen(_style.GetSecondColour());
-    dc.SetPen(pen);
-
-    dc.SetBrush( br );
-    dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height - 1);
-
-    wxPen bgpen(GetParent()->GetBackgroundColour());
-    dc.SetPen(bgpen);
-    dc.DrawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1);
-}
-
-
-void wxCaptionBar::OnSize(wxSizeEvent &event)
-{
-    wxSize size = event.GetSize();
-
-    if(_foldIcons)
-    {
-        // What I am doing here is simply invalidating the part of the window exposed. So when I
-        // make a rect with as width the newly exposed part, and the x,y of the old window size origin,
-        // I don't need a bitmap calulation in it, or do I ? The bitmap needs redrawing anyway. Leave it
-        // like this until I figured it out
-
-        // set rect to redraw as old bitmap area which is entitled to redraw
-
-        wxRect rect(size.GetWidth() - _iconWidth - _rightIndent, 0, _iconWidth + _rightIndent,
-                    _iconWidth + _rightIndent);
-
-        // adjust rectangle when more is slided so we need to redraw all
-        // the old stuff but not all (ugly flickering)
-
-        int diffX = size.GetWidth() - _oldSize.GetWidth();
-        if(diffX > 1)
-        {
-            // adjust the rect with all the crap to redraw
-
-            rect.SetWidth(rect.GetWidth() + diffX + 10);
-            rect.SetX(rect.GetX() - diffX - 10);
-        }
-
-        RefreshRect(rect);
-    }
-    else
-    {
-        wxRect rect = GetRect();
-        RefreshRect(rect);
-    }
-
-    _oldSize = size;
-}
-
-void wxCaptionBar::RedrawIconBitmap()
-{
-    if(_foldIcons)
-    {
-        // invalidate the bitmap area and force a redraw
-
-        wxRect rect = GetRect();
-
-        rect.SetX(rect.GetWidth() - _iconWidth - _rightIndent);
-        rect.SetWidth(_iconWidth + _rightIndent);
-        RefreshRect(rect);
-    }
-}
-
-/*
- * wxCaptionBarEvent
- */
-
-DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-
-wxCaptionBarEvent::wxCaptionBarEvent(const wxCaptionBarEvent &event)
-    : wxCommandEvent(event)
-{
-    _bar = event._bar;
-}
-
-//DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-//IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxCommandEvent)

contrib/src/foldbar/foldpanelbar.cpp

@@ -1,350 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbar.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-#include "icon_collapsed.xpm"
-#include "icon_expanded.xpm"
-#include "icon_theresmore.xpm"
-
-//----------------------------------------------------------------------------
-// wxFoldPanelBar
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS( wxFoldPanelBar, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
-    EVT_SIZE(wxFoldPanelBar::OnSizePanel)
-    //EVT_PAINT(wxFoldPanelBar::OnPaint)
-    EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelBar::OnPressCaption)
-END_EVENT_TABLE()
-
-wxFoldPanelBar::wxFoldPanelBar()
-{
-
-}
-
-wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position,
-                                const wxSize& size, long style, long extraStyle)
-    : _foldPanel(0)
-    , _bottomPanel(0)
-    , _controlCreated(false)
-{
-    Create( parent, id, position, size, style, extraStyle);
-}
-
-void wxFoldPanelBar::Create( wxWindow *parent, wxWindowID id, const wxPoint &position,
-                             const wxSize& size, long style, long extraStyle )
-{
-
-    _extraStyle = extraStyle;
-
-    // create the panel (duh!). This causes a size event, which we are going
-    // to skip when we are not initialised
-
-    wxPanel::Create(parent, id, position, size, style);
-
-    // the fold panel area
-
-    _foldPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL);
-
-    // the extra area for some icons / context menu etc
-
-#if 0
-    _bottomPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22), wxNO_BORDER|wxTAB_TRAVERSAL);
-    _bottomPanel->SetBackgroundColour(*wxWHITE);
-#endif
-
-    // create the fold icons to be used in the captions
-
-    _images = new wxImageList(16, 16);
-
-    wxBitmap *bmp = new wxBitmap(icon_expanded);
-    _images->Add(*bmp);
-    delete bmp;
-
-    bmp = new wxBitmap(icon_collapsed);
-    _images->Add(*bmp);
-    delete bmp;
-
-    _moreBmp = new wxBitmap(icon_theresmore);
-
-    // do this as last, to check if create is already called
-
-    _controlCreated = true;
-}
-
-wxFoldPanelBar::~wxFoldPanelBar()
-{
-    delete _images;
-    delete _moreBmp;
-}
-
-wxFoldPanel wxFoldPanelBar::AddFoldPanel(const wxString &caption, bool collapsedInitially, const wxCaptionBarStyle &style)
-{
-    wxASSERT(_controlCreated);
-
-    // create a fold panel item, which is first only the caption.
-    // the user can now add a panel area which will be folded in
-    // when pressed.
-
-    wxFoldPanelItem *item = new wxFoldPanelItem(_foldPanel, caption, _images, collapsedInitially, style);
-
-    // look at the last added one and reposition this one
-    int y = 0;
-    if(_panels.GetCount() > 0)
-        y = _panels.Last()->GetY() + _panels.Last()->GetPanelHeight();
-
-    item->Reposition(y);
-    _panels.Add(item);
-
-    //return wxFoldPanel(item);
-    return wxFoldPanel(item);
-}
-
-int wxFoldPanelBar::AddFoldPanelWindow(const wxFoldPanel &panel, wxWindow *window, int flags, int ySpacing, int leftSpacing,
-                                       int rightSpacing)
-{
-    wxCHECK(panel.IsOk(), -1);
-    panel.GetItem()->AddWindow(window, flags, ySpacing, leftSpacing, rightSpacing);
-
-    // TODO: Take old and new height, and if difference, reposition all the lower panels
-    // this is because the user can add new wxWindow controls somewhere in between
-    // when other panels are already present.
-
-    return 0;
-}
-
-int wxFoldPanelBar::AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color, int ySpacing, int leftSpacing,
-                                          int rightSpacing)
-{
-    wxCHECK(panel.IsOk(), -1);
-    panel.GetItem()->AddSeparator(color, ySpacing, leftSpacing, rightSpacing);
-
-    return 0;
-}
-
-void wxFoldPanelBar::OnSizePanel(wxSizeEvent &event)
-{
-    // skip all stuff when we are not initialised yet
-
-    if(!_controlCreated)
-    {
-        event.Skip();
-        return;
-    }
-
-    // now size the fold panel area and the
-    // lower bar in such a way that the bar is always
-    // visible
-
-    wxRect foldrect = GetRect();
-
-    // fold panel itself. If too little space,
-    // don't show it
-
-#if 0
-    if(foldrect.GetHeight() < 23)
-        foldrect.SetHeight(0);
-    else
-        foldrect.SetHeight(foldrect.GetHeight() - 22);
-#endif
-
-    foldrect.SetX(0);
-    foldrect.SetY(0);
-    _foldPanel->SetSize(foldrect);
-
-    if(_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
-    {
-        wxRect rect = RepositionCollapsedToBottom();
-        if(rect.GetHeight() > 0)
-            RefreshRect(rect);
-    }
-
-    // TODO: A smart way to check wether the old - new width of the
-    // panel changed, if so no need to resize the fold panel items
-
-    RedisplayFoldPanelItems();
-
-    // tool panel for icons and other stuff
-
-#if 0
-    wxRect bottomrect = GetRect();
-    if(bottomrect.GetHeight() < 22)
-        bottomrect.SetY(0);
-    else
-        bottomrect.SetY(bottomrect.GetHeight() - 22);
-
-    bottomrect.SetHeight(22);
-    bottomrect.SetX(0);
-    _bottomPanel->SetSize(bottomrect);
-
-    // TODO: redraw the bitmap properly
-    // use the captionbar algorithm for that
-
-    _bottomPanel->Refresh();
-#endif
-}
-
-void wxFoldPanelBar::OnPaint(wxPaintEvent &event)
-{
-    if(!_controlCreated)
-        return;
-#if 0
-    // paint the bottom panel only, where the
-    // arrow is shown when there is more to show the user
-    // just as informative icon
-
-    wxPaintDC dc(_bottomPanel);
-
-    wxSize size = _bottomPanel->GetSize();
-    int offset = (size.GetHeight() - _moreBmp->GetHeight()) / 2;
-
-    dc.DrawBitmap(*_moreBmp, size.GetWidth() - _moreBmp->GetWidth() - 2, offset, true);
-#endif
-
-    event.Skip();
-}
-
-void wxFoldPanelBar::OnPressCaption(wxCaptionBarEvent &event)
-{
-    // act upon the folding or expanding status of the bar
-    // to expand or collapse the panel(s)
-
-    if(event.GetFoldStatus())
-        Collapse(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
-    else
-        Expand(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(wxFoldPanelItem *item)
-{
-    wxASSERT(item);
-
-    int i = _panels.Index(item);
-    if(i != wxNOT_FOUND)
-        RefreshPanelsFrom(i);
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(size_t i)
-{
-    Freeze();
-
-    // if collapse to bottom is on, the panels that are not expanded
-    // should be drawn at the bottom. All panels that are expanded
-    // are drawn on top. The last expanded panel gets all the extra space
-
-    if(_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
-    {
-        int offset = 0;
-
-        for(size_t j = 0; j < _panels.GetCount(); j++)
-        {
-            if(_panels.Item(j)->IsExpanded())
-                offset += _panels.Item(j)->Reposition(offset);
-        }
-
-        // put all non collapsed panels at the bottom where there is space, else
-        // put them right behind the expanded ones
-
-        RepositionCollapsedToBottom();
-    }
-    else
-    {
-        int y = _panels.Item(i)->GetY() + _panels.Item(i)->GetPanelHeight();
-        for(i++; i < _panels.GetCount(); i++)
-            y += _panels.Item(i)->Reposition(y);
-    }
-    Thaw();
-}
-
-void wxFoldPanelBar::RedisplayFoldPanelItems()
-{
-    // resize them all. No need to reposition
-
-    wxFoldPanelItem *item;
-    for(size_t i = 0; i < _panels.GetCount(); i++)
-    {
-        item = _panels.Item(i);
-        wxASSERT(item);
-
-        item->ResizePanel();
-    }
-}
-
-wxRect wxFoldPanelBar::RepositionCollapsedToBottom()
-{
-    wxRect value(0,0,0,0);
-
-    // determine wether the number of panels left
-    // times the size of their captions is enough
-    // to be placed in the left over space
-
-    int expanded = 0, collapsed = 0, offset;
-    GetPanelsHeight(collapsed, expanded);
-
-    // if no room stick them behind the normal ones, else
-    // at the bottom
-
-    if((GetSize().GetHeight() - expanded - collapsed) < 0)
-        offset = expanded;
-    else
-    {
-        // value is the region which is left unpainted
-        // I will send it back as 'slack' so it does not need to
-        // be recalulated.
-
-        value.SetX(0);
-        value.SetY(expanded);
-        value.SetHeight(GetSize().GetHeight() - expanded);
-        value.SetWidth(GetSize().GetWidth());
-
-        offset = GetSize().GetHeight() - collapsed;
-    }
-
-
-    // go reposition
-
-    for(size_t i = 0; i < _panels.GetCount(); i++)
-    {
-        if(!_panels.Item(i)->IsExpanded())
-            offset += _panels.Item(i)->Reposition(offset);
-    }
-
-    return value;
-}
-
-int wxFoldPanelBar::GetPanelsHeight(int &collapsed, int &expanded)
-{
-    int value = 0;
-
-    // assumed here that all the panels that are expanded
-    // are positioned after eachother from 0,0 to end.
-
-    for(size_t j = 0; j < _panels.GetCount(); j++)
-    {
-        int offset = _panels.Item(j)->GetPanelHeight();
-        value += offset;
-        if(_panels.Item(j)->IsExpanded())
-            expanded += offset;
-        else
-            collapsed += offset;
-    }
-
-    return value;
-
-}

contrib/src/foldbar/foldpanelitem.cpp

@@ -1,204 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelitem.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/foldbar/foldpanelitem.h"
-
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxFoldWindowItemArray);
-
-//----------------------------------------------------------------------------
-// wxFoldPanelItem
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS( wxFoldPanelItem, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelItem,wxPanel)
-    EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelItem::OnPressCaption)
-    EVT_PAINT(wxFoldPanelItem::OnPaint)
-    //EVT_SIZE(wxFoldPanelItem::OnSize)
-END_EVENT_TABLE()
-
-wxFoldPanelItem::wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxImageList *icons, bool collapsedInitially,
-                                  const wxCaptionBarStyle &style )
-    : _controlCreated(false)
-    , _yUserSize(0)
-    , _yPanelSize(0)
-    , _yLastInsertPos(0)
-    , _yPos(0)
-    , _userSized(false)
-{
-    wxCHECK2(parent, return);
-
-    wxPanel::Create(parent, wxID_ANY);
-
-    // create the caption bar, in collapsed or expanded state
-
-    _captionBar = new wxCaptionBar(this, caption, icons, wxID_ANY, style, wxPoint(0,0));
-    //_captionBar->SetBoldFont();
-
-    if(collapsedInitially)
-        _captionBar->Collapse();
-
-    _controlCreated = true;
-
-    // make initial size for component, if collapsed, the
-    // size is determined on the panel height and won't change
-
-    wxSize size = _captionBar->GetSize();
-    _yPanelSize = size.GetHeight();
-    _yLastInsertPos = _yPanelSize;
-}
-
-void wxFoldPanelItem::AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing)
-{
-    wxASSERT(window);
-
-    wxFoldWindowItem *wi = new wxFoldWindowItem(window, flags, ySpacing, leftSpacing, rightSpacing);
-    _items.Add(wi);
-
-    window->SetSize(leftSpacing, _yLastInsertPos + ySpacing, wxDefaultCoord, wxDefaultCoord, wxSIZE_USE_EXISTING);
-    _yLastInsertPos += wi->GetWindowHeight();
-
-    ResizePanel();
-}
-
-void wxFoldPanelItem::AddSeparator(const wxColour &color, int ySpacing, int leftSpacing, int rightSpacing)
-{
-    wxFoldWindowItem *wi = new wxFoldWindowItem(_yLastInsertPos, color, ySpacing, leftSpacing, rightSpacing);
-    _items.Add(wi);
-
-    _yLastInsertPos += wi->GetWindowHeight();
-
-    ResizePanel();
-}
-
-
-wxFoldPanelItem::~wxFoldPanelItem()
-{
-    _items.Clear();
-}
-
-void wxFoldPanelItem::OnPressCaption(wxCaptionBarEvent &event)
-{
-    // tell the upper container we are responsible
-    // for this event, so it can fold the panel item
-    // and do a refresh
-
-    event.SetTag((void *)this);
-    event.Skip();
-}
-
-/* Inactive */
-void wxFoldPanelItem::OnSize(wxSizeEvent &event)
-{
-    // deny access to pointers (yet)
-
-    if(!_controlCreated)
-    {
-        event.Skip();
-        return;
-    }
-
-    // calculate the size needed for this window, so
-    // we get the parent size, and determine the size for the caption and the panel
-
-    //wxRect rect = GetRect();
-
-    //wxSize size(0,wxDefaultCoord);
-    //size.SetWidth(rect.GetWidth());
-    //_captionBar->SetSize(size);
-
-}
-
-int wxFoldPanelItem::Reposition(int y)
-{
-    // NOTE: Call Resize before Reposition when an item is added, because the new
-    // size needed will be calculated by Resize. Ofcourse the relative position
-    // of the controls have to be correct in respect to the caption bar
-
-    Freeze();
-
-    SetSize(wxDefaultCoord, y, wxDefaultCoord, wxDefaultCoord, wxSIZE_USE_EXISTING);
-    _yPos = y;
-
-    Thaw();
-
-    return GetPanelHeight();
-}
-
-void wxFoldPanelItem::ResizePanel()
-{
-    // prevent unnecessary updates by blocking repaints for a sec
-
-    Freeze();
-
-    // force this panel to take the width of the parent panel and the y of the
-    // user or calulated width (which will be recalculated by the contents here
-
-    wxSize size;
-    if(_captionBar->IsCollapsed())
-    {
-        size = _captionBar->GetSize();
-        _yPanelSize = size.GetHeight();
-    }
-    else
-    {
-        size = GetBestSize();
-        _yPanelSize = size.GetHeight();
-
-        if(_userSized)
-            size.SetHeight(_yUserSize);
-    }
-
-    wxSize pnlsize = GetParent()->GetSize();
-    size.SetWidth(pnlsize.GetWidth());
-
-    // resize caption bar
-    _captionBar->SetSize(wxSize(size.GetWidth(), wxDefaultCoord));
-
-    // resize the panel
-    SetSize(size);
-
-    // go by all the controls and call Layout
-
-    for(size_t i = 0; i < _items.GetCount(); i++)
-        _items.Item(i).ResizeItem(size.GetWidth());
-
-    // and draw all
-
-    Thaw();
-}
-
-void wxFoldPanelItem::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    // draw all the items that are lines
-
-    wxPaintDC dc(this);
-
-    for(size_t i = 0; i < _items.GetCount(); i++)
-    {
-        wxFoldWindowItem &item = _items.Item(i);
-        wxPen pen(item.GetLineColour(), 1, wxSOLID);
-        if(item.GetType() == wxFoldWindowItem::SEPARATOR)
-        {
-            dc.SetPen(pen);
-            dc.DrawLine(item.GetLeftSpacing(), item.GetLineY() + item.GetYSpacing(),
-                        item.GetLineWidth() + item.GetLeftSpacing(), item.GetLineY() + item.GetYSpacing());
-        }
-    }
-}

contrib/src/foldbar/icon_collapsed.old.xpm

@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_collapsed[] = {
-"16 16 3 1",
-" 	c #00FFFF",
-".	c None",
-"+	c #000000",
-"................",
-"................",
-".......+........",
-".......+........",
-"......+++.......",
-"......+++.......",
-".....+++++......",
-".....+++++......",
-"....+++++++.....",
-"....+++++++.....",
-"...+++++++++....",
-"...+++++++++....",
-"..+++++++++++...",
-"..+++++++++++...",
-"................",
-"................"};

contrib/src/foldbar/icon_collapsed.xpm

@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_collapsed[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};

contrib/src/foldbar/icon_expanded.old.xpm

@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_expanded[] = {
-"16 16 3 1",
-" 	c #00FFFF",
-".	c None",
-"+	c #000000",
-"................",
-"................",
-"..+++++++++++...",
-"..+++++++++++...",
-"...+++++++++....",
-"...+++++++++....",
-"....+++++++.....",
-"....+++++++.....",
-".....+++++......",
-".....+++++......",
-"......+++.......",
-"......+++.......",
-".......+........",
-".......+........",
-"................",
-"................"};

contrib/src/foldbar/icon_expanded.xpm

@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_expanded[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};

contrib/src/foldbar/icon_theresmore.xpm

@@ -1,30 +0,0 @@
-/* XPM */
-static char *icon_theresmore[] = {
-"7 10 16 2",
-"00 c black",
-"01 c none",
-"02 c gray100",
-"03 c gray100",
-"04 c gray100",
-"05 c gray100",
-"06 c gray100",
-"07 c gray100",
-"08 c gray100",
-"09 c gray100",
-"10 c gray100",
-"11 c gray100",
-"12 c gray100",
-"13 c gray100",
-"14 c gray100",
-"15 c gray100",
-"01010101010101",
-"01010100010101",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010100010100",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010101010100"
-};

contrib/src/stc/ScintillaWX.cpp

@@ -133,33 +133,6 @@ BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
 END_EVENT_TABLE()
 
 
-//----------------------------------------------------------------------
-
-static wxTextFileType wxConvertEOLMode(int scintillaMode)
-{
-    wxTextFileType type;
-    
-    switch (scintillaMode) {
-        case wxSTC_EOL_CRLF:
-            type = wxTextFileType_Dos;
-            break;
-            
-        case wxSTC_EOL_CR:
-            type = wxTextFileType_Mac;
-            break;
-                
-        case wxSTC_EOL_LF:
-            type = wxTextFileType_Unix;
-            break;
-            
-        default:
-            type = wxTextBuffer::typeDefault;
-            break;
-    }
-    return type;
-}
-    
-
 //----------------------------------------------------------------------
 // Constructor/Destructor
 
@@ -423,9 +396,7 @@ void ScintillaWX::Paste() {
         wxTheClipboard->Close();
     }
     if (gotData) {
-        wxString   text = wxTextBuffer::Translate(data.GetText(),
-                                                  wxConvertEOLMode(pdoc->eolMode));
-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
@@ -720,9 +691,7 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
         wxTheClipboard->Close();
     }
     if (gotData) {
-        wxString   text = wxTextBuffer::Translate(data.GetText(),
-                                                  wxConvertEOLMode(pdoc->eolMode));
-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
@@ -848,9 +817,6 @@ void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 
-    wxString text = wxTextBuffer::Translate(data,
-                                            wxConvertEOLMode(pdoc->eolMode));
-    
     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
     evt.SetEventObject(stc);
@@ -858,7 +824,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     evt.SetX(x);
     evt.SetY(y);
     evt.SetPosition(PositionFromLocation(Point(x,y)));
-    evt.SetDragText(text);
+    evt.SetDragText(data);
     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();

demos/dbbrowse/doc.cpp

@@ -170,7 +170,7 @@ bool MainDoc::OnInitODBC()
 
     //---------------------------------------------------------------------------------------
     const char sep = 3; // separator character used in string between DSN ans DsDesc
-    wxSortedArrayString s_SortDSNList, s_SortDsDescList;
+    wxStringList s_SortDSNList, s_SortDsDescList;
     // BJO-20000127
     // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
     // The key will be removed after sorting
@@ -183,26 +183,31 @@ bool MainDoc::OnInitODBC()
         s_SortDSNList.Add(Dsn);
         s_SortDsDescList.Add(KeyString);
     }
+    s_SortDSNList.Sort();     //BJO
+    s_SortDsDescList.Sort();  //BJO
     
+    wxChar ** s_SortDSN = s_SortDSNList.ListToArray();        //BJO
+    wxChar ** s_SortDsDesc = s_SortDsDescList.ListToArray();  //BJO
     //---------------------------------------------------------------------------------------
     // Allocate n ODBC-DSN objects to hold the information
-    // Allocate n wxDatabase objects to hold the column information
     p_DSN = new DSN[i_DSN];  //BJO
-    db_Br = new BrowserDB[i_DSN];
     for (i=0;i<i_DSN;i++)
     {
-        KeyString = s_SortDsDescList[i];
+        KeyString = s_SortDsDesc[i];
         KeyString = KeyString.AfterFirst(sep);
-
-        // ODBC-DSN object
-        (p_DSN+i)->Dsn = s_SortDSNList[i];
-        (p_DSN+i)->Drv = KeyString;
+        wxStrcpy(s_SortDsDesc[i],KeyString.c_str());
+        (p_DSN+i)->Dsn = s_SortDSN[i];
+        (p_DSN+i)->Drv = s_SortDsDesc[i];
         (p_DSN+i)->Usr = _T("");
         (p_DSN+i)->Pas = _T("");
         Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
         wxLogMessage(Temp0);
-
-        // wxDataBase object
+    }
+    //---------------------------------------------------------------------------------------
+    // Allocate n wxDatabase objects to hold the column information
+    db_Br = new BrowserDB[i_DSN];
+    for (i=0;i<i_DSN;i++)
+    {
         (db_Br+i)->p_LogWindow = p_LogWin;
         (db_Br+i)->ODBCSource  = (p_DSN+i)->Dsn;
         (db_Br+i)->UserName    = (p_DSN+i)->Usr;
@@ -213,6 +218,8 @@ bool MainDoc::OnInitODBC()
 
     DbConnectInf.FreeHenv();
 
+    delete [] s_SortDSN;
+    delete [] s_SortDsDesc;
     //---------------------------------------------------------------------------------------
     if (!i_DSN)
     {

demos/forty/forty.cpp

@@ -75,13 +75,6 @@ FortyApp::~FortyApp()
 bool FortyApp::OnInit()
 {
     bool largecards = false;
-#ifndef __WXWINCE__
-    m_helpFile = wxGetCwd() + wxFILE_SEP_PATH + wxT("about.htm");
-    if (!wxFileExists(m_helpFile))
-#endif
-    {
-        m_helpFile = wxPathOnly(argv[0]) + wxFILE_SEP_PATH + wxT("about.htm");
-    }
 
     wxSize size(668,510);
 
@@ -240,7 +233,7 @@ void
 FortyFrame::Help(wxCommandEvent& event)
 {
 #if wxUSE_HTML
-    if (wxFileExists(wxGetApp().GetHelpFile()))
+    if (wxFileExists(wxT("about.htm")))
     {
         FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
         if (dialog.ShowModal() == wxID_OK)
@@ -331,9 +324,13 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
 {
 #if wxUSE_HTML
     wxString htmlText;
-    wxString htmlFile = wxGetApp().GetHelpFile();
+    wxString htmlFile(wxT("about.htm"));
 
+    //if (!wxGetApp().GetMemoryTextResource(wxT("about.htm"), htmlText))
     {
+//        wxSetWorkingDirectory(wxGetApp().GetAppDir());
+//        wxString htmlFile(wxGetApp().GetFullAppPath(wxT("about.htm")));
+        
         wxTextFile file(htmlFile);
         if (file.Exists())
         {
@@ -350,6 +347,11 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     }
 
     // Customize the HTML
+#if 0
+    wxString verString;
+    verString.Printf("%.2f", stVERSION_NUMBER);
+    htmlText.Replace(wxT("$VERSION$"), verString);
+#endif
     htmlText.Replace(wxT("$DATE$"), _T(__DATE__));
 
     wxSize htmlSize(400, 290);

demos/forty/forty.h

@@ -23,17 +23,13 @@ public:
     static const wxColour& BackgroundColour();
     static const wxColour& TextColour();
     static const wxBrush&  BackgroundBrush();
-    const wxString& GetHelpFile() const { return m_helpFile; }
 
 private:
     static wxColour* m_backgroundColour;
     static wxColour* m_textColour;
     static wxBrush*  m_backgroundBrush;
-    wxString m_helpFile;
 };
 
-DECLARE_APP(FortyApp)
-
 class FortyCanvas;
 class FortyFrame: public wxFrame
 {

distrib/msw/copy_src.bat

@@ -584,19 +584,6 @@ copy *.ico \wxmsw_dist\wxMSW\samples\scroll
 copy *.h \wxmsw_dist\wxMSW\samples\scroll
 cd ..
 
-echo Splash sample..
-
-cd splash
-md \wxmsw_dist\wxMSW\samples\splash
-copy Makefile.* \wxmsw_dist\wxMSW\samples\splash
-copy *.cpp \wxmsw_dist\wxMSW\samples\splash
-copy *.h \wxmsw_dist\wxMSW\samples\splash
-copy *.def \wxmsw_dist\wxMSW\samples\splash
-copy *.rc \wxmsw_dist\wxMSW\samples\splash
-copy *.ico \wxmsw_dist\wxMSW\samples\splash
-copy *.png \wxmsw_dist\wxMSW\samples\splash
-cd ..
-
 echo Splitter sample..
 
 cd splitter

distrib/msw/dmc.rsp

@@ -116,7 +116,6 @@ samples/scrollsub/makefile.dmc
 samples/shaped/makefile.dmc
 samples/sockets/makefile.dmc
 samples/sound/makefile.dmc
-samples/splash/makefile.dmc
 samples/splitter/makefile.dmc
 samples/statbar/makefile.dmc
 samples/tab/makefile.dmc

distrib/msw/generic.rsp

@@ -1104,20 +1104,6 @@ samples/shaped/*.txt
 samples/shaped/*.pro
 samples/shaped/*.bkl
 
-samples/splash/*.h
-samples/splash/*.cpp
-samples/splash/*.def
-samples/splash/*.rc
-samples/splash/makefile*
-samples/splash/*.xbm
-samples/splash/*.xpm
-samples/splash/*.txt
-samples/splash/*.ico
-samples/splash/*.bmp
-samples/splash/*.png
-samples/splash/*.pro
-samples/splash/*.bkl
-
 samples/splitter/*.cpp
 samples/splitter/*.h
 samples/splitter/*.def

distrib/msw/makefile.rsp

@@ -64,7 +64,6 @@ samples/scrollsub/Makefile.in
 samples/shaped/Makefile.in
 samples/sound/Makefile.in
 samples/sockets/Makefile.in
-samples/splash/Makefile.in
 samples/splitter/Makefile.in
 samples/statbar/Makefile.in
 samples/taskbar/Makefile.in

distrib/msw/makewinceproj.sh

@@ -89,7 +89,6 @@ bakefile_gen -b ../../samples/scrollsub/scrollsub.bkl -f msevc4prj
 bakefile_gen -b ../../samples/shaped/shaped.bkl -f msevc4prj
 bakefile_gen -b ../../samples/sockets/sockets.bkl -f msevc4prj
 bakefile_gen -b ../../samples/sound/sound.bkl -f msevc4prj
-bakefile_gen -b ../../samples/splash/splash.bkl -f msevc4prj
 bakefile_gen -b ../../samples/splitter/splitter.bkl -f msevc4prj
 bakefile_gen -b ../../samples/statbar/statbar.bkl -f msevc4prj
 bakefile_gen -b ../../samples/tab/tab.bkl -f msevc4prj

distrib/msw/vc.rsp

@@ -227,9 +227,6 @@ samples/sockets/server.dsw
 samples/sound/sound.dsp
 samples/sound/sound.dsw
 
-samples/splash/splash.dsp
-samples/splash/splash.dsw
-
 samples/splitter/splitter.dsp
 samples/splitter/splitter.dsw
 

distrib/msw/wince.rsp

@@ -200,9 +200,6 @@ samples/sockets/server.vcp
 samples/sockets/client.vcw
 samples/sockets/server.vcw
 
-samples/splash/splash.vcp
-samples/splash/splash.vcw
-
 samples/splitter/splitter.vcp
 samples/splitter/splitter.vcw
 

docs/changes.txt

@@ -187,7 +187,6 @@ versions, please update your code to not use them.
 - The wxHIDE_READONLY flag for wxFileDialog was not implemented
   and has now been removed
 - wxTaskBarIcon::OnXXX() virtual methods: use events instead
-- obsolete and not used wxUSE_GENERIC_DIALOGS_IN_MSW has been removed
 
 
 OTHER CHANGES
@@ -221,15 +220,13 @@ All (GUI):
 - added wxKeyEvent::CmdDown() and wxMouseEvent::CmdDown()
 - implemented wxListCtrl::FindItem() for non-MSW (Robin Stoll)
 - added status bar fields styles support (Tim Kosse)
-- added samples/splash
 
 Unix:
 
 - wxTaskBarIcon now supports freedesktop.org System Tray protocol
 - security fixes to wxSingleInstanceChecker
 - wx-config script was modified to allow choosing from multiple installed
-  builds of wxWidgets and to return flags/libs for selected libraries only
-- wx-config has new --version-full option
+  builds of wxWidgets
 
 wxGTK:
 
@@ -261,8 +258,6 @@ wxMSW:
 - wxFileDialog can now be moved and centered (Randall Fox)
 - restored (and improved) possibility to use wx with MFC broken in 2.5.2
 - fixed wxTextCtrl::SetMaxLength for rich edit controls
-- fixed flat style for toolbars under XP, Windows Classic style
-- fixed truncation of transferred data in wxConnection under unicode build
 
 wxUniv/X11:
 

docs/html/index.htm

@@ -142,7 +142,7 @@ by Franky Braem, in PDF format.<P>
 
 <tr>
 <td align=center>
-<a href="wx/wx_contents.html">wxWidgets Reference</a>
+<a href="wx/wx.htm">wxWidgets Reference</a>
 </td>
 
 <td align=center>
@@ -374,7 +374,6 @@ the user to resize subwindows.
 <li><a href="../../samples/scrollsub">scrollsub</a>: demonstrates the use of wxScrolledWindow to scroll
 an embedded window.
 <li><a href="../../samples/sockets">sockets</a>: demonstrates the TCP/IP family of classes.
-<li><a href="../../samples/splash">splash</a>: demonstrates use of the wxSplashScreen class.
 <li><a href="../../samples/splitter">splitter</a>: demonstrates the wxSplitterWindow class.
 <li><a href="../../samples/statbar">statbar</a>: demonstrates the wxStatusBar class.
 <li><a href="../../samples/taskbar">taskbar</a>: demonstrates the wxTaskBarIcon class, for

docs/latex/wx/dropsrc.tex

@@ -96,7 +96,7 @@ wxDragMove}, {\tt wxDragCancel} or {\tt wxDragNone} if an error occured.
 
 \membersection{wxDropSource::GiveFeedback}\label{wxdropsourcegivefeedback}
 
-\func{virtual bool}{GiveFeedback}{\param{wxDragResult }{effect}}
+\func{virtual bool}{GiveFeedback}{\param{wxDragResult }{effect}, \param{bool }{scrolling}}
 
 Overridable: you may give some custom UI feedback during the drag and drop operation
 in this function. It is called on each mouse move, so your implementation must not be too

include/wx/apptrait.h

@@ -24,7 +24,10 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-class GSocketGUIFunctionsTable;
+extern "C"
+{
+    struct GSocketGUIFunctionsTable;
+}
 
 // ----------------------------------------------------------------------------
 // toolkit information

include/wx/arrstr.h

@@ -47,7 +47,6 @@ public:
 
     void Sort(bool reverseOrder = false);
     void Sort(CompareFunction function);
-    void Sort(CMPFUNCwxString function) { wxArrayStringBase::Sort(function); }
 };
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase

include/wx/gsocket.h

@@ -11,6 +11,14 @@
 #ifndef __GSOCKET_H
 #define __GSOCKET_H
 
+/* DFE: Define this and compile gsocket.cpp instead of gsocket.c and
+   compile existing GUI gsock*.c as C++ to try out the new GSocket. */
+/* #define wxUSE_GSOCKET_CPLUSPLUS 1 */
+#undef wxUSE_GSOCKET_CPLUSPLUS
+#if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS)
+#error "You need to compile this file (probably a GUI gsock peice) as C++"
+#endif
+
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
 #include "wx/platform.h"
@@ -36,12 +44,17 @@
 #include <stdlib.h>
 #endif
 
-class GSocket;
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+typedef class GSocketBSD GSocket;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
+typedef struct _GSocket GSocket;
+#endif
 typedef struct _GAddress GAddress;
 
 typedef enum {
@@ -95,22 +108,26 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
 
 /* Functions tables for internal use by GSocket code: */
 
-/* Actually this is a misnomer now, but reusing this name means I don't
-   have to ifdef app traits or common socket code */
-class GSocketGUIFunctionsTable
-{
-public:
-    virtual bool OnInit() = 0;
-    virtual void OnExit() = 0;
-    virtual bool CanUseEventLoop() = 0;
-    virtual bool Init_Socket(GSocket *socket) = 0;
-    virtual void Destroy_Socket(GSocket *socket) = 0;
 #ifndef __WINDOWS__
-    virtual void Install_Callback(GSocket *socket, GSocketEvent event) = 0;
-    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event) = 0;
+struct GSocketBaseFunctionsTable
+{
+    void (*Detected_Read)(GSocket *socket);
+    void (*Detected_Write)(GSocket *socket);
+};
 #endif
-    virtual void Enable_Events(GSocket *socket) = 0;
-    virtual void Disable_Events(GSocket *socket) = 0;
+
+struct GSocketGUIFunctionsTable
+{
+    int  (*GUI_Init)(void);
+    void (*GUI_Cleanup)(void);
+    int  (*GUI_Init_Socket)(GSocket *socket);
+    void (*GUI_Destroy_Socket)(GSocket *socket);
+#ifndef __WINDOWS__
+    void (*Install_Callback)(GSocket *socket, GSocketEvent event);
+    void (*Uninstall_Callback)(GSocket *socket, GSocketEvent event);
+#endif
+    void (*Enable_Events)(GSocket *socket);
+    void (*Disable_Events)(GSocket *socket);
 };
 
 
@@ -118,7 +135,7 @@ public:
 
 /* Sets GUI functions callbacks. Must be called *before* GSocket_Init
    if the app uses async sockets. */
-void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc);
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
 
 /* GSocket_Init() must be called at the beginning */
 int GSocket_Init(void);
@@ -130,6 +147,211 @@ void GSocket_Cleanup(void);
 /* Constructors / Destructors */
 
 GSocket *GSocket_new(void);
+void GSocket_destroy(GSocket *socket);
+
+
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
+
+/* GSocket_Shutdown:
+ *  Disallow further read/write operations on this socket, close
+ *  the fd and disable all callbacks.
+ */
+void GSocket_Shutdown(GSocket *socket);
+
+/* Address handling */
+
+/* GSocket_SetLocal:
+ * GSocket_GetLocal:
+ * GSocket_SetPeer:
+ * GSocket_GetPeer:
+ *  Set or get the local or peer address for this socket. The 'set'
+ *  functions return GSOCK_NOERROR on success, an error code otherwise.
+ *  The 'get' functions return a pointer to a GAddress object on success,
+ *  or NULL otherwise, in which case they set the error code of the
+ *  corresponding GSocket.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is not valid.
+ *    GSOCK_INVADDR - the address is not valid.
+ */
+GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address);
+GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address);
+GAddress *GSocket_GetLocal(GSocket *socket);
+GAddress *GSocket_GetPeer(GSocket *socket);
+
+/* Server specific parts */
+
+/* GSocket_SetServer:
+ *  Sets up this socket as a server. The local address must have been
+ *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
+ *  Returns GSOCK_NOERROR on success, one of the following otherwise:
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is in use.
+ *    GSOCK_INVADDR - the local address has not been set.
+ *    GSOCK_IOERR   - low-level error.
+ */
+GSocketError GSocket_SetServer(GSocket *socket);
+
+/* GSocket_WaitConnection:
+ *  Waits for an incoming client connection. Returns a pointer to
+ *  a GSocket object, or NULL if there was an error, in which case
+ *  the last error field will be updated for the calling GSocket.
+ *
+ *  Error codes (set in the calling GSocket)
+ *    GSOCK_INVSOCK    - the socket is not valid or not a server.
+ *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
+ *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
+ *    GSOCK_MEMERR     - couldn't allocate memory.
+ *    GSOCK_IOERR      - low-level error.
+ */
+GSocket *GSocket_WaitConnection(GSocket *socket);
+
+
+/* Client specific parts */
+
+/* GSocket_Connect:
+ *  For stream (connection oriented) sockets, GSocket_Connect() tries
+ *  to establish a client connection to a server using the peer address
+ *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
+ *  connection has been succesfully established, or one of the error
+ *  codes listed below. Note that for nonblocking sockets, a return
+ *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
+ *  request can be completed later; you should use GSocket_Select()
+ *  to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the
+ *  corresponding asynchronous events.
+ *
+ *  For datagram (non connection oriented) sockets, GSocket_Connect()
+ *  just sets the peer address established with GSocket_SetPeer() as
+ *  default destination.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK    - the socket is in use or not valid.
+ *    GSOCK_INVADDR    - the peer address has not been established.
+ *    GSOCK_TIMEDOUT   - timeout, the connection failed.
+ *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
+ *    GSOCK_MEMERR     - couldn't allocate memory.
+ *    GSOCK_IOERR      - low-level error.
+ */
+GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream);
+
+/* GSocket_SetReusable:
+*  Simply sets the m_resuable flag on the socket. GSocket_SetServer will
+*  make the appropriate setsockopt() call.
+*  Implemented as a GSocket function because clients (ie, wxSocketServer)
+*  don't have access to the GSocket struct information.
+*  Returns TRUE if the flag was set correctly, FALSE if an error occured
+*  (ie, if the parameter was NULL)
+*/
+int GSocket_SetReusable(GSocket *socket);
+
+/* Datagram sockets */
+
+/* GSocket_SetNonOriented:
+ *  Sets up this socket as a non-connection oriented (datagram) socket.
+ *  Before using this function, the local address must have been set
+ *  with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
+ *  on success, or one of the following otherwise.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is in use.
+ *    GSOCK_INVADDR - the local address has not been set.
+ *    GSOCK_IOERR   - low-level error.
+ */
+GSocketError GSocket_SetNonOriented(GSocket *socket);
+
+
+/* Generic IO */
+
+/* Like recv(), send(), ... */
+
+/* For datagram sockets, the incoming / outgoing addresses
+ * are stored as / read from the 'peer' address field.
+ */
+int GSocket_Read(GSocket *socket, char *buffer, int size);
+int GSocket_Write(GSocket *socket, const char *buffer,
+                  int size);
+
+/* GSocket_Select:
+ *  Polls the socket to determine its status. This function will
+ *  check for the events specified in the 'flags' parameter, and
+ *  it will return a mask indicating which operations can be
+ *  performed. This function won't block, regardless of the
+ *  mode (blocking | nonblocking) of the socket.
+ */
+GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags);
+
+GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
+                                void *optval, int *optlen);
+
+GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, 
+                                const void *optval, int optlen);
+
+/* Attributes */
+
+/* GSocket_SetNonBlocking:
+ *  Sets the socket to non-blocking mode. All IO calls will return
+ *  immediately.
+ */
+void GSocket_SetNonBlocking(GSocket *socket, int non_block);
+
+/* GSocket_SetTimeout:
+ *  Sets the timeout for blocking calls. Time is expressed in
+ *  milliseconds.
+ */
+void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
+
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
+
+/* GSocket_GetError:
+ *  Returns the last error occured for this socket. Note that successful
+ *  operations do not clear this back to GSOCK_NOERROR, so use it only
+ *  after an error.
+ */
+GSocketError WXDLLIMPEXP_NET GSocket_GetError(GSocket *socket);
+
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
+
+/* Callbacks */
+
+/* GSOCK_INPUT:
+ *   There is data to be read in the input buffer. If, after a read
+ *   operation, there is still data available, the callback function will
+ *   be called again.
+ * GSOCK_OUTPUT:
+ *   The socket is available for writing. That is, the next write call
+ *   won't block. This event is generated only once, when the connection is
+ *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
+ *   when the output buffer empties again. This means that the app should
+ *   assume that it can write since the first OUTPUT event, and no more
+ *   OUTPUT events will be generated unless an error occurs.
+ * GSOCK_CONNECTION:
+ *   Connection succesfully established, for client sockets, or incoming
+ *   client connection, for server sockets. Wait for this event (also watch
+ *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
+ * GSOCK_LOST:
+ *   The connection is lost (or a connection request failed); this could
+ *   be due to a failure, or due to the peer closing it gracefully.
+ */
+
+/* GSocket_SetCallback:
+ *  Enables the callbacks specified by 'flags'. Note that 'flags'
+ *  may be a combination of flags OR'ed toghether, so the same
+ *  callback function can be made to accept different events.
+ *  The callback function must have the following prototype:
+ *
+ *  void function(GSocket *socket, GSocketEvent event, char *cdata)
+ */
+void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
+                         GSocketCallback fallback, char *cdata);
+
+/* GSocket_UnsetCallback:
+ *  Disables all callbacks specified by 'flags', which may be a
+ *  combination of flags OR'ed toghether.
+ */
+void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
+
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 
 /* GAddress */
@@ -168,13 +390,9 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 }
 #endif /* __cplusplus */
 
-# if defined(__WINDOWS__)
-#  include "wx/msw/gsockmsw.h"
-# elif defined(__WXMAC__) && !defined(__DARWIN__)
-#  include "wx/mac/gsockmac.h"
-# else
-#  include "wx/unix/gsockunx.h"
-# endif
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+#include "wx/unix/gsockunx.h"
+#endif
 
 #endif    /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 

include/wx/html/htmlwin.h

@@ -130,9 +130,6 @@ public:
     void SetFonts(wxString normal_face, wxString fixed_face,
                   const int *sizes = NULL);
 
-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
-    
     // Sets space between text and window borders.
     void SetBorders(int b) {m_Borders = b;}
 

include/wx/html/htmprint.h

@@ -59,9 +59,6 @@ public:
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL);
 
-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
-
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell
     // to is y-coordinate of the next following page break, if any
@@ -145,9 +142,6 @@ public:
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL);
 
-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
-
     void SetMargins(float top = 25.2, float bottom = 25.2, float left = 25.2, float right = 25.2, 
                     float spaces = 5);
             // sets margins in milimeters. Defaults to 1 inch for margins and 0.5cm for space
@@ -243,9 +237,6 @@ public:
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 
-    void NormalizeFontSizes(int size=-1);
-    // Sets font sizes to be relative to the given size or the system default size
-    
     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
             // return page setting data objects. 

include/wx/html/winpars.h

@@ -72,9 +72,6 @@ public:
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL);
 
-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
-    
     // Adds tags module. see wxHtmlTagsModule for details.
     static void AddModule(wxHtmlTagsModule *module);
 

include/wx/listctrl.h

@@ -16,8 +16,6 @@
     #pragma interface "listctrlbase.h"
 #endif
 
-#include "wx/defs.h" // headers should include this before first wxUSE_XXX check
-
 #if wxUSE_LISTCTRL
 
 #include "wx/listbase.h"

include/wx/mac/carbon/combobox.h

@@ -21,11 +21,6 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 
-// forward declaration of private implementation classes
-
-class wxComboBoxText ;
-class wxComboBoxChoice ;
-
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 {
@@ -133,8 +128,8 @@ protected:
     void FreeData();
 
     // the subcontrols
-    wxComboBoxText*     m_text;
-    wxComboBoxChoice*   m_choice;
+    wxTextCtrl*     m_text;
+    wxChoice*       m_choice;
 };
 
 #endif

include/wx/mac/carbon/gsockmac.h

@@ -21,86 +21,35 @@
 #include "gsocket.h"
 #endif
 
-#include <MacHeaders.c>
-#define OTUNIXERRORS 1
-#include <OpenTransport.h>
-#include <OpenTransportProviders.h>
-#include <OpenTptInternet.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef GSocket* GSocketPtr ;
 
 /* Definition of GSocket */
-class GSocket
+struct _GSocket
 {
-public:
-    GSocket();
-    ~GSocket();
-    bool IsOK() { return m_ok; }
-
-    void Shutdown();
-    GSocketError SetLocal(GAddress *address);
-    GSocketError SetPeer(GAddress *address);
-    GAddress *GetLocal();
-    GAddress *GetPeer();
-    GSocketError SetServer();
-    GSocket *WaitConnection();
-    bool SetReusable() { return false; }
-    GSocketError SetNonOriented();
-    GSocketError Connect(GSocketStream stream);
-    int Read(char *buffer, int size);
-    int Write(const char *buffer, int size);
-    GSocketEventFlags Select(GSocketEventFlags flags);
-    void SetNonBlocking(bool non_block);
-    void SetTimeout(unsigned long millisec);
-    GSocketError WXDLLIMPEXP_NET GetError();
-    void SetCallback(GSocketEventFlags flags,
-        GSocketCallback callback, char *cdata);
-    void UnsetCallback(GSocketEventFlags flags);
-    GSocketError GetSockOpt(int level, int optname, void *optval, int *optlen)
-    {   return GSOCK_INVOP; }
-    GSocketError SetSockOpt(int level, int optname,
-        const void *optval, int optlen)
-    {   return GSOCK_INVOP; }
-
-protected:
-    bool m_ok;
-
-    /* Input / Output */
-    GSocketError Input_Timeout();
-    GSocketError Output_Timeout();
-    int Recv_Stream(char *buffer, int size);
-    int Recv_Dgram(char *buffer, int size);
-    int Send_Stream(const char *buffer, int size);
-    int Send_Dgram(const char *buffer, int size);
-    
-    /* Callbacks */
-    void Enable_Events();
-    void Disable_Events();
-
-// TODO: Make these protected
-public:
   wxMacNotifierTableRef m_mac_events ;
   EndpointRef m_endpoint;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
 
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_oriented;
   unsigned long m_timeout;
 
   /* Callbacks */
   GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
-  bool m_takesEvents ;
+  int m_takesEvents ;
 };
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Definition of GAddress */
 
 struct _GAddress
@@ -111,8 +60,19 @@ struct _GAddress
   GSocketError m_error;
 };
 
+/* Input / Output */
+
+GSocketError _GSocket_Input_Timeout(GSocket *socket);
+GSocketError _GSocket_Output_Timeout(GSocket *socket);
+int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
+int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
+int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
+int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
+
 /* Callbacks */
 
+void _GSocket_Enable_Events(GSocket *socket);
+void _GSocket_Disable_Events(GSocket *socket);
 void _GSocket_Internal_Proc(unsigned long e , void* data ) ;
 
 /* GAddress */

include/wx/mac/carbon/listbox.h

@@ -125,10 +125,6 @@ public:
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
-    
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
     // Windows callbacks
 #if !__WXMAC_OSX__
     void OnChar(wxKeyEvent& event);

include/wx/msw/control.h

@@ -65,8 +65,8 @@ public:
 #endif // Win95
 
     // For ownerdraw items
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
-    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
@@ -82,12 +82,6 @@ protected:
     // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
 
-    // This is a helper for all wxControls made with UPDOWN native control.
-    // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
-    // WinCE of Smartphones this happens also for native wxTextCtrl,
-    // wxChoice and others.
-    virtual wxSize GetBestSpinerSize(const bool is_vertical) const;
-
     // create the control of the given Windows class: this is typically called
     // from Create() method of the derived class passing its label, pos and
     // size parameter (style parameter is not needed because m_windowStyle is
@@ -104,7 +98,7 @@ protected:
     //
     // create the control of the given class with the given style (combination
     // of WS_XXX flags, i.e. Windows style, not wxWidgets one), returns
-    // false if creation failed
+    // FALSE if creation failed
     //
     // All parameters except classname and style are optional, if the
     // size/position are not given, they should be set later with SetSize()
@@ -128,6 +122,7 @@ protected:
     static wxVisualAttributes
         GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
 
+
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
@@ -137,4 +132,5 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // _WX_CONTROL_H_
+#endif
+    // _WX_CONTROL_H_

include/wx/msw/filedlg.h

@@ -38,12 +38,9 @@ public:
     virtual int ShowModal();
 
 protected:
-
-#ifndef __SMARTPHONE__
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
-#endif // __SMARTPHONE__
 
 private:
     wxArrayString m_fileNames;

include/wx/msw/gsockmsw.h

@@ -21,74 +21,35 @@
 #include "gsocket.h"
 #endif
 
-#include "wx/msw/wrapwin.h"
+#include <windows.h>
+#include <winsock.h>
 
-class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
-{
-public:
-    virtual bool OnInit();
-    virtual void OnExit();
-    virtual bool CanUseEventLoop();
-    virtual bool Init_Socket(GSocket *socket);
-    virtual void Destroy_Socket(GSocket *socket);
-    virtual void Enable_Events(GSocket *socket);
-    virtual void Disable_Events(GSocket *socket);
-};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
 
 /* Definition of GSocket */
-class GSocket
+struct _GSocket
 {
-public:
-  GSocket();
-  ~GSocket();
-  bool IsOk() { return m_ok; }
-  void Close();
-  void Shutdown();
-  GSocketError SetLocal(GAddress *address);
-  GSocketError SetPeer(GAddress *address);
-  GAddress *GetLocal();
-  GAddress *GetPeer();
-  GSocketError SetServer();
-  GSocket *WaitConnection();
-  bool SetReusable();
-  GSocketError Connect(GSocketStream stream);
-  GSocketError SetNonOriented();
-  int Read(char *buffer, int size);
-  int Write(const char *buffer, int size);
-  GSocketEventFlags Select(GSocketEventFlags flags);
-  void SetNonBlocking(bool non_block);
-  void SetTimeout(unsigned long millis);
-  GSocketError WXDLLIMPEXP_NET GetError();
-  void SetCallback(GSocketEventFlags flags,
-    GSocketCallback callback, char *cdata);
-  void UnsetCallback(GSocketEventFlags flags);
-  GSocketError GetSockOpt(int level, int optname,
-    void *optval, int *optlen);
-  GSocketError SetSockOpt(int level, int optname,
-    const void *optval, int optlen);
-protected:
-  GSocketError Input_Timeout();
-  GSocketError Output_Timeout();
-  GSocketError Connect_Timeout();
-  int Recv_Stream(char *buffer, int size);
-  int Recv_Dgram(char *buffer, int size);
-  int Send_Stream(const char *buffer, int size);
-  int Send_Dgram(const char *buffer, int size);
-  bool m_ok;
-
-/* TODO: Make these protected */
-public:
   SOCKET m_fd;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
 
   /* Attributes */
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_establishing;
-  bool m_reusable;
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_establishing;
+  int m_reusable;
   struct timeval m_timeout;
 
   /* Callbacks */
@@ -98,10 +59,6 @@ public:
   int m_msgnumber;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Definition of GAddress */
 struct _GAddress
 {
@@ -114,6 +71,27 @@ struct _GAddress
   GSocketError m_error;
 };
 
+/* Input / output */
+
+GSocketError _GSocket_Input_Timeout(GSocket *socket);
+GSocketError _GSocket_Output_Timeout(GSocket *socket);
+GSocketError _GSocket_Connect_Timeout(GSocket *socket);
+int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
+int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
+int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
+int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
+
+/* Callbacks */
+
+int  _GSocket_GUI_Init(void);
+void _GSocket_GUI_Cleanup(void);
+int  _GSocket_GUI_Init_Socket(GSocket *socket);
+void _GSocket_GUI_Destroy_Socket(GSocket *socket);
+
+LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+
+void _GSocket_Enable_Events(GSocket *socket);
+void _GSocket_Disable_Events(GSocket *socket);
 
 /* GAddress */
 

include/wx/msw/setup0.h

@@ -671,6 +671,15 @@
 // common dialogs
 // ----------------------------------------------------------------------------
 
+// Define 1 to use generic dialogs in Windows, even though they duplicate
+// native common dialog (e.g. wxColourDialog). This is mainly useful for
+// testing.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
+
 // On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
 // file selector, printer dialog). Switching this off also switches off the
 // printing architecture and interactive wxPrinterDC.

include/wx/msw/setup_microwin.h

@@ -574,6 +574,15 @@
 // common dialogs
 // ----------------------------------------------------------------------------
 
+// Define 1 to use generic dialogs in Windows, even though they duplicate
+// native common dialog (e.g. wxColourDialog). This is mainly useful for
+// testing.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
+
 // On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
 // file selector, printer dialog). Switching this off also switches off the
 // printing architecture and interactive wxPrinterDC.

include/wx/msw/spinbutt.h

@@ -19,8 +19,6 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
-#if wxUSE_SPINBTN
-
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
 public:
@@ -28,7 +26,7 @@ public:
     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
+                 wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -40,7 +38,7 @@ public:
     virtual ~wxSpinButton();
 
     bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
+                wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -59,7 +57,7 @@ public:
                              WXWORD pos, WXHWND control);
 
     // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
    virtual wxSize DoGetBestSize() const;
@@ -68,6 +66,5 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
 };
 
-#endif // wxUSE_SPINBTN
-
-#endif // _WX_SPINBUTT_H_
+#endif
+    // _WX_SPINBUTT_H_

include/wx/msw/wince/setup.h

@@ -664,6 +664,15 @@
 // common dialogs
 // ----------------------------------------------------------------------------
 
+// Define 1 to use generic dialogs in Windows, even though they duplicate
+// native common dialog (e.g. wxColourDialog). This is mainly useful for
+// testing.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
+
 // On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
 // file selector, printer dialog). Switching this off also switches off the
 // printing architecture and interactive wxPrinterDC.

include/wx/platform.h

@@ -204,10 +204,7 @@
 #elif defined(__DMC__) || defined(__WATCOMC__)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 1
-#elif defined(__MINGW32__)
-#    undef wxUSE_IOSTREAMH
-#    define wxUSE_IOSTREAMH 0
-#endif /* compilers with/without iostream.h */
+#endif /* compilers not supporting iostream.h */
 
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace

include/wx/socket.h

@@ -118,7 +118,7 @@ public:
   inline bool IsData() { return WaitForRead(0, 0); };
   inline bool IsDisconnected() const { return !IsConnected(); };
   inline wxUint32 LastCount() const { return m_lcount; }
-  inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
+  inline wxSocketError LastError() const { return (wxSocketError)GSocket_GetError(m_socket); }
   void SaveState();
   void RestoreState();
 

include/wx/univ/bmpbuttn.h

@@ -49,9 +49,9 @@ public:
         wxBitmapButtonBase::SetMargins(x, y);
     }
 
-    virtual bool Enable(bool enable = true);
+    virtual bool Enable(bool enable = TRUE);
 
-    virtual bool SetCurrent(bool doit = true);
+    virtual bool SetCurrent(bool doit = TRUE);
 
     virtual void Press();
     virtual void Release();
@@ -64,7 +64,7 @@ protected:
     virtual void OnSetBitmap();
 
     // set bitmap to the given one if it's ok or to m_bmpNormal and return
-    // true if the bitmap really changed
+    // TRUE if the bitmap really changed
     bool ChangeBitmap(const wxBitmap& bmp);
 
 private:

include/wx/univ/button.h

@@ -113,7 +113,7 @@ protected:
     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 
-    virtual bool CanBeHighlighted() const { return true; }
+    virtual bool CanBeHighlighted() const { return TRUE; }
 
     // common part of all ctors
     void Init();

include/wx/univ/checkbox.h

@@ -22,8 +22,8 @@
 // the actions supported by wxCheckBox
 // ----------------------------------------------------------------------------
 
-#define wxACTION_CHECKBOX_CHECK   _T("check")   // SetValue(true)
-#define wxACTION_CHECKBOX_CLEAR   _T("clear")   // SetValue(false)
+#define wxACTION_CHECKBOX_CHECK   _T("check")   // SetValue(TRUE)
+#define wxACTION_CHECKBOX_CLEAR   _T("clear")   // SetValue(FALSE)
 #define wxACTION_CHECKBOX_TOGGLE  _T("toggle")  // toggle the check state
 
 // additionally it accepts wxACTION_BUTTON_PRESS and RELEASE
@@ -101,7 +101,7 @@ public:
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 
-    virtual bool HasTransparentBackground() { return true; }
+    virtual bool HasTransparentBackground() { return TRUE; }
     
 protected:
     virtual bool PerformAction(const wxControlAction& action,
@@ -110,7 +110,7 @@ protected:
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxSize DoGetBestClientSize() const;
 
-    virtual bool CanBeHighlighted() const { return true; }
+    virtual bool CanBeHighlighted() const { return TRUE; }
 
     // get the size of the bitmap using either the current one or the default
     // one (query renderer then)

include/wx/univ/checklst.h

@@ -75,7 +75,7 @@ public:
 
     // implement check list box methods
     virtual bool IsChecked(size_t item) const;
-    virtual void Check(size_t item, bool check = true);
+    virtual void Check(size_t item, bool check = TRUE);
 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,

include/wx/univ/combobox.h

@@ -77,7 +77,7 @@ public:
     // called before showing the control to set the initial selection - notice
     // that the text passed to this method might not correspond to any valid
     // item (if the user edited it directly), in which case the method should
-    // just return false but not emit any errors
+    // just return FALSE but not emit any errors
     virtual bool SetSelection(const wxString& value) = 0;
 
     // called immediately after the control is shown
@@ -137,7 +137,7 @@ public:
     void ShowPopup();
     void HidePopup();
 
-    // return true if the popup is currently shown
+    // return TRUE if the popup is currently shown
     bool IsPopupShown() const { return m_isPopupShown; }
 
     // get the popup window containing the popup control
@@ -159,8 +159,8 @@ public:
     virtual void OnDismiss();
 
     // forward these functions to all subcontrols
-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
+    virtual bool Enable(bool enable = TRUE);
+    virtual bool Show(bool show = TRUE);
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );

include/wx/univ/dialog.h

@@ -49,16 +49,16 @@ public:
     // is the dialog in modal state right now?
     virtual bool IsModal() const;
 
-    // For now, same as Show(true) but returns return code
+    // For now, same as Show(TRUE) but returns return code
     virtual int ShowModal();
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
-    // returns true if we're in a modal loop
+    // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
-    bool Show(bool show = true);
+    bool Show(bool show = TRUE);
 
     // implementation only from now on
     // -------------------------------

include/wx/univ/frame.h

@@ -44,7 +44,7 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual wxPoint GetClientAreaOrigin() const;
-    virtual bool Enable(bool enable = true);
+    virtual bool Enable(bool enable = TRUE);
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number = 1,
@@ -56,7 +56,7 @@ public:
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = wxID_ANY,
+                                     wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR

include/wx/univ/inphand.h

@@ -47,8 +47,8 @@
 class WXDLLEXPORT wxInputHandler : public wxObject
 {
 public:
-    // map a keyboard event to one or more actions (pressed == true if the key
-    // was pressed, false if released), returns true if something was done
+    // map a keyboard event to one or more actions (pressed == TRUE if the key
+    // was pressed, FALSE if released), returns TRUE if something was done
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed) = 0;
@@ -67,12 +67,12 @@ public:
     // HandleMouseMove() as the mouse maybe over the control without it having
     // focus
     //
-    // return true to refresh the control, false otherwise
+    // return TRUE to refresh the control, FALSE otherwise
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
 
     // react to the app getting/losing activation
     //
-    // return true to refresh the control, false otherwise
+    // return TRUE to refresh the control, FALSE otherwise
     virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
 
     // virtual dtor for any base class
@@ -94,23 +94,23 @@ public:
                            bool pressed)
     {
         return m_handler ? m_handler->HandleKey(consumer, event, pressed)
-                         : false;
+                         : FALSE;
     }
 
     virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event)
     {
-        return m_handler ? m_handler->HandleMouse(consumer, event) : false;
+        return m_handler ? m_handler->HandleMouse(consumer, event) : FALSE;
     }
 
     virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event)
     {
-        return m_handler ? m_handler->HandleMouseMove(consumer, event) : false;
+        return m_handler ? m_handler->HandleMouseMove(consumer, event) : FALSE;
     }
 
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event)
     {
-        return m_handler ? m_handler->HandleFocus(consumer, event) : false;
+        return m_handler ? m_handler->HandleFocus(consumer, event) : FALSE;
     }
 
 private:

include/wx/univ/listbox.h

@@ -110,7 +110,7 @@ public:
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
-    virtual void SetSelection(int n, bool select = true);
+    virtual void SetSelection(int n, bool select = TRUE);
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
@@ -147,10 +147,10 @@ public:
     void Activate(int item = -1);
 
     // select or unselect the specified or current (if -1) item
-    void DoSelect(int item = -1, bool sel = true);
+    void DoSelect(int item = -1, bool sel = TRUE);
 
     // more readable wrapper
-    void DoUnselect(int item) { DoSelect(item, false); }
+    void DoUnselect(int item) { DoSelect(item, FALSE); }
 
     // select an item and send a notification about it
     void SelectAndNotify(int item);
@@ -159,10 +159,10 @@ public:
     virtual void EnsureVisible(int n);
 
     // find the first item [strictly] after the current one which starts with
-    // the given string and make it the current one, return true if the current
+    // the given string and make it the current one, return TRUE if the current
     // item changed
-    bool FindItem(const wxString& prefix, bool strictlyAfter = false);
-    bool FindNextItem(const wxString& prefix) { return FindItem(prefix, true); }
+    bool FindItem(const wxString& prefix, bool strictlyAfter = FALSE);
+    bool FindNextItem(const wxString& prefix) { return FindItem(prefix, TRUE); }
 
     // extend the selection to span the range from the anchor (see below) to
     // the specified or current item
@@ -306,11 +306,11 @@ class WXDLLEXPORT wxStdListboxInputHandler : public wxStdInputHandler
 {
 public:
     // if pressing the mouse button in a multiselection listbox should toggle
-    // the item under mouse immediately, then specify true as the second
+    // the item under mouse immediately, then specify TRUE as the second
     // parameter (this is the standard behaviour, under GTK the item is toggled
     // only when the mouse is released in the multi selection listbox)
     wxStdListboxInputHandler(wxInputHandler *inphand,
-                             bool toggleOnPressAlways = true);
+                             bool toggleOnPressAlways = TRUE);
 
     // base class methods
     virtual bool HandleKey(wxInputConsumer *consumer,
@@ -328,7 +328,7 @@ protected:
 
     // parts of HitTest(): first finds the pseudo (because not in range) index
     // of the item and the second one adjusts it if necessary - that is if the
-    // third one returns false
+    // third one returns FALSE
     int HitTestUnsafe(const wxListBox *listbox, const wxMouseEvent& event);
     int FixItemIndex(const wxListBox *listbox, int item);
     bool IsValidIndex(const wxListBox *listbox, int item);

include/wx/univ/menu.h

@@ -54,7 +54,7 @@ public:
     // show this menu at the given position (in screen coords) and optionally
     // select its first item
     void Popup(const wxPoint& pos, const wxSize& size,
-               bool selectFirst = true);
+               bool selectFirst = TRUE);
 
     // dismiss the menu
     void Dismiss();
@@ -65,11 +65,11 @@ public:
 
     // implementation only from here
 
-    // do as if this item were clicked, return true if the resulting event was
-    // processed, false otherwise
+    // do as if this item were clicked, return TRUE if the resulting event was
+    // processed, FALSE otherwise
     bool ClickItem(wxMenuItem *item);
 
-    // process the key event, return true if done
+    // process the key event, return TRUE if done
     bool ProcessKeyDown(int key);
 
 #if wxUSE_ACCEL
@@ -167,8 +167,8 @@ public:
     // get the next item for the givan accel letter (used by wxFrame), return
     // -1 if none
     //
-    // if unique is not NULL, filled with true if there is only one item with
-    // this accel, false if two or more
+    // if unique is not NULL, filled with TRUE if there is only one item with
+    // this accel, FALSE if two or more
     int FindNextItemForAccel(int idxStart,
                              int keycode,
                              bool *unique = NULL) const;
@@ -183,7 +183,7 @@ public:
 #endif // wxUSE_ACCEL
 
     // called by wxMenu when it is dismissed
-    void OnDismissMenu(bool dismissMenuBar = false);
+    void OnDismissMenu(bool dismissMenuBar = FALSE);
 
 protected:
     // common part of all ctors
@@ -195,7 +195,7 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
     void OnKillFocus(wxFocusEvent& event);
 
-    // process the mouse move event, return true if we did, false to continue
+    // process the mouse move event, return TRUE if we did, FALSE to continue
     // processing as usual
     //
     // the coordinates are client coordinates of menubar, convert if necessary
@@ -236,7 +236,7 @@ protected:
     void DoSelectMenu(size_t pos);
 
     // popup the currently selected menu
-    void PopupCurrentMenu(bool selectFirst = true);
+    void PopupCurrentMenu(bool selectFirst = TRUE);
 
     // hide the currently selected menu
     void DismissMenu();

include/wx/univ/menuitem.h

@@ -36,8 +36,8 @@ public:
     virtual void SetText(const wxString& text);
     virtual void SetCheckable(bool checkable);
 
-    virtual void Enable(bool enable = true);
-    virtual void Check(bool check = true);
+    virtual void Enable(bool enable = TRUE);
+    virtual void Check(bool check = TRUE);
 
     // we add some extra functions which are also available under MSW from
     // wxOwnerDrawn class - they will be moved to wxMenuItemBase later
@@ -45,7 +45,7 @@ public:
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); }
-    const wxBitmap& GetBitmap(bool checked = true) const
+    const wxBitmap& GetBitmap(bool checked = TRUE) const
       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 
     void SetDisabledBitmap( const wxBitmap& bmpDisabled )
@@ -76,14 +76,14 @@ public:
 
     wxCoord GetPosition() const
     {
-        wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_posY != -1, _T("must call SetHeight first!") );
 
         return m_posY;
     }
 
     wxCoord GetHeight() const
     {
-        wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_height != -1, _T("must call SetHeight first!") );
 
         return m_height;
     }
@@ -102,7 +102,7 @@ protected:
 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all
-    // but first radio group items (m_isRadioGroupStart == false), end is valid
+    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
     // only for the first one
     union
     {

include/wx/univ/notebook.h

@@ -87,19 +87,19 @@ public:
     virtual bool InsertPage(size_t nPage,
                             wxNotebookPage *pPage,
                             const wxString& strText,
-                            bool bSelect = false,
+                            bool bSelect = FALSE,
                             int imageId = -1);
 
     // style tests
     // -----------
 
-    // return true if all tabs have the same width
+    // return TRUE if all tabs have the same width
     bool FixedSizeTabs() const { return HasFlag(wxNB_FIXEDWIDTH); }
 
     // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
     wxDirection GetTabOrientation() const;
 
-    // return true if the notebook has tabs at the sidesand not at the top (or
+    // return TRUE if the notebook has tabs at the sidesand not at the top (or
     // bottom) as usual
     bool IsVertical() const;
 
@@ -155,7 +155,7 @@ protected:
     void PositionSpinBtn();
 
     // refresh the given tab only
-    void RefreshTab(int page, bool forceSelected = false);
+    void RefreshTab(int page, bool forceSelected = FALSE);
 
     // refresh all tabs
     void RefreshAllTabs();
@@ -180,7 +180,7 @@ protected:
     wxCoord GetTabWidth(int page) const
         { return FixedSizeTabs() ? m_widthMax : m_widths[page]; }
 
-    // return true if the tab has an associated image
+    // return TRUE if the tab has an associated image
     bool HasImage(int page) const
         { return m_imageList && m_images[page] != -1; }
 

include/wx/univ/radiobox.h

@@ -95,12 +95,12 @@ public:
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
 
-    virtual void Enable(int n, bool enable = true);
-    virtual void Show(int n, bool show = true);
+    virtual void Enable(int n, bool enable = TRUE);
+    virtual void Show(int n, bool show = TRUE);
 
     // we also override the wxControl methods to avoid virtual function hiding
-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
+    virtual bool Enable(bool enable = TRUE);
+    virtual bool Show(bool show = TRUE);
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label);
 

include/wx/univ/renderer.h

@@ -84,7 +84,7 @@ public:
                                 const wxRect& rect,
                                 int flags )
         { DrawBackground( dc, col, rect, flags ); }
-
+                                
 
     // draw the label inside the given rectangle with the specified alignment
     // and optionally emphasize the character with the given index
@@ -897,7 +897,7 @@ private:
     // common part of DrawItems() and DrawCheckItems()
     void DoDrawItems(const wxListBox *listbox,
                      size_t itemFirst, size_t itemLast,
-                     bool isCheckLbox = false);
+                     bool isCheckLbox = FALSE);
 
     wxWindow *m_window;
     wxRenderer *m_renderer;