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

new makefiles (part I)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-01 15:32:12 +00:00
parent 29f7914424
commit 88ac883a0d
206 changed files with 38605 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/wincmn.cpp
View File

@@ -107,8 +107,10 @@ void wxWindowBase::InitBase()
// 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;
@@ -194,8 +196,10 @@ wxWindowBase::~wxWindowBase()
delete m_caret;
#endif // wxUSE_CARET
#if wxUSE_VALIDATORS
if ( m_windowValidator )
delete m_windowValidator;
#endif // wxUSE_VALIDATORS
if ( m_clientObject )
delete m_clientObject;
@@ -543,6 +547,7 @@ void wxWindowBase::SetCaret(wxCaret *caret)
}
#endif // wxUSE_CARET
#if wxUSE_VALIDATORS
// ----------------------------------------------------------------------------
// validators
// ----------------------------------------------------------------------------
@@ -557,6 +562,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;
}
#endif // wxUSE_VALIDATORS
// ----------------------------------------------------------------------------
// update region testing
@@ -619,6 +625,7 @@ void wxWindowBase::MakeModal(bool WXUNUSED(modal))
bool wxWindowBase::Validate()
{
#if wxUSE_VALIDATORS
wxWindowList::Node *node;
for ( node = m_children.GetFirst(); node; node = node->GetNext() )
{
@@ -629,12 +636,14 @@ bool wxWindowBase::Validate()
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() )
{
@@ -652,12 +661,14 @@ bool wxWindowBase::TransferDataToWindow()
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() )
{
@@ -668,6 +679,7 @@ bool wxWindowBase::TransferDataFromWindow()
return FALSE;
}
}
#endif // wxUSE_VALIDATORS
return TRUE;
}
@@ -1150,16 +1162,21 @@ void wxWindowBase::UpdateWindowUI()
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
}
}
}