From dd267523d0f95c9b954b8f6d09bc5a96e7fc0db7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 21 Sep 2006 17:30:07 +0000 Subject: [PATCH] put remaining toolbars-related methods into #if wxUSE_TOOLBAR git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/renderer.h | 4 ++++ src/univ/themes/gtk.cpp | 2 ++ src/univ/themes/win32.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index cc0951a31c..c9e33d84ca 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -414,12 +414,14 @@ public: virtual wxSize GetRadioBitmapSize() const = 0; virtual wxCoord GetCheckItemMargin() const = 0; +#if wxUSE_TOOLBAR // get the standard size of a toolbar button and also return the size of // a toolbar separator in the provided pointer virtual wxSize GetToolBarButtonSize(wxCoord *separator) const = 0; // get the margins between/around the toolbar buttons virtual wxSize GetToolBarMargin() const = 0; +#endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL // convert between text rectangle and client rectangle for text controls: @@ -803,10 +805,12 @@ public: virtual wxCoord GetCheckItemMargin() const { return m_renderer->GetCheckItemMargin(); } +#if wxUSE_TOOLBAR virtual wxSize GetToolBarButtonSize(wxCoord *separator) const { return m_renderer->GetToolBarButtonSize(separator); } virtual wxSize GetToolBarMargin() const { return m_renderer->GetToolBarMargin(); } +#endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL virtual wxRect GetTextTotalArea(const wxTextCtrl *text, diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 65443dcff6..5715566f5b 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -209,10 +209,12 @@ public: virtual wxCoord GetCheckItemMargin() const { return 2; } +#if wxUSE_TOOLBAR virtual wxSize GetToolBarButtonSize(wxCoord *separator) const { if ( separator ) *separator = 5; return wxSize(16, 15); } virtual wxSize GetToolBarMargin() const { return wxSize(6, 6); } +#endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL virtual wxRect GetTextClientArea(const wxTextCtrl *text, diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 6e5d9661c2..0e3ffe146f 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -213,10 +213,12 @@ public: virtual wxCoord GetCheckItemMargin() const { return 0; } +#if wxUSE_TOOLBAR virtual wxSize GetToolBarButtonSize(wxCoord *separator) const { if ( separator ) *separator = 5; return wxSize(16, 15); } virtual wxSize GetToolBarMargin() const { return wxSize(4, 4); } +#endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL virtual wxRect GetTextTotalArea(const wxTextCtrl *text, -- 2.47.2