1. replaced wxRenderer::AdjustScrollbar with AreScrollbarsInsideBorder(),

it now seems to work with GTK theme too
2. added checkbox bitmaps drawing under GTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-08 14:34:12 +00:00
parent 925f7f2250
commit a10069108f
9 changed files with 157 additions and 112 deletions

View File

@@ -161,13 +161,9 @@ public:
// the left/top side, width/heigh - of the right/bottom one
virtual wxRect GetBorderDimensions(wxBorder border) const = 0;
// the scrollbar rectangle may need adjusting if the window has the border
// as the renderer might wish to combine the scrollbar border and the
// window one
virtual void AdjustScrollbar(wxOrientation orient,
wxBorder border,
bool hasOtherScrollbar,
wxRect* rect) const = 0;
// the scrollbars may be drawn either inside the window border or outside
// it - this function is used to decide how to draw them
virtual bool AreScrollbarsInsideBorder() const = 0;
// adjust the size of the control of the given class: for most controls,
// this just takes into account the border, but for some (buttons, for
@@ -316,11 +312,8 @@ public:
{ m_renderer->AdjustSize(size, window); }
virtual wxRect GetBorderDimensions(wxBorder border) const
{ return m_renderer->GetBorderDimensions(border); }
virtual void AdjustScrollbar(wxOrientation orient,
wxBorder border,
bool hasOtherScrollbar,
wxRect* rect) const
{ m_renderer->AdjustScrollbar(orient, border, hasOtherScrollbar, rect); }
virtual bool AreScrollbarsInsideBorder() const
{ return m_renderer->AreScrollbarsInsideBorder(); }
virtual wxRect GetScrollbarRect(const wxScrollBar *scrollbar,
wxScrollBar::Element elem,