extracted wxWrapSizer in separate files and somewhat improved it (heavily modified patch 1876663)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-08 22:45:44 +00:00
parent eed04c9999
commit 13a3888794
25 changed files with 4162 additions and 55 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -741,6 +741,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/valtext.cpp
    src/common/wincmn.cpp
    src/common/windowid.cpp
+    src/common/wrapsizer.cpp
    src/common/xpmdecod.cpp
    src/generic/busyinfo.cpp
    src/generic/buttonbar.cpp
@@ -863,6 +864,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/valtext.h
    wx/window.h
    wx/windowid.h
+    wx/wrapsizer.h
    wx/wupdlock.h

    wx/accel.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1672,6 +1672,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
+	$(OBJS)\monodll_wrapsizer.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -1903,6 +1904,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
+	$(OBJS)\monodll_wrapsizer.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2320,6 +2322,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
+	$(OBJS)\monolib_wrapsizer.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2551,6 +2554,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
+	$(OBJS)\monolib_wrapsizer.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2883,6 +2887,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
+	$(OBJS)\coredll_wrapsizer.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3114,6 +3119,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
+	$(OBJS)\coredll_wrapsizer.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3348,6 +3354,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
+	$(OBJS)\corelib_wrapsizer.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -3579,6 +3586,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
+	$(OBJS)\corelib_wrapsizer.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -7024,6 +7032,11 @@ $(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -9156,6 +9169,11 @@ $(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -11342,6 +11360,11 @@ $(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -12668,6 +12691,11 @@ $(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1689,6 +1689,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.o \
 	$(OBJS)\monodll_wincmn.o \
 	$(OBJS)\monodll_windowid.o \
+	$(OBJS)\monodll_wrapsizer.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
 	$(OBJS)\monodll_buttonbar.o \
@@ -1922,6 +1923,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.o \
 	$(OBJS)\monodll_wincmn.o \
 	$(OBJS)\monodll_windowid.o \
+	$(OBJS)\monodll_wrapsizer.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
 	$(OBJS)\monodll_buttonbar.o \
@@ -2343,6 +2345,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.o \
 	$(OBJS)\monolib_wincmn.o \
 	$(OBJS)\monolib_windowid.o \
+	$(OBJS)\monolib_wrapsizer.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
 	$(OBJS)\monolib_buttonbar.o \
@@ -2576,6 +2579,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.o \
 	$(OBJS)\monolib_wincmn.o \
 	$(OBJS)\monolib_windowid.o \
+	$(OBJS)\monolib_wrapsizer.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
 	$(OBJS)\monolib_buttonbar.o \
@@ -2922,6 +2926,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.o \
 	$(OBJS)\coredll_wincmn.o \
 	$(OBJS)\coredll_windowid.o \
+	$(OBJS)\coredll_wrapsizer.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
 	$(OBJS)\coredll_buttonbar.o \
@@ -3155,6 +3160,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.o \
 	$(OBJS)\coredll_wincmn.o \
 	$(OBJS)\coredll_windowid.o \
+	$(OBJS)\coredll_wrapsizer.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
 	$(OBJS)\coredll_buttonbar.o \
@@ -3395,6 +3401,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.o \
 	$(OBJS)\corelib_wincmn.o \
 	$(OBJS)\corelib_windowid.o \
+	$(OBJS)\corelib_wrapsizer.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
 	$(OBJS)\corelib_buttonbar.o \
@@ -3628,6 +3635,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.o \
 	$(OBJS)\corelib_wincmn.o \
 	$(OBJS)\corelib_windowid.o \
+	$(OBJS)\corelib_wrapsizer.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
 	$(OBJS)\corelib_buttonbar.o \
@@ -7278,6 +7286,11 @@ $(OBJS)\monodll_windowid.o: ../../src/common/windowid.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_wrapsizer.o: ../../src/common/wrapsizer.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9524,6 +9537,11 @@ $(OBJS)\monolib_windowid.o: ../../src/common/windowid.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_wrapsizer.o: ../../src/common/wrapsizer.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11824,6 +11842,11 @@ $(OBJS)\coredll_windowid.o: ../../src/common/windowid.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_wrapsizer.o: ../../src/common/wrapsizer.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13262,6 +13285,11 @@ $(OBJS)\corelib_windowid.o: ../../src/common/windowid.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_wrapsizer.o: ../../src/common/wrapsizer.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1846,6 +1846,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
+	$(OBJS)\monodll_wrapsizer.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2077,6 +2078,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
+	$(OBJS)\monodll_wrapsizer.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2500,6 +2502,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
+	$(OBJS)\monolib_wrapsizer.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2731,6 +2734,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
+	$(OBJS)\monolib_wrapsizer.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -3093,6 +3097,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
+	$(OBJS)\coredll_wrapsizer.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3324,6 +3329,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
+	$(OBJS)\coredll_wrapsizer.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3564,6 +3570,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
+	$(OBJS)\corelib_wrapsizer.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -3795,6 +3802,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
+	$(OBJS)\corelib_wrapsizer.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -7356,6 +7364,11 @@ $(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -9488,6 +9501,11 @@ $(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -11674,6 +11692,11 @@ $(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -13000,6 +13023,11 @@ $(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -408,6 +408,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
 	$(OBJS)\monodll_windowid.obj &
+	$(OBJS)\monodll_wrapsizer.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
 	$(OBJS)\monodll_buttonbar.obj &
@@ -641,6 +642,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
 	$(OBJS)\monodll_windowid.obj &
+	$(OBJS)\monodll_wrapsizer.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
 	$(OBJS)\monodll_buttonbar.obj &
@@ -1067,6 +1069,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
 	$(OBJS)\monolib_windowid.obj &
+	$(OBJS)\monolib_wrapsizer.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
 	$(OBJS)\monolib_buttonbar.obj &
@@ -1300,6 +1303,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
 	$(OBJS)\monolib_windowid.obj &
+	$(OBJS)\monolib_wrapsizer.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
 	$(OBJS)\monolib_buttonbar.obj &
@@ -1657,6 +1661,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
 	$(OBJS)\coredll_windowid.obj &
+	$(OBJS)\coredll_wrapsizer.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
 	$(OBJS)\coredll_buttonbar.obj &
@@ -1890,6 +1895,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
 	$(OBJS)\coredll_windowid.obj &
+	$(OBJS)\coredll_wrapsizer.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
 	$(OBJS)\coredll_buttonbar.obj &
@@ -2132,6 +2138,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
 	$(OBJS)\corelib_windowid.obj &
+	$(OBJS)\corelib_wrapsizer.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
 	$(OBJS)\corelib_buttonbar.obj &
@@ -2365,6 +2372,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
 	$(OBJS)\corelib_windowid.obj &
+	$(OBJS)\corelib_wrapsizer.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
 	$(OBJS)\corelib_buttonbar.obj &
@@ -7510,6 +7518,11 @@ $(OBJS)\monodll_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monodll_wrapsizer.obj :  .AUTODEPEND ..\..\src\common\wrapsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9756,6 +9769,11 @@ $(OBJS)\monolib_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monolib_wrapsizer.obj :  .AUTODEPEND ..\..\src\common\wrapsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -12056,6 +12074,11 @@ $(OBJS)\coredll_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\coredll_wrapsizer.obj :  .AUTODEPEND ..\..\src\common\wrapsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -13494,6 +13517,11 @@ $(OBJS)\corelib_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\corelib_wrapsizer.obj :  .AUTODEPEND ..\..\src\common\wrapsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -650,6 +650,10 @@ SOURCE=..\..\src\common\windowid.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\wrapsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\xpmdecod.cpp
 # End Source File
 # End Group
@@ -6431,6 +6435,10 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\wrapsizer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wupdlock.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -835,6 +835,8 @@
 				RelativePath="..\..\src\common\wincmn.cpp"/>
 			<File
 				RelativePath="..\..\src\common\windowid.cpp"/>
+			<File
+				RelativePath="..\..\src\common\wrapsizer.cpp"/>
 			<File
 				RelativePath="..\..\src\common\xpmdecod.cpp"/>
 		</Filter>
@@ -3548,6 +3550,8 @@
 				RelativePath="..\..\include\wx\windowid.h"/>
 			<File
 				RelativePath="..\..\include\wx\wizard.h"/>
+			<File
+				RelativePath="..\..\include\wx\wrapsizer.h"/>
 			<File
 				RelativePath="..\..\include\wx\wupdlock.h"/>
 			<File
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1090,6 +1090,9 @@
 			<File
 				RelativePath="..\..\src\common\windowid.cpp"
 			/>
+			<File
+				RelativePath="..\..\src\common\wrapsizer.cpp"
+			/>
 			<File
 				RelativePath="..\..\src\common\xpmdecod.cpp"
 			/>
@@ -4859,6 +4862,9 @@
 			<File
 				RelativePath="..\..\include\wx\wizard.h"
 			/>
+			<File
+				RelativePath="..\..\include\wx\wrapsizer.h"
+			/>
 			<File
 				RelativePath="..\..\include\wx\wupdlock.h"
 			/>