Improvements for building minimal builds and new ports: wxUSE_* usage and minor cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -127,6 +127,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
|
||||
// wxRenderer: scrollbar geometry
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_SCROLLBAR
|
||||
|
||||
/* static */
|
||||
void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
|
||||
int thumbPos,
|
||||
@@ -386,6 +388,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_SCROLLBAR
|
||||
|
||||
wxRenderer::~wxRenderer()
|
||||
{
|
||||
}
|
||||
@@ -500,11 +504,13 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
|
||||
}
|
||||
}
|
||||
}
|
||||
#if wxUSE_IMAGE
|
||||
else if ( stretch & wxEXPAND )
|
||||
{
|
||||
// stretch bitmap to fill the entire control
|
||||
bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
|
||||
}
|
||||
#endif // wxUSE_IMAGE
|
||||
else // not stretched, not tiled
|
||||
{
|
||||
if ( alignment & wxALIGN_RIGHT )
|
||||
@@ -538,6 +544,8 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
|
||||
dc.DrawBitmap(bmp, x, y, true /* use mask */);
|
||||
}
|
||||
|
||||
#if wxUSE_SCROLLBAR
|
||||
|
||||
void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
int WXUNUSED(thumbPosOld))
|
||||
{
|
||||
@@ -648,6 +656,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_SCROLLBAR
|
||||
|
||||
void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
|
||||
{
|
||||
wxASSERT_MSG( x1 == x2 || y1 == y2,
|
||||
|
||||
Reference in New Issue
Block a user