From 90b903c26306d88d3920589125ea1a03664e1b22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Sun, 30 Apr 2006 23:54:26 +0000 Subject: [PATCH] Renamed DrawCheckButton due to conflict with existing and public api of wxUniversal port. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/renderer.tex | 5 ++--- include/wx/renderer.h | 19 +++++++++---------- src/generic/datavgen.cpp | 2 +- src/generic/renderg.cpp | 16 ++++++++-------- src/gtk/renderer.cpp | 37 ++++++++++++++++++------------------- src/msw/renderer.cpp | 21 ++++++++++----------- 6 files changed, 48 insertions(+), 52 deletions(-) diff --git a/docs/latex/wx/renderer.tex b/docs/latex/wx/renderer.tex index 9678cb65ae..2f2a7d6fcd 100644 --- a/docs/latex/wx/renderer.tex +++ b/docs/latex/wx/renderer.tex @@ -92,9 +92,9 @@ No base class Virtual destructor as for any base class. -\membersection{wxRendererNative::DrawCheckButton}\label{wxrenderernativedrawcheckbutton} +\membersection{wxRendererNative::DrawCheckBox}\label{wxrenderernativedrawcheckbox} -\func{void}{DrawCheckButton}{\param{wxWindow *}{win}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{flags}} +\func{void}{DrawCheckBox}{\param{wxWindow *}{win}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{flags}} Draw a check box (used by wxDataViewCtrl). @@ -236,4 +236,3 @@ Set the renderer to use, passing {\tt NULL} reverts to using the default renderer (the global renderer must always exist). Return the previous renderer used with Set() or {\tt NULL} if none. - diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 95538a4017..0f603773e0 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -173,10 +173,10 @@ public: // draw check button // // flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0) = 0; // draw blank button // @@ -300,11 +300,11 @@ public: int flags = 0) { m_rendererNative.DrawDropArrow(win, dc, rect, flags); } - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0 ) - { m_rendererNative.DrawCheckButton( win, dc, rect, flags ); } + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0 ) + { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -346,4 +346,3 @@ wxRendererNative& wxRendererNative::GetDefault() #endif // !wxHAS_NATIVE_RENDERER #endif // _WX_RENDERER_H_ - diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index e1ad09512f..92cf52354a 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -367,7 +367,7 @@ bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) flags |= wxCONTROL_DISABLED; - wxRendererNative::Get().DrawCheckButton( + wxRendererNative::Get().DrawCheckBox( GetOwner()->GetOwner(), *dc, rect, diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 217cbbf19d..478d156dcf 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -78,10 +78,10 @@ public: const wxRect& rect, int flags = 0); - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -402,10 +402,10 @@ wxRendererGeneric::DrawDropArrow(wxWindow *win, } void -wxRendererGeneric::DrawCheckButton(wxWindow *WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) { dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); dc.SetBrush( *wxTRANSPARENT_BRUSH ); diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index facd0d59cb..b86627af63 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -78,10 +78,10 @@ public: const wxRect& rect, int flags = 0); - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -92,7 +92,7 @@ public: wxDC& dc, const wxRect& rect, int flags = 0); - + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); private: @@ -103,8 +103,8 @@ private: // used by DrawTreeItemButton() static GtkWidget *GetTreeWidget(); - - // used by DrawCheckButton() + + // used by DrawCheckBox() static GtkWidget *GetCheckButtonWidget(); }; @@ -437,17 +437,17 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, } void -wxRendererGTK::DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags ) +wxRendererGTK::DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) { GtkWidget *button = GetCheckButtonWidget(); // for reason why we do this, see DrawDropArrow wxWindowDC& wdc = (wxWindowDC&)dc; wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); - + GtkStateType state; if ( flags & wxCONTROL_PRESSED ) @@ -458,7 +458,7 @@ wxRendererGTK::DrawCheckButton(wxWindow *win, state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; - + gtk_paint_check ( button->style, @@ -522,12 +522,12 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); GtkStateType state; - if (flags & wxCONTROL_SELECTED) + if (flags & wxCONTROL_SELECTED) { if (flags & wxCONTROL_FOCUSED) - state = GTK_STATE_SELECTED; + state = GTK_STATE_SELECTED; else - state = GTK_STATE_INSENSITIVE; + state = GTK_STATE_INSENSITIVE; gtk_paint_flat_box( win->m_wxwindow->style, GTK_PIZZA(win->m_wxwindow)->bin_window, @@ -541,7 +541,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, rect.width, rect.height ); } - + if (flags & wxCONTROL_CURRENT) { dc.SetPen( *wxBLACK_PEN ); @@ -549,4 +549,3 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, dc.DrawRectangle( rect ); } } - diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index ca355bdf17..25f91fc306 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/renderer.cpp +// Name: src/msw/renderer.cpp // Purpose: implementation of wxRendererNative for Windows // Author: Vadim Zeitlin // Modified by: @@ -134,10 +134,10 @@ public: wxDC& dc, const wxRect& rect, int flags = 0); - virtual void DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -335,15 +335,15 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, } void -wxRendererXP::DrawCheckButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererXP::DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) { wxUxThemeHandle hTheme(win, L"BUTTON"); if ( !hTheme ) { - m_rendererNative.DrawCheckButton(win, dc, rect, flags); + m_rendererNative.DrawCheckBox(win, dc, rect, flags); return; } @@ -473,4 +473,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, } #endif // wxUSE_UXTHEME - -- 2.47.2