Add wxAffineMatrix2D and related classes.

This class represents an affine 2D transformation and will be used in wxDC for now and maybe in wxGC later. Closes #13143. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 00:09:56 +00:00
parent 6f24b81707
commit 0e5d4c38a3
16 changed files with 738 additions and 15 deletions
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1791,6 +1791,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
@@ -2056,6 +2057,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
@@ -2553,6 +2555,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
@@ -2818,6 +2821,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
@@ -3203,6 +3207,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
@@ -3468,6 +3473,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
@@ -3742,6 +3748,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
@@ -4007,6 +4014,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
@@ -7277,6 +7285,11 @@ $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -9622,6 +9635,11 @@ $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -11961,6 +11979,11 @@ $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -13361,6 +13384,11 @@ $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1802,6 +1802,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.o \
 	$(OBJS)\monodll_accesscmn.o \
 	$(OBJS)\monodll_anidecod.o \
+	$(OBJS)\monodll_affinematrix2d.o \
 	$(OBJS)\monodll_appcmn.o \
 	$(OBJS)\monodll_artprov.o \
 	$(OBJS)\monodll_artstd.o \
@@ -2069,6 +2070,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.o \
 	$(OBJS)\monodll_accesscmn.o \
 	$(OBJS)\monodll_anidecod.o \
+	$(OBJS)\monodll_affinematrix2d.o \
 	$(OBJS)\monodll_appcmn.o \
 	$(OBJS)\monodll_artprov.o \
 	$(OBJS)\monodll_artstd.o \
@@ -2570,6 +2572,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.o \
 	$(OBJS)\monolib_accesscmn.o \
 	$(OBJS)\monolib_anidecod.o \
+	$(OBJS)\monolib_affinematrix2d.o \
 	$(OBJS)\monolib_appcmn.o \
 	$(OBJS)\monolib_artprov.o \
 	$(OBJS)\monolib_artstd.o \
@@ -2837,6 +2840,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.o \
 	$(OBJS)\monolib_accesscmn.o \
 	$(OBJS)\monolib_anidecod.o \
+	$(OBJS)\monolib_affinematrix2d.o \
 	$(OBJS)\monolib_appcmn.o \
 	$(OBJS)\monolib_artprov.o \
 	$(OBJS)\monolib_artstd.o \
@@ -3236,6 +3240,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.o \
 	$(OBJS)\coredll_accesscmn.o \
 	$(OBJS)\coredll_anidecod.o \
+	$(OBJS)\coredll_affinematrix2d.o \
 	$(OBJS)\coredll_appcmn.o \
 	$(OBJS)\coredll_artprov.o \
 	$(OBJS)\coredll_artstd.o \
@@ -3503,6 +3508,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.o \
 	$(OBJS)\coredll_accesscmn.o \
 	$(OBJS)\coredll_anidecod.o \
+	$(OBJS)\coredll_affinematrix2d.o \
 	$(OBJS)\coredll_appcmn.o \
 	$(OBJS)\coredll_artprov.o \
 	$(OBJS)\coredll_artstd.o \
@@ -3783,6 +3789,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.o \
 	$(OBJS)\corelib_accesscmn.o \
 	$(OBJS)\corelib_anidecod.o \
+	$(OBJS)\corelib_affinematrix2d.o \
 	$(OBJS)\corelib_appcmn.o \
 	$(OBJS)\corelib_artprov.o \
 	$(OBJS)\corelib_artstd.o \
@@ -4050,6 +4057,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.o \
 	$(OBJS)\corelib_accesscmn.o \
 	$(OBJS)\corelib_anidecod.o \
+	$(OBJS)\corelib_affinematrix2d.o \
 	$(OBJS)\corelib_appcmn.o \
 	$(OBJS)\corelib_artprov.o \
 	$(OBJS)\corelib_artstd.o \
@@ -7427,6 +7435,11 @@ $(OBJS)\monodll_anidecod.o: ../../src/common/anidecod.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_affinematrix2d.o: ../../src/common/affinematrix2d.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_appcmn.o: ../../src/common/appcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9772,6 +9785,11 @@ $(OBJS)\monolib_anidecod.o: ../../src/common/anidecod.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_affinematrix2d.o: ../../src/common/affinematrix2d.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_appcmn.o: ../../src/common/appcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12111,6 +12129,11 @@ $(OBJS)\coredll_anidecod.o: ../../src/common/anidecod.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_affinematrix2d.o: ../../src/common/affinematrix2d.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_appcmn.o: ../../src/common/appcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13511,6 +13534,11 @@ $(OBJS)\corelib_anidecod.o: ../../src/common/anidecod.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_affinematrix2d.o: ../../src/common/affinematrix2d.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_appcmn.o: ../../src/common/appcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1999,6 +1999,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
@@ -2264,6 +2265,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
@@ -2767,6 +2769,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
@@ -3032,6 +3035,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
@@ -3483,6 +3487,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
@@ -3748,6 +3753,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
@@ -4028,6 +4034,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
@@ -4293,6 +4300,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
@@ -7857,6 +7865,11 @@ $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -10202,6 +10215,11 @@ $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -12541,6 +12559,11 @@ $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -13941,6 +13964,11 @@ $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -353,6 +353,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_accelcmn.obj &
 	$(OBJS)\monodll_accesscmn.obj &
 	$(OBJS)\monodll_anidecod.obj &
+	$(OBJS)\monodll_affinematrix2d.obj &
 	$(OBJS)\monodll_appcmn.obj &
 	$(OBJS)\monodll_artprov.obj &
 	$(OBJS)\monodll_artstd.obj &
@@ -620,6 +621,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_accelcmn.obj &
 	$(OBJS)\monodll_accesscmn.obj &
 	$(OBJS)\monodll_anidecod.obj &
+	$(OBJS)\monodll_affinematrix2d.obj &
 	$(OBJS)\monodll_appcmn.obj &
 	$(OBJS)\monodll_artprov.obj &
 	$(OBJS)\monodll_artstd.obj &
@@ -1126,6 +1128,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_accelcmn.obj &
 	$(OBJS)\monolib_accesscmn.obj &
 	$(OBJS)\monolib_anidecod.obj &
+	$(OBJS)\monolib_affinematrix2d.obj &
 	$(OBJS)\monolib_appcmn.obj &
 	$(OBJS)\monolib_artprov.obj &
 	$(OBJS)\monolib_artstd.obj &
@@ -1393,6 +1396,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_accelcmn.obj &
 	$(OBJS)\monolib_accesscmn.obj &
 	$(OBJS)\monolib_anidecod.obj &
+	$(OBJS)\monolib_affinematrix2d.obj &
 	$(OBJS)\monolib_appcmn.obj &
 	$(OBJS)\monolib_artprov.obj &
 	$(OBJS)\monolib_artstd.obj &
@@ -1803,6 +1807,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_accelcmn.obj &
 	$(OBJS)\coredll_accesscmn.obj &
 	$(OBJS)\coredll_anidecod.obj &
+	$(OBJS)\coredll_affinematrix2d.obj &
 	$(OBJS)\coredll_appcmn.obj &
 	$(OBJS)\coredll_artprov.obj &
 	$(OBJS)\coredll_artstd.obj &
@@ -2070,6 +2075,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_accelcmn.obj &
 	$(OBJS)\coredll_accesscmn.obj &
 	$(OBJS)\coredll_anidecod.obj &
+	$(OBJS)\coredll_affinematrix2d.obj &
 	$(OBJS)\coredll_appcmn.obj &
 	$(OBJS)\coredll_artprov.obj &
 	$(OBJS)\coredll_artstd.obj &
@@ -2352,6 +2358,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_accelcmn.obj &
 	$(OBJS)\corelib_accesscmn.obj &
 	$(OBJS)\corelib_anidecod.obj &
+	$(OBJS)\corelib_affinematrix2d.obj &
 	$(OBJS)\corelib_appcmn.obj &
 	$(OBJS)\corelib_artprov.obj &
 	$(OBJS)\corelib_artstd.obj &
@@ -2619,6 +2626,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_accelcmn.obj &
 	$(OBJS)\corelib_accesscmn.obj &
 	$(OBJS)\corelib_anidecod.obj &
+	$(OBJS)\corelib_affinematrix2d.obj &
 	$(OBJS)\corelib_appcmn.obj &
 	$(OBJS)\corelib_artprov.obj &
 	$(OBJS)\corelib_artstd.obj &
@@ -7686,6 +7694,11 @@ $(OBJS)\monodll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monodll_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -10031,6 +10044,11 @@ $(OBJS)\monolib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monolib_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -12370,6 +12388,11 @@ $(OBJS)\coredll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\coredll_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -13770,6 +13793,11 @@ $(OBJS)\corelib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\corelib_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -252,6 +252,10 @@ SOURCE=..\..\src\common\accesscmn.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\affinematrix2d.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\anidecod.cpp
 # End Source File
 # Begin Source File
@@ -5893,6 +5897,14 @@ SOURCE=..\..\include\wx\propgrid\advprops.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\affinematrix2d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\affinematrix2dbase.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\anidecod.h
 # End Source File
 # Begin Source File
@@ -6741,10 +6753,10 @@ SOURCE=..\..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\textcompleter.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\textcompleter.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\textctrl.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -534,6 +534,9 @@
 			<File
 				RelativePath="..\..\src\common\accesscmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp">
 			</File>
@@ -5006,6 +5009,12 @@
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2d.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2dbase.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\anidecod.h">
 			</File>
@@ -5643,9 +5652,9 @@
 				RelativePath="..\..\include\wx\tbarbase.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\textcompleter.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\textcompleter.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\textctrl.h">
 			</File>
 			<File
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -746,6 +746,10 @@
 				RelativePath="..\..\src\common\accesscmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp"
 				>
@@ -6695,6 +6699,14 @@
 				RelativePath="..\..\include\wx\propgrid\advprops.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2dbase.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\anidecod.h"
 				>
@@ -7544,10 +7556,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\textcompleter.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\textcompleter.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\textctrl.h"
 				>
 			</File>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -742,6 +742,10 @@
 				RelativePath="..\..\src\common\accesscmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp"
 				>
@@ -6691,6 +6695,14 @@
 				RelativePath="..\..\include\wx\propgrid\advprops.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2dbase.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\anidecod.h"
 				>
@@ -7540,10 +7552,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\textcompleter.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\textcompleter.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\textctrl.h"
 				>
 			</File>