[attempt to] fix a warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,13 +50,13 @@ static bool wxIsNumeric(const wxString& val);
|
|||||||
|
|
||||||
wxTextValidator::wxTextValidator(long style, wxString *val)
|
wxTextValidator::wxTextValidator(long style, wxString *val)
|
||||||
{
|
{
|
||||||
m_validatorStyle = style ;
|
m_validatorStyle = style;
|
||||||
m_stringValue = val ;
|
m_stringValue = val;
|
||||||
/*
|
/*
|
||||||
m_refData = new wxVTextRefData;
|
m_refData = new wxVTextRefData;
|
||||||
|
|
||||||
M_VTEXTDATA->m_validatorStyle = style ;
|
M_VTEXTDATA->m_validatorStyle = style;
|
||||||
M_VTEXTDATA->m_stringValue = val ;
|
M_VTEXTDATA->m_stringValue = val;
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,12 +70,12 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
|
|||||||
{
|
{
|
||||||
wxValidator::Copy(val);
|
wxValidator::Copy(val);
|
||||||
|
|
||||||
m_validatorStyle = val.m_validatorStyle ;
|
m_validatorStyle = val.m_validatorStyle;
|
||||||
m_stringValue = val.m_stringValue ;
|
m_stringValue = val.m_stringValue;
|
||||||
|
|
||||||
m_includeList = val.m_includeList;
|
m_includeList = val.m_includeList;
|
||||||
m_excludeList = val.m_excludeList;
|
m_excludeList = val.m_excludeList;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,7 +112,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
|||||||
if( !CheckValidator() )
|
if( !CheckValidator() )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
|
||||||
|
|
||||||
// If window is disabled, simply return
|
// If window is disabled, simply return
|
||||||
if ( !control->IsEnabled() )
|
if ( !control->IsEnabled() )
|
||||||
@@ -195,11 +195,11 @@ bool wxTextValidator::TransferToWindow(void)
|
|||||||
if( !CheckValidator() )
|
if( !CheckValidator() )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!m_stringValue)
|
if ( m_stringValue )
|
||||||
return TRUE;
|
{
|
||||||
|
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
|
||||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
control->SetValue(* m_stringValue);
|
||||||
control->SetValue(* m_stringValue) ;
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
@@ -210,11 +210,11 @@ bool wxTextValidator::TransferFromWindow(void)
|
|||||||
if( !CheckValidator() )
|
if( !CheckValidator() )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!m_stringValue)
|
if ( m_stringValue )
|
||||||
return TRUE;
|
{
|
||||||
|
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
|
||||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
*m_stringValue = control->GetValue();
|
||||||
* m_stringValue = control->GetValue() ;
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user