#cr6875455#

- introduce impl-data (ControlData) for a control
- move Control::mpLayoutData to an impl structure
- introduce Control::GetCanonicalFont/TextColor
- introduce Control::ImplInitSettings, which collects the duplicated code in all kind of derived
classes, relying on GetCanonical* now
- introduce a reference device for a Control, which can be used to render text
- introduce Control::DrawControlText, which delegates to DrawText if no reference device is set,
or renders the text using the reference device
- let static (i.e. non-input) Control classes use DrawControlText instead of DrawText

missing items (at least):
- text layout data in DrawControlText (needed for A11Y)
- respect vertical and horizontal alignments
- respect various other TEXT_DRAW_* flags
- word breaks

1 files changed, 3 insertions, 3 deletions

diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index a5e9ff1cc7d0..15bd56ae4e98 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -43,7 +43,7 @@
 #include "vcl/ilstbox.hxx"
 #include "vcl/lstbox.hxx"
 #include "vcl/combobox.hxx"
-#include "vcl/controllayout.hxx"
+#include "vcl/controldata.hxx"
 
 #include "tools/debug.hxx"
 
@@ -717,7 +717,7 @@ void ListBox::Resize()
 
 void ListBox::FillLayoutData() const
 {
-    mpLayoutData = new vcl::ControlLayoutData();
+    mpControlData->mpLayoutData = new vcl::ControlLayoutData();
     const Control* pMainWin = mpImplLB->GetMainWindow();
     if( mpFloatWin )
     {
@@ -741,7 +741,7 @@ void ListBox::FillLayoutData() const
 
 long ListBox::GetIndexForPoint( const Point& rPoint, USHORT& rPos ) const
 {
-    if( ! mpLayoutData )
+    if( !HasLayoutData() )
         FillLayoutData();
 
     // check whether rPoint fits at all