add if wxUSE_NOTEBOOK around notebook-only renderer methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -818,8 +818,10 @@ public:
|
|||||||
{ return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); }
|
{ return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); }
|
||||||
#endif // wxUSE_TEXTCTRL
|
#endif // wxUSE_TEXTCTRL
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); }
|
virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); }
|
||||||
virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); }
|
virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); }
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
virtual wxCoord GetSliderDim() const
|
virtual wxCoord GetSliderDim() const
|
||||||
|
@@ -137,6 +137,7 @@ public:
|
|||||||
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect);
|
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect);
|
||||||
#endif // wxUSE_TEXTCTRL
|
#endif // wxUSE_TEXTCTRL
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
virtual void DrawTab(wxDC& dc,
|
virtual void DrawTab(wxDC& dc,
|
||||||
const wxRect& rect,
|
const wxRect& rect,
|
||||||
wxDirection dir,
|
wxDirection dir,
|
||||||
@@ -144,6 +145,7 @@ public:
|
|||||||
const wxBitmap& bitmap = wxNullBitmap,
|
const wxBitmap& bitmap = wxNullBitmap,
|
||||||
int flags = 0,
|
int flags = 0,
|
||||||
int indexAccel = -1);
|
int indexAccel = -1);
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
virtual void DrawSliderShaft(wxDC& dc,
|
virtual void DrawSliderShaft(wxDC& dc,
|
||||||
@@ -269,8 +271,10 @@ public:
|
|||||||
wxCoord *extraSpaceBeyond) const;
|
wxCoord *extraSpaceBeyond) const;
|
||||||
#endif // wxUSE_TEXTCTRL
|
#endif // wxUSE_TEXTCTRL
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
|
virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
|
||||||
virtual wxSize GetTabPadding() const { return wxSize(6, 6); }
|
virtual wxSize GetTabPadding() const { return wxSize(6, 6); }
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
virtual wxCoord GetSliderDim() const { return 15; }
|
virtual wxCoord GetSliderDim() const { return 15; }
|
||||||
@@ -1373,6 +1377,8 @@ void wxGTKRenderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect)
|
|||||||
// notebook
|
// notebook
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
|
|
||||||
void wxGTKRenderer::DrawTab(wxDC& dc,
|
void wxGTKRenderer::DrawTab(wxDC& dc,
|
||||||
const wxRect& rectOrig,
|
const wxRect& rectOrig,
|
||||||
wxDirection dir,
|
wxDirection dir,
|
||||||
@@ -1569,12 +1575,14 @@ void wxGTKRenderer::DrawTab(wxDC& dc,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// slider
|
// slider
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect,
|
wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect,
|
||||||
int lenThumb,
|
int lenThumb,
|
||||||
wxOrientation orient) const
|
wxOrientation orient) const
|
||||||
|
@@ -186,6 +186,7 @@ public:
|
|||||||
int tbarStyle = 0);
|
int tbarStyle = 0);
|
||||||
#endif // wxUSE_TOOLBAR
|
#endif // wxUSE_TOOLBAR
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
virtual void DrawTab(wxDC& dc,
|
virtual void DrawTab(wxDC& dc,
|
||||||
const wxRect& rect,
|
const wxRect& rect,
|
||||||
wxDirection dir,
|
wxDirection dir,
|
||||||
@@ -193,6 +194,7 @@ public:
|
|||||||
const wxBitmap& bitmap = wxNullBitmap,
|
const wxBitmap& bitmap = wxNullBitmap,
|
||||||
int flags = 0,
|
int flags = 0,
|
||||||
int indexAccel = -1);
|
int indexAccel = -1);
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
virtual void DrawSliderShaft(wxDC& dc,
|
virtual void DrawSliderShaft(wxDC& dc,
|
||||||
@@ -309,8 +311,10 @@ public:
|
|||||||
wxCoord *extraSpaceBeyond) const;
|
wxCoord *extraSpaceBeyond) const;
|
||||||
#endif // wxUSE_TEXTCTRL
|
#endif // wxUSE_TEXTCTRL
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
|
virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
|
||||||
virtual wxSize GetTabPadding() const { return wxSize(6, 5); }
|
virtual wxSize GetTabPadding() const { return wxSize(6, 5); }
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
@@ -1840,6 +1844,8 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc,
|
|||||||
// notebook
|
// notebook
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_NOTEBOOK
|
||||||
|
|
||||||
void wxWin32Renderer::DrawTab(wxDC& dc,
|
void wxWin32Renderer::DrawTab(wxDC& dc,
|
||||||
const wxRect& rectOrig,
|
const wxRect& rectOrig,
|
||||||
wxDirection dir,
|
wxDirection dir,
|
||||||
@@ -2022,6 +2028,8 @@ void wxWin32Renderer::DrawTab(wxDC& dc,
|
|||||||
#undef REVERSE_FOR_VERTICAL
|
#undef REVERSE_FOR_VERTICAL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_NOTEBOOK
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user