Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put remaining toolbars-related methods into #if wxUSE_TOOLBAR

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-21 17:30:07 +00:00
parent ce2f068535
commit dd267523d0
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/univ/renderer.h
View File

@@ -414,12 +414,14 @@ public:
virtual wxSize GetRadioBitmapSize() const = 0; virtual wxSize GetRadioBitmapSize() const = 0;
virtual wxCoord GetCheckItemMargin() const = 0; virtual wxCoord GetCheckItemMargin() const = 0;
#if wxUSE_TOOLBAR
// get the standard size of a toolbar button and also return the size of // get the standard size of a toolbar button and also return the size of
// a toolbar separator in the provided pointer // a toolbar separator in the provided pointer
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const = 0; virtual wxSize GetToolBarButtonSize(wxCoord *separator) const = 0;
// get the margins between/around the toolbar buttons // get the margins between/around the toolbar buttons
virtual wxSize GetToolBarMargin() const = 0; virtual wxSize GetToolBarMargin() const = 0;
#endif // wxUSE_TOOLBAR
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
// convert between text rectangle and client rectangle for text controls: // convert between text rectangle and client rectangle for text controls:
@@ -803,10 +805,12 @@ public:
virtual wxCoord GetCheckItemMargin() const virtual wxCoord GetCheckItemMargin() const
{ return m_renderer->GetCheckItemMargin(); } { return m_renderer->GetCheckItemMargin(); }
#if wxUSE_TOOLBAR
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const virtual wxSize GetToolBarButtonSize(wxCoord *separator) const
{ return m_renderer->GetToolBarButtonSize(separator); } { return m_renderer->GetToolBarButtonSize(separator); }
virtual wxSize GetToolBarMargin() const virtual wxSize GetToolBarMargin() const
{ return m_renderer->GetToolBarMargin(); } { return m_renderer->GetToolBarMargin(); }
#endif // wxUSE_TOOLBAR
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
virtual wxRect GetTextTotalArea(const wxTextCtrl *text, virtual wxRect GetTextTotalArea(const wxTextCtrl *text,

2
src/univ/themes/gtk.cpp
View File

@@ -209,10 +209,12 @@ public:
virtual wxCoord GetCheckItemMargin() const virtual wxCoord GetCheckItemMargin() const
{ return 2; } { return 2; }
#if wxUSE_TOOLBAR
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const virtual wxSize GetToolBarButtonSize(wxCoord *separator) const
{ if ( separator ) *separator = 5; return wxSize(16, 15); } { if ( separator ) *separator = 5; return wxSize(16, 15); }
virtual wxSize GetToolBarMargin() const virtual wxSize GetToolBarMargin() const
{ return wxSize(6, 6); } { return wxSize(6, 6); }
#endif // wxUSE_TOOLBAR
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
virtual wxRect GetTextClientArea(const wxTextCtrl *text, virtual wxRect GetTextClientArea(const wxTextCtrl *text,

2
src/univ/themes/win32.cpp
View File

@@ -213,10 +213,12 @@ public:
virtual wxCoord GetCheckItemMargin() const virtual wxCoord GetCheckItemMargin() const
{ return 0; } { return 0; }
#if wxUSE_TOOLBAR
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const virtual wxSize GetToolBarButtonSize(wxCoord *separator) const
{ if ( separator ) *separator = 5; return wxSize(16, 15); } { if ( separator ) *separator = 5; return wxSize(16, 15); }
virtual wxSize GetToolBarMargin() const virtual wxSize GetToolBarMargin() const
{ return wxSize(4, 4); } { return wxSize(4, 4); }
#endif // wxUSE_TOOLBAR
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
virtual wxRect GetTextTotalArea(const wxTextCtrl *text, virtual wxRect GetTextTotalArea(const wxTextCtrl *text,