use RenderContext in user draw, use ApplySettings

Change-Id: I6cc22677000459a5f19bfb207007f5c246f187e0
Signed-off-by: Jan Holesovsky <kendy@collabora.com>

vcl/inc/ilstbox.hxx

@@ -564,11 +564,11 @@ private:
     bool            mbInUserDraw : 1;
     bool            mbEdgeBlending : 1;
 
-    void ImplDraw( bool bLayout = false );
+    void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false);
 protected:
     virtual void  FillLayoutData() const SAL_OVERRIDE;
-public:
 
+public:
                     ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 );
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -598,7 +598,8 @@ public:
     void            EnableUserDraw( bool bUserDraw )    { mbUserDrawEnabled = bUserDraw; }
     bool            IsUserDrawEnabled() const           { return mbUserDrawEnabled; }
 
-    void            DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false, bool bLayout = false );
+    void DrawEntry(vcl::RenderContext& rRenderContext, bool bDrawImage, bool bDrawText,
+                   bool bDrawTextAtImagePos = false, bool bLayout = false);
 
     bool GetEdgeBlending() const { return mbEdgeBlending; }
     void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
@@ -606,7 +607,6 @@ public:
     virtual void    ShowFocus(const Rectangle& rRect) SAL_OVERRIDE;
 
     using Control::ImplInitSettings;
-    void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
 };

vcl/source/control/combobox.cxx

@@ -1131,7 +1131,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines
 
 void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
-    mpImplLB->GetMainWindow()->ImplInitSettings( true, true, true );
+    mpImplLB->GetMainWindow()->ApplySettings(*pDev);
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );

vcl/source/control/lstbox.cxx

@@ -375,7 +375,7 @@ void ListBox::ApplySettings(vcl::RenderContext& rRenderContext)
 
 void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
-    mpImplLB->GetMainWindow()->ImplInitSettings( true, true, true );
+    mpImplLB->GetMainWindow()->ApplySettings(*pDev);
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
@@ -555,7 +555,7 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt )
         if ( mpImplWin )
         {
             mpImplWin->SetSettings( GetSettings() ); // If not yet set...
-            mpImplWin->ImplInitSettings(true, true, true);
+            mpImplWin->ApplySettings(*this);
 
             mpBtn->SetSettings( GetSettings() );
             ImplInitDropDownButton( mpBtn );
@@ -1386,7 +1386,7 @@ void ListBox::DrawEntry(const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawTe
     if (rEvt.GetDevice() == mpImplLB->GetMainWindow())
         mpImplLB->GetMainWindow()->DrawEntry(*rEvt.GetDevice(), rEvt.GetItemId(), bDrawImage, bDrawText, bDrawTextAtImagePos );
     else if (rEvt.GetDevice() == mpImplWin)
-        mpImplWin->DrawEntry(bDrawImage, bDrawText, bDrawTextAtImagePos);
+        mpImplWin->DrawEntry(*rEvt.GetDevice(), bDrawImage, bDrawText, bDrawTextAtImagePos);
 }
 
 void ListBox::SetUserItemSize( const Size& rSz )