AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed wxValidator::Clone and friends to return a wxObject* to keep

Browse Source 
MS VC++ happy


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-04-30 02:39:50 +00:00
parent 80ec928cf7
commit ca298c8852
6 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/valgen.h
View File

@ -33,7 +33,7 @@ public:
// if you're passing a reference to a validator.
// Another possibility is to always pass a pointer to a new validator
// (so the calling code can use a copy constructor of the relevant class).
virtual wxValidator *Clone(void) const { return new wxGenericValidator(*this); }
virtual wxObject *Clone(void) const { return new wxGenericValidator(*this); }
bool Copy(const wxGenericValidator& val);
// Called when the value in the window must be validated.

2
include/wx/validate.h
View File

@ -42,7 +42,7 @@ public:
// if you're passing a reference to a validator.
// Another possibility is to always pass a pointer to a new validator
// (so the calling code can use a copy constructor of the relevant class).
virtual wxValidator *Clone() const
virtual wxObject *Clone() const
{ return (wxValidator *)NULL; }
bool Copy(const wxValidator& val)
{ m_validatorWindow = val.m_validatorWindow; return TRUE; }

2
include/wx/valtext.h
View File

@ -39,7 +39,7 @@ public:
// if you're passing a reference to a validator.
// Another possibility is to always pass a pointer to a new validator
// (so the calling code can use a copy constructor of the relevant class).
virtual wxValidator *Clone(void) const { return new wxTextValidator(*this); }
virtual wxObject *Clone(void) const { return new wxTextValidator(*this); }
bool Copy(const wxTextValidator& val);
// Called when the value in the window must be validated.

2
src/gtk/window.cpp
View File

@ -2575,7 +2575,7 @@ wxValidator *wxWindow::GetValidator()
void wxWindow::SetValidator( const wxValidator& validator )
{
if (m_windowValidator) delete m_windowValidator;
m_windowValidator = validator.Clone();
m_windowValidator = (wxValidator*)validator.Clone();
if (m_windowValidator) m_windowValidator->SetWindow(this);
}

2
src/gtk1/window.cpp
View File

@ -2575,7 +2575,7 @@ wxValidator *wxWindow::GetValidator()
void wxWindow::SetValidator( const wxValidator& validator )
{
if (m_windowValidator) delete m_windowValidator;
m_windowValidator = validator.Clone();
m_windowValidator = (wxValidator*)validator.Clone();
if (m_windowValidator) m_windowValidator->SetWindow(this);
}

2
src/msw/window.cpp
View File

@ -4449,7 +4449,7 @@ void wxWindow::SetValidator(const wxValidator& validator)
{
if ( m_windowValidator )
delete m_windowValidator;
m_windowValidator = validator.Clone();
m_windowValidator = (wxValidator*)validator.Clone();
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;