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

Renamed DrawCheckButton due to conflict with existing and public api of wxUniversal port.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-30 23:54:26 +00:00
parent 3cdcf4d444
commit 90b903c263
6 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/latex/wx/renderer.tex
View File

@@ -92,9 +92,9 @@ No base class
Virtual destructor as for any 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). 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). renderer (the global renderer must always exist).
Return the previous renderer used with Set() or {\tt NULL} if none. Return the previous renderer used with Set() or {\tt NULL} if none.

19
include/wx/renderer.h
View File

@@ -173,10 +173,10 @@ public:
// draw check button // draw check button
// //
// flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT // flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT
virtual void DrawCheckButton(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) = 0; int flags = 0) = 0;
// draw blank button // draw blank button
// //
@@ -300,11 +300,11 @@ public:
int flags = 0) int flags = 0)
{ m_rendererNative.DrawDropArrow(win, dc, rect, flags); } { m_rendererNative.DrawDropArrow(win, dc, rect, flags); }
virtual void DrawCheckButton(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0 ) int flags = 0 )
{ m_rendererNative.DrawCheckButton( win, dc, rect, flags ); } { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -346,4 +346,3 @@ wxRendererNative& wxRendererNative::GetDefault()
#endif // !wxHAS_NATIVE_RENDERER #endif // !wxHAS_NATIVE_RENDERER
#endif // _WX_RENDERER_H_ #endif // _WX_RENDERER_H_

2
src/generic/datavgen.cpp
View File

@@ -367,7 +367,7 @@ bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
flags |= wxCONTROL_DISABLED; flags |= wxCONTROL_DISABLED;
wxRendererNative::Get().DrawCheckButton( wxRendererNative::Get().DrawCheckBox(
GetOwner()->GetOwner(), GetOwner()->GetOwner(),
*dc, *dc,
rect, rect,

16
src/generic/renderg.cpp
View File

@@ -78,10 +78,10 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawCheckButton(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -402,10 +402,10 @@ wxRendererGeneric::DrawDropArrow(wxWindow *win,
} }
void void
wxRendererGeneric::DrawCheckButton(wxWindow *WXUNUSED(win), wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN));
dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.SetBrush( *wxTRANSPARENT_BRUSH );

37
src/gtk/renderer.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: gtk/renderer.cpp // Name: src/gtk/renderer.cpp
// Purpose: implementation of wxRendererNative for wxGTK // Purpose: implementation of wxRendererNative for wxGTK
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -78,10 +78,10 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawCheckButton(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -92,7 +92,7 @@ public:
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private: private:
@@ -103,8 +103,8 @@ private:
// used by DrawTreeItemButton() // used by DrawTreeItemButton()
static GtkWidget *GetTreeWidget(); static GtkWidget *GetTreeWidget();
// used by DrawCheckButton() // used by DrawCheckBox()
static GtkWidget *GetCheckButtonWidget(); static GtkWidget *GetCheckButtonWidget();
}; };
@@ -437,17 +437,17 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
} }
void void
wxRendererGTK::DrawCheckButton(wxWindow *win, wxRendererGTK::DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
{ {
GtkWidget *button = GetCheckButtonWidget(); GtkWidget *button = GetCheckButtonWidget();
// for reason why we do this, see DrawDropArrow // for reason why we do this, see DrawDropArrow
wxWindowDC& wdc = (wxWindowDC&)dc; wxWindowDC& wdc = (wxWindowDC&)dc;
wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
GtkStateType state; GtkStateType state;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
@@ -458,7 +458,7 @@ wxRendererGTK::DrawCheckButton(wxWindow *win,
state = GTK_STATE_PRELIGHT; state = GTK_STATE_PRELIGHT;
else else
state = GTK_STATE_NORMAL; state = GTK_STATE_NORMAL;
gtk_paint_check gtk_paint_check
( (
button->style, button->style,
@@ -522,12 +522,12 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
GtkStateType state; GtkStateType state;
if (flags & wxCONTROL_SELECTED) if (flags & wxCONTROL_SELECTED)
{ {
if (flags & wxCONTROL_FOCUSED) if (flags & wxCONTROL_FOCUSED)
state = GTK_STATE_SELECTED; state = GTK_STATE_SELECTED;
else else
state = GTK_STATE_INSENSITIVE; state = GTK_STATE_INSENSITIVE;
gtk_paint_flat_box( win->m_wxwindow->style, gtk_paint_flat_box( win->m_wxwindow->style,
GTK_PIZZA(win->m_wxwindow)->bin_window, GTK_PIZZA(win->m_wxwindow)->bin_window,
@@ -541,7 +541,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
rect.width, rect.width,
rect.height ); rect.height );
} }
if (flags & wxCONTROL_CURRENT) if (flags & wxCONTROL_CURRENT)
{ {
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
@@ -549,4 +549,3 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
dc.DrawRectangle( rect ); dc.DrawRectangle( rect );
} }
} }

21
src/msw/renderer.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: msw/renderer.cpp // Name: src/msw/renderer.cpp
// Purpose: implementation of wxRendererNative for Windows // Purpose: implementation of wxRendererNative for Windows
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -134,10 +134,10 @@ public:
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawCheckButton(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -335,15 +335,15 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
} }
void void
wxRendererXP::DrawCheckButton(wxWindow *win, wxRendererXP::DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
wxUxThemeHandle hTheme(win, L"BUTTON"); wxUxThemeHandle hTheme(win, L"BUTTON");
if ( !hTheme ) if ( !hTheme )
{ {
m_rendererNative.DrawCheckButton(win, dc, rect, flags); m_rendererNative.DrawCheckBox(win, dc, rect, flags);
return; return;
} }
@@ -473,4 +473,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
} }
#endif // wxUSE_UXTHEME #endif // wxUSE_UXTHEME