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

diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 17dd755974af3bf875a337152914f9955b0cbe9c..cc0951a31cd195a747c08ae8c8401b321b614cc3 100644 (file)
--- 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
 
         { 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(); }
     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
 
 #if wxUSE_SLIDER
     virtual wxCoord GetSliderDim() const

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 843c61cd58ea57e6a8d45a1e41a17229e6147de8..e70e9c409efa1abc6b68f0888f3fc678c9eafd49 100644 (file)
--- 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
 
     virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect);
 #endif // wxUSE_TEXTCTRL
 

+#if wxUSE_NOTEBOOK

     virtual void DrawTab(wxDC& dc,
                          const wxRect& rect,
                          wxDirection dir,
     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);
                          const wxBitmap& bitmap = wxNullBitmap,
                          int flags = 0,
                          int indexAccel = -1);

+#endif // wxUSE_NOTEBOOK

 
 #if wxUSE_SLIDER
     virtual void DrawSliderShaft(wxDC& dc,
 
 #if wxUSE_SLIDER
     virtual void DrawSliderShaft(wxDC& dc,


@@ -269,8 +271,10 @@ public:
                                      wxCoord *extraSpaceBeyond) const;
 #endif // wxUSE_TEXTCTRL
 
                                      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); }
     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; }
 
 #if wxUSE_SLIDER
     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,
                             const wxRect& rectOrig,
                             wxDirection dir,
 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // slider
 // ----------------------------------------------------------------------------
 

+#if wxUSE_SLIDER
+

 wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect,
                                          int lenThumb,
                                          wxOrientation orient) const
 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 a7f5f68051354785f93b92decbdef8ba0f663002..083ae06c36582120da1e2884d508fa4787cdb2cb 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -186,6 +186,7 @@ public:
                                    int tbarStyle = 0);
 #endif // wxUSE_TOOLBAR
 
                                    int tbarStyle = 0);
 #endif // wxUSE_TOOLBAR
 

+#if wxUSE_NOTEBOOK

     virtual void DrawTab(wxDC& dc,
                          const wxRect& rect,
                          wxDirection dir,
     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);
                          const wxBitmap& bitmap = wxNullBitmap,
                          int flags = 0,
                          int indexAccel = -1);

+#endif // wxUSE_NOTEBOOK

 
 #if wxUSE_SLIDER
     virtual void DrawSliderShaft(wxDC& dc,
 
 #if wxUSE_SLIDER
     virtual void DrawSliderShaft(wxDC& dc,


@@ -309,8 +311,10 @@ public:
                                      wxCoord *extraSpaceBeyond) const;
 #endif // wxUSE_TEXTCTRL
 
                                      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); }
     virtual wxSize GetTabIndent() const { return wxSize(2, 2); }
     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,
                               const wxRect& rectOrig,
                               wxDirection dir,
 void wxWin32Renderer::DrawTab(wxDC& dc,
                               const wxRect& rectOrig,
                               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
 
 // ----------------------------------------------------------------------------