/////////////////////////////////////////////////////////////////////////////
-// Name: valgen.cpp
+// Name: src/common/valgen.cpp
// Purpose: wxGenericValidator class
// Author: Kevin Smith
// Modified by:
// Created: Jan 22 1999
-// RCS-ID:
+// RCS-ID: $Id$
// Copyright: (c) 1999 Kevin Smith
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "valgen.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
+ #pragma hdrstop
#endif
#if wxUSE_VALIDATORS
#ifndef WX_PRECOMP
- #include "wx/utils.h"
- #include "wx/intl.h"
- #include "wx/dynarray.h"
- #include "wx/choice.h"
- #include "wx/combobox.h"
- #include "wx/radiobox.h"
- #include "wx/radiobut.h"
- #include "wx/checkbox.h"
- #include "wx/scrolbar.h"
- #include "wx/gauge.h"
- #include "wx/stattext.h"
- #include "wx/textctrl.h"
- #include "wx/button.h"
- #include "wx/listbox.h"
- #include "wx/slider.h"
-#endif
-
-#if wxUSE_SPINCTRL && !defined(__WIN16__)
- #include "wx/spinctrl.h"
-#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
- #include "wx/spinbutt.h"
-#endif
-#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
- #include "wx/checklst.h"
-#endif
+ #include "wx/dynarray.h"
+ #include "wx/utils.h"
+ #include "wx/intl.h"
+ #include "wx/choice.h"
+ #include "wx/combobox.h"
+ #include "wx/radiobox.h"
+ #include "wx/radiobut.h"
+ #include "wx/checkbox.h"
+ #include "wx/scrolbar.h"
+ #include "wx/gauge.h"
+ #include "wx/stattext.h"
+ #include "wx/textctrl.h"
+ #include "wx/button.h"
+ #include "wx/listbox.h"
+ #include "wx/slider.h"
+ #include "wx/checklst.h"
+#endif
+
+#include "wx/spinctrl.h"
+// #include "wx/datectrl.h" -- can't use it in this (core) file for now
+
+#if wxUSE_SPINBTN
+ #include "wx/spinbutt.h"
+#endif
+#if wxUSE_TOGGLEBTN
+ #include "wx/tglbtn.h"
+#endif
+#include "wx/filename.h"
#include "wx/valgen.h"
m_pArrayInt = val;
}
+#if wxUSE_DATETIME
+
+wxGenericValidator::wxGenericValidator(wxDateTime *val)
+{
+ Initialize();
+ m_pDateTime = val;
+}
+
+wxGenericValidator::wxGenericValidator(wxFileName *val)
+{
+ Initialize();
+ m_pFileName = val;
+}
+
+wxGenericValidator::wxGenericValidator(float *val)
+{
+ Initialize();
+ m_pFloat = val;
+}
+
+wxGenericValidator::wxGenericValidator(double *val)
+{
+ Initialize();
+ m_pDouble = val;
+}
+
+#endif // wxUSE_DATETIME
+
wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
: wxValidator()
{
m_pInt = val.m_pInt;
m_pString = val.m_pString;
m_pArrayInt = val.m_pArrayInt;
-
- return TRUE;
-}
-
-wxGenericValidator::~wxGenericValidator()
-{
+#if wxUSE_DATETIME
+ m_pDateTime = val.m_pDateTime;
+#endif // wxUSE_DATETIME
+ m_pFileName = val.m_pFileName;
+ m_pFloat = val.m_pFloat;
+ m_pDouble = val.m_pDouble;
+
+ return true;
}
// Called to transfer data to the window
bool wxGenericValidator::TransferToWindow(void)
{
if ( !m_validatorWindow )
- return FALSE;
+ return false;
// bool controls
#if wxUSE_CHECKBOX
if (m_pBool)
{
pControl->SetValue(*m_pBool);
- return TRUE;
+ return true;
}
} else
#endif
if (m_pBool)
{
pControl->SetValue(*m_pBool) ;
- return TRUE;
+ return true;
+ }
+ } else
+#endif
+
+#if wxUSE_TOGGLEBTN
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+ {
+ wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+ if (m_pBool)
+ {
+ pControl->SetValue(*m_pBool);
+ return true;
+ }
+ } else
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+ {
+ wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
+ if (m_pBool)
+ {
+ pControl->SetValue(*m_pBool);
+ return true;
}
} else
+#endif
#endif
// int controls
if (m_pInt)
{
pControl->SetValue(*m_pInt);
- return TRUE;
+ return true;
}
} else
#endif
if (m_pInt)
{
pControl->SetSelection(*m_pInt) ;
- return TRUE;
+ return true;
}
} else
#endif
if (m_pInt)
{
pControl->SetThumbPosition(*m_pInt) ;
- return TRUE;
+ return true;
}
} else
#endif
-#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
{
wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
if (m_pInt)
{
pControl->SetValue(*m_pInt);
- return TRUE;
+ return true;
}
} else
#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
+#if wxUSE_SPINBTN
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{
wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
if (m_pInt)
{
pControl->SetValue(*m_pInt) ;
- return TRUE;
+ return true;
}
} else
#endif
if (m_pInt)
{
pControl->SetValue(*m_pInt) ;
- return TRUE;
+ return true;
+ }
+ } else
+#endif
+
+ // date time controls
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+ {
+ wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+ if (m_pDateTime)
+ {
+ pControl->SetValue(*m_pDateTime) ;
+ return true;
}
} else
#endif
// string controls
+#if wxUSE_BUTTON
if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
{
wxButton* pControl = (wxButton*) m_validatorWindow;
if (m_pString)
{
pControl->SetLabel(*m_pString) ;
- return TRUE;
+ return true;
}
} else
+#endif
#if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
if (m_pInt)
{
pControl->SetSelection(*m_pInt) ;
- return TRUE;
+ return true;
}
else if (m_pString)
{
- if (pControl->FindString(* m_pString) > -1)
+ if (pControl->FindString(* m_pString) != wxNOT_FOUND)
{
pControl->SetStringSelection(* m_pString);
}
- else
+ if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
{
pControl->SetValue(* m_pString);
}
- return TRUE;
+ return true;
}
} else
#endif
if (m_pInt)
{
pControl->SetSelection(*m_pInt) ;
- return TRUE;
+ return true;
}
else if (m_pString)
{
- if (pControl->FindString(* m_pString) > -1)
+ if (pControl->FindString(* m_pString) != wxNOT_FOUND)
{
pControl->SetStringSelection(* m_pString);
}
- return TRUE;
+ return true;
}
} else
#endif
+#if wxUSE_STATTEXT
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
{
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
if (m_pString)
{
pControl->SetLabel(*m_pString) ;
- return TRUE;
+ return true;
}
} else
+#endif
+#if wxUSE_TEXTCTRL
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
if (m_pString)
{
pControl->SetValue(*m_pString) ;
- return TRUE;
+ return true;
}
else if (m_pInt)
{
wxString str;
str.Printf(wxT("%d"), *m_pInt);
pControl->SetValue(str);
- return TRUE;
+ return true;
+ }
+ else if (m_pFileName)
+ {
+ pControl->SetValue(m_pFileName->GetFullPath());
+ return true;
+ }
+ else if (m_pFloat)
+ {
+ pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat));
+ return true;
+ }
+ else if (m_pDouble)
+ {
+ pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble));
+ return true;
}
} else
+#endif
+
// array controls
-#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
+#if wxUSE_CHECKLISTBOX
// NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
{
size_t i,
count = pControl->GetCount();
for ( i = 0 ; i < count; i++ )
- pControl->Check(i, FALSE);
+ pControl->Check(i, false);
// select each item in our array
count = m_pArrayInt->GetCount();
for ( i = 0 ; i < count; i++ )
pControl->Check(m_pArrayInt->Item(i));
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
} else
#endif
#if wxUSE_LISTBOX
for ( i = 0 ; i < count; i++ )
pControl->SetSelection(m_pArrayInt->Item(i));
- return TRUE;
+ return true;
}
} else
#endif
- ; // to match the last 'else' above
+ { // to match the last 'else' above
+ }
// unrecognized control, or bad pointer
- return FALSE;
+ return false;
}
// Called to transfer data from the window
bool wxGenericValidator::TransferFromWindow(void)
{
- if ( !m_validatorWindow )
- return FALSE;
+ if ( !m_validatorWindow )
+ return false;
- // bool controls
+ // BOOL CONTROLS **************************************
#if wxUSE_CHECKBOX
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
- {
- wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
- if (m_pBool)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
{
- *m_pBool = pControl->GetValue() ;
- return TRUE;
- }
- } else
+ wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+ if (m_pBool)
+ {
+ *m_pBool = pControl->GetValue() ;
+ return true;
+ }
+ } else
#endif
#if wxUSE_RADIOBTN
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
- {
- wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+ {
+ wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
if (m_pBool)
+ {
+ *m_pBool = pControl->GetValue() ;
+ return true;
+ }
+ } else
+#endif
+#if wxUSE_TOGGLEBTN
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
{
- *m_pBool = pControl->GetValue() ;
- return TRUE;
- }
- } else
+ wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+ if (m_pBool)
+ {
+ *m_pBool = pControl->GetValue() ;
+ return true;
+ }
+ } else
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+ {
+ wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow;
+ if (m_pBool)
+ {
+ *m_pBool = pControl->GetValue() ;
+ return true;
+ }
+ } else
#endif
- // int controls
+#endif
+
+ // INT CONTROLS ***************************************
#if wxUSE_GAUGE
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
- {
- wxGauge* pControl = (wxGauge*) m_validatorWindow;
- if (m_pInt)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
{
- *m_pInt = pControl->GetValue() ;
- return TRUE;
- }
- } else
+ wxGauge* pControl = (wxGauge*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetValue() ;
+ return true;
+ }
+ } else
#endif
#if wxUSE_RADIOBOX
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
- {
- wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
- if (m_pInt)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
{
- *m_pInt = pControl->GetSelection() ;
- return TRUE;
- }
- } else
+ wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetSelection() ;
+ return true;
+ }
+ } else
#endif
#if wxUSE_SCROLLBAR
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
- {
- wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
- if (m_pInt)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
{
- *m_pInt = pControl->GetThumbPosition() ;
- return TRUE;
- }
- } else
+ wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetThumbPosition() ;
+ return true;
+ }
+ } else
#endif
-#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
{
wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
if (m_pInt)
{
*m_pInt=pControl->GetValue();
- return TRUE;
+ return true;
}
} else
#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
- {
- wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
- if (m_pInt)
+#if wxUSE_SPINBTN
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{
- *m_pInt = pControl->GetValue() ;
- return TRUE;
- }
- } else
+ wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetValue() ;
+ return true;
+ }
+ } else
#endif
#if wxUSE_SLIDER
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
- {
- wxSlider* pControl = (wxSlider*) m_validatorWindow;
- if (m_pInt)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
{
- *m_pInt = pControl->GetValue() ;
- return TRUE;
- }
- } else
+ wxSlider* pControl = (wxSlider*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetValue() ;
+ return true;
+ }
+ } else
#endif
- // string controls
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
- {
- wxButton* pControl = (wxButton*) m_validatorWindow;
- if (m_pString)
+
+ // DATE TIME CONTROLS ************************************
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
{
- *m_pString = pControl->GetLabel() ;
- return TRUE;
- }
- }
- else
-#if wxUSE_COMBOBOX
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
- {
- wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
- if (m_pInt)
+ wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+ if (m_pDateTime)
+ {
+ *m_pDateTime = pControl->GetValue() ;
+ return true;
+ }
+ } else
+#endif
+
+ // STRING CONTROLS ************************************
+#if wxUSE_BUTTON
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
{
- *m_pInt = pControl->GetSelection() ;
- return TRUE;
- }
- else if (m_pString)
+ wxButton* pControl = (wxButton*) m_validatorWindow;
+ if (m_pString)
+ {
+ *m_pString = pControl->GetLabel() ;
+ return true;
+ }
+ } else
+#endif
+#if wxUSE_COMBOBOX
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
- *m_pString = pControl->GetValue();
- return TRUE;
- }
- } else
+ wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetSelection() ;
+ return true;
+ }
+ else if (m_pString)
+ {
+ if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY)
+ *m_pString = pControl->GetStringSelection();
+ else
+ *m_pString = pControl->GetValue();
+ return true;
+ }
+ } else
#endif
#if wxUSE_CHOICE
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
- {
- wxChoice* pControl = (wxChoice*) m_validatorWindow;
- if (m_pInt)
- {
- *m_pInt = pControl->GetSelection() ;
- return TRUE;
- }
- else if (m_pString)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
{
- *m_pString = pControl->GetStringSelection();
- return TRUE;
- }
- } else
+ wxChoice* pControl = (wxChoice*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt = pControl->GetSelection() ;
+ return true;
+ }
+ else if (m_pString)
+ {
+ *m_pString = pControl->GetStringSelection();
+ return true;
+ }
+ } else
#endif
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
- {
- wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
- if (m_pString)
+#if wxUSE_STATTEXT
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
{
- *m_pString = pControl->GetLabel() ;
- return TRUE;
- }
- } else
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
- {
- wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+ wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
if (m_pString)
+ {
+ *m_pString = pControl->GetLabel() ;
+ return true;
+ }
+ } else
+#endif
+#if wxUSE_TEXTCTRL
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
- *m_pString = pControl->GetValue() ;
- return TRUE;
- }
- else if (m_pInt)
- {
- *m_pInt = wxAtoi(pControl->GetValue());
- return TRUE;
- }
- } else
- // array controls
-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
- // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
- {
- wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
- if (m_pArrayInt)
- {
- // clear our array
- m_pArrayInt->Clear();
-
- // add each selected item to our array
- size_t i,
- count = pControl->GetCount();
- for ( i = 0; i < count; i++ )
- {
- if (pControl->IsChecked(i))
- m_pArrayInt->Add(i);
- }
-
- return TRUE;
- }
- else
- return FALSE;
- } else
+ wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+ if (m_pString)
+ {
+ *m_pString = pControl->GetValue() ;
+ return true;
+ }
+ else if (m_pInt)
+ {
+ *m_pInt = wxAtoi(pControl->GetValue());
+ return true;
+ }
+ else if (m_pFileName)
+ {
+ m_pFileName->Assign(pControl->GetValue());
+ return true;
+ }
+ else if (m_pFloat)
+ {
+ *m_pFloat = (float)wxAtof(pControl->GetValue());
+ return true;
+ }
+ else if (m_pDouble)
+ {
+ *m_pDouble = wxAtof(pControl->GetValue());
+ return true;
+ }
+ } else
#endif
+
+ // ARRAY CONTROLS *************************************
+#if wxUSE_CHECKLISTBOX
+ // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+ {
+ wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+ if (m_pArrayInt)
+ {
+ // clear our array
+ m_pArrayInt->Clear();
+
+ // add each selected item to our array
+ size_t i,
+ count = pControl->GetCount();
+ for ( i = 0; i < count; i++ )
+ {
+ if (pControl->IsChecked(i))
+ m_pArrayInt->Add(i);
+ }
+
+ return true;
+ }
+ else
+ return false;
+ } else
#endif
#if wxUSE_LISTBOX
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
- {
- wxListBox* pControl = (wxListBox*) m_validatorWindow;
- if (m_pArrayInt)
- {
- // clear our array
- m_pArrayInt->Clear();
-
- // add each selected item to our array
- size_t i,
- count = pControl->GetCount();
- for ( i = 0; i < count; i++ )
- {
- if (pControl->Selected(i))
- m_pArrayInt->Add(i);
- }
-
- return TRUE;
- }
- } else
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+ {
+ wxListBox* pControl = (wxListBox*) m_validatorWindow;
+ if (m_pArrayInt)
+ {
+ // clear our array
+ m_pArrayInt->Clear();
+
+ // add each selected item to our array
+ size_t i,
+ count = pControl->GetCount();
+ for ( i = 0; i < count; i++ )
+ {
+ if (pControl->IsSelected(i))
+ m_pArrayInt->Add(i);
+ }
+
+ return true;
+ }
+ } else
#endif
- // unrecognized control, or bad pointer
- return FALSE;
- return FALSE;
+ // unrecognized control, or bad pointer
+ return false;
+
+ return false;
}
/*
*/
void wxGenericValidator::Initialize()
{
- m_pBool = 0;
- m_pInt = 0;
- m_pString = 0;
- m_pArrayInt = 0;
+ m_pBool = NULL;
+ m_pInt = NULL;
+ m_pString = NULL;
+ m_pArrayInt = NULL;
+#if wxUSE_DATETIME
+ m_pDateTime = NULL;
+#endif // wxUSE_DATETIME
+ m_pFileName = NULL;
+ m_pFloat = NULL;
+ m_pDouble = NULL;
}
-#endif
- // wxUSE_VALIDATORS
-
+#endif // wxUSE_VALIDATORS
projects / wxWidgets.git / blobdiff