// the default event handler is just this window
m_eventHandler = this;
+#if wxUSE_VALIDATORS
// no validator
m_windowValidator = (wxValidator *) NULL;
+#endif // wxUSE_VALIDATORS
// use the system default colours
wxSystemSettings settings;
delete m_caret;
#endif // wxUSE_CARET
+#if wxUSE_VALIDATORS
if ( m_windowValidator )
delete m_windowValidator;
+#endif // wxUSE_VALIDATORS
if ( m_clientObject )
delete m_clientObject;
}
#endif // wxUSE_CARET
+#if wxUSE_VALIDATORS
// ----------------------------------------------------------------------------
// validators
// ----------------------------------------------------------------------------
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;
}
+#endif // wxUSE_VALIDATORS
// ----------------------------------------------------------------------------
// update region testing
bool wxWindowBase::Validate()
{
+#if wxUSE_VALIDATORS
wxWindowList::Node *node;
for ( node = m_children.GetFirst(); node; node = node->GetNext() )
{
wxWindowBase *child = node->GetData();
wxValidator *validator = child->GetValidator();
- if ( validator && validator->Validate(this) )
+ if ( validator && !validator->Validate((wxWindow *)this) )
{
return FALSE;
}
}
+#endif // wxUSE_VALIDATORS
return TRUE;
}
bool wxWindowBase::TransferDataToWindow()
{
+#if wxUSE_VALIDATORS
wxWindowList::Node *node;
for ( node = m_children.GetFirst(); node; node = node->GetNext() )
{
return FALSE;
}
}
+#endif // wxUSE_VALIDATORS
return TRUE;
}
bool wxWindowBase::TransferDataFromWindow()
{
+#if wxUSE_VALIDATORS
wxWindowList::Node *node;
for ( node = m_children.GetFirst(); node; node = node->GetNext() )
{
return FALSE;
}
}
+#endif // wxUSE_VALIDATORS
return TRUE;
}
if ( event.GetSetText() && IsKindOf(CLASSINFO(wxControl)) )
((wxControl*)this)->SetLabel(event.GetText());
+#if wxUSE_CHECKBOX
if ( IsKindOf(CLASSINFO(wxCheckBox)) )
{
if ( event.GetSetChecked() )
((wxCheckBox *)this)->SetValue(event.GetChecked());
}
- else if ( IsKindOf(CLASSINFO(wxRadioButton)) )
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_RADIOBUTTON
+ if ( IsKindOf(CLASSINFO(wxRadioButton)) )
{
if ( event.GetSetChecked() )
((wxRadioButton *) this)->SetValue(event.GetChecked());
}
+#endif // wxUSE_RADIOBUTTON
}
}
}