Factor out text measurement from wxDC and wxWindow into wxTextMeasure.
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 17 Oct 2012 22:35:49 +0000 (22:35 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 17 Oct 2012 22:35:49 +0000 (22:35 +0000)
commit8cd79b7af0760eb91d42ff9ac7c0ccead8d50c6b
tree517211070a4b7eff5535ea40949612e1c0467387
parent28dc9371d1d713a1e4df5aa1f414628b4917b5c3
Factor out text measurement from wxDC and wxWindow into wxTextMeasure.

Add a new private wxTextMeasure class implementing methods for measuring text
and move the often duplicated (but not always identically) code for doing the
same from wxDC and wxWindow into it.

Currently this class is only really implemented in wxMSW and wxGTK.

Also extend the test for text measuring functions and rename it to
MeasuringTextTestCase from MeasuringContextTestCase as it's not wxGC-specific
any more.

Closes #14705.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
24 files changed:
Makefile.in
build/bakefiles/files.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_core.dsp
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc9_core.vcproj
include/wx/generic/private/textmeasure.h [new file with mode: 0644]
include/wx/gtk/private/textmeasure.h [new file with mode: 0644]
include/wx/msw/private/textmeasure.h [new file with mode: 0644]
include/wx/private/textmeasure.h [new file with mode: 0644]
src/common/dcbase.cpp
src/common/textmeasurecmn.cpp [new file with mode: 0644]
src/generic/textmeasure.cpp [new file with mode: 0644]
src/gtk/dcclient.cpp
src/gtk/textmeasure.cpp [new file with mode: 0644]
src/gtk/window.cpp
src/msw/dc.cpp
src/msw/textmeasure.cpp [new file with mode: 0644]
src/msw/window.cpp
tests/graphics/measuring.cpp