/////////////////////////////////////////////////////////////////////////////
-// Name: valgen.cpp
+// Name: src/common/valgen.cpp
// Purpose: wxGenericValidator class
// Author: Kevin Smith
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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
-
-
- #include "wx/spinctrl.h"
+ #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"
+ #include "wx/spinbutt.h"
#endif
-#if wxUSE_CHECKLISTBOX
- #include "wx/checklst.h"
+#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;
+#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;
}
} 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 wxUSE_GAUGE
if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
} 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)) )
pControl->SetValue(str);
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
// NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
}
} else
#endif
- ; // to match the last 'else' above
+ { // to match the last 'else' above
+ }
// unrecognized control, or bad pointer
return false;
return true;
}
} else
+#endif
+#if wxUSE_TOGGLEBTN
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+ {
+ 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
#endif
// INT CONTROLS ***************************************
} 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)
+ {
+ *m_pDateTime = pControl->GetValue() ;
+ return true;
+ }
+ } else
+#endif
+
// STRING CONTROLS ************************************
#if wxUSE_BUTTON
if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
*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
count = pControl->GetCount();
for ( i = 0; i < count; i++ )
{
- if (pControl->Selected(i))
+ if (pControl->IsSelected(i))
m_pArrayInt->Add(i);
}
*/
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