From c403693947e0129dac212a86021ca8280e28462f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 19 Sep 2006 11:40:40 +0000 Subject: [PATCH] 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 --- include/wx/univ/renderer.h | 2 ++ src/univ/themes/gtk.cpp | 10 +++++++++- src/univ/themes/win32.cpp | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 17dd755974..cc0951a31c 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -818,8 +818,10 @@ public: { return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); } #endif // wxUSE_TEXTCTRL +#if wxUSE_NOTEBOOK virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); } virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); } +#endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER virtual wxCoord GetSliderDim() const diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 843c61cd58..e70e9c409e 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -137,6 +137,7 @@ public: virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect); #endif // wxUSE_TEXTCTRL +#if wxUSE_NOTEBOOK virtual void DrawTab(wxDC& dc, const wxRect& rect, wxDirection dir, @@ -144,6 +145,7 @@ public: const wxBitmap& bitmap = wxNullBitmap, int flags = 0, int indexAccel = -1); +#endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER virtual void DrawSliderShaft(wxDC& dc, @@ -269,8 +271,10 @@ public: wxCoord *extraSpaceBeyond) const; #endif // wxUSE_TEXTCTRL +#if wxUSE_NOTEBOOK virtual wxSize GetTabIndent() const { return wxSize(2, 2); } virtual wxSize GetTabPadding() const { return wxSize(6, 6); } +#endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER virtual wxCoord GetSliderDim() const { return 15; } @@ -1373,6 +1377,8 @@ void wxGTKRenderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect) // notebook // ---------------------------------------------------------------------------- +#if wxUSE_NOTEBOOK + void wxGTKRenderer::DrawTab(wxDC& dc, const wxRect& rectOrig, wxDirection dir, @@ -1569,12 +1575,14 @@ void wxGTKRenderer::DrawTab(wxDC& dc, } } -#if wxUSE_SLIDER +#endif // wxUSE_NOTEBOOK // ---------------------------------------------------------------------------- // slider // ---------------------------------------------------------------------------- +#if wxUSE_SLIDER + wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect, int lenThumb, wxOrientation orient) const diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index a7f5f68051..083ae06c36 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -186,6 +186,7 @@ public: int tbarStyle = 0); #endif // wxUSE_TOOLBAR +#if wxUSE_NOTEBOOK virtual void DrawTab(wxDC& dc, const wxRect& rect, wxDirection dir, @@ -193,6 +194,7 @@ public: const wxBitmap& bitmap = wxNullBitmap, int flags = 0, int indexAccel = -1); +#endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER virtual void DrawSliderShaft(wxDC& dc, @@ -309,8 +311,10 @@ public: wxCoord *extraSpaceBeyond) const; #endif // wxUSE_TEXTCTRL +#if wxUSE_NOTEBOOK virtual wxSize GetTabIndent() const { return wxSize(2, 2); } virtual wxSize GetTabPadding() const { return wxSize(6, 5); } +#endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER @@ -1840,6 +1844,8 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc, // notebook // ---------------------------------------------------------------------------- +#if wxUSE_NOTEBOOK + void wxWin32Renderer::DrawTab(wxDC& dc, const wxRect& rectOrig, wxDirection dir, @@ -2022,6 +2028,8 @@ void wxWin32Renderer::DrawTab(wxDC& dc, #undef REVERSE_FOR_VERTICAL } +#endif // wxUSE_NOTEBOOK + #if wxUSE_SLIDER // ---------------------------------------------------------------------------- -- 2.47.2