remove wxWindow::Clear() from wxDFB and wxMGL which was unused (probably replaced by ClearBackground()) and conflicted with methods with the same name in other classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,7 +75,6 @@ public:
|
|||||||
virtual void Refresh(bool eraseBackground = true,
|
virtual void Refresh(bool eraseBackground = true,
|
||||||
const wxRect *rect = (const wxRect *) NULL);
|
const wxRect *rect = (const wxRect *) NULL);
|
||||||
virtual void Update();
|
virtual void Update();
|
||||||
virtual void Clear();
|
|
||||||
virtual void Freeze();
|
virtual void Freeze();
|
||||||
virtual void Thaw();
|
virtual void Thaw();
|
||||||
virtual bool IsFrozen() const { return m_frozenness > 0; }
|
virtual bool IsFrozen() const { return m_frozenness > 0; }
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ public:
|
|||||||
virtual void Refresh(bool eraseBackground = true,
|
virtual void Refresh(bool eraseBackground = true,
|
||||||
const wxRect *rect = (const wxRect *) NULL);
|
const wxRect *rect = (const wxRect *) NULL);
|
||||||
virtual void Update();
|
virtual void Update();
|
||||||
virtual void Clear();
|
|
||||||
virtual void Freeze();
|
virtual void Freeze();
|
||||||
virtual void Thaw();
|
virtual void Thaw();
|
||||||
|
|
||||||
|
|||||||
@@ -565,14 +565,6 @@ void wxWindowDFB::GetTextExtent(const wxString& string,
|
|||||||
// painting
|
// painting
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
void wxWindowDFB::Clear()
|
|
||||||
{
|
|
||||||
wxClientDC dc((wxWindow *)this);
|
|
||||||
wxBrush brush(GetBackgroundColour(), wxSOLID);
|
|
||||||
dc.SetBackground(brush);
|
|
||||||
dc.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
|
void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
|
||||||
{
|
{
|
||||||
if ( !IsShown() || IsFrozen() )
|
if ( !IsShown() || IsFrozen() )
|
||||||
|
|||||||
@@ -1099,14 +1099,6 @@ void wxWindowMGL::GetTextExtent(const wxString& string,
|
|||||||
// painting
|
// painting
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
void wxWindowMGL::Clear()
|
|
||||||
{
|
|
||||||
wxClientDC dc((wxWindow *)this);
|
|
||||||
wxBrush brush(GetBackgroundColour(), wxSOLID);
|
|
||||||
dc.SetBackground(brush);
|
|
||||||
dc.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
|
void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
|
||||||
{
|
{
|
||||||
if ( m_eraseBackground == -1 )
|
if ( m_eraseBackground == -1 )
|
||||||
|
|||||||
Reference in New Issue
Block a user