// Created: Jan 22 1999
// RCS-ID:
// Copyright: (c) 1999 Kevin Smith
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "valgen.h"
#endif
#include "wx/slider.h"
#endif
-#ifndef __WIN16__
+
+ #include "wx/spinctrl.h"
+
+#if wxUSE_SPINBTN
#include "wx/spinbutt.h"
+#endif
+#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#endif
#include "wx/valgen.h"
+IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
+
wxGenericValidator::wxGenericValidator(bool *val)
{
Initialize();
}
wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
+ : wxValidator()
{
Copy(val);
}
{
wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
if (m_pBool)
- {
- pControl->SetValue(*m_pBool);
- return TRUE;
- }
+ {
+ pControl->SetValue(*m_pBool);
+ return TRUE;
+ }
} else
#endif
#if wxUSE_RADIOBTN
if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
{
wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
- if (m_pBool)
- {
- pControl->SetValue(*m_pBool) ;
- return TRUE;
- }
+ if (m_pBool)
+ {
+ pControl->SetValue(*m_pBool) ;
+ return TRUE;
+ }
} else
#endif
if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
{
wxGauge* pControl = (wxGauge*) m_validatorWindow;
- if (m_pInt)
- {
- pControl->SetValue(*m_pInt);
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetValue(*m_pInt);
+ return TRUE;
+ }
} else
#endif
#if wxUSE_RADIOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
{
wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
- if (m_pInt)
- {
- pControl->SetSelection(*m_pInt) ;
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetSelection(*m_pInt) ;
+ return TRUE;
+ }
} else
#endif
#if wxUSE_SCROLLBAR
if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
{
wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
- if (m_pInt)
- {
- pControl->SetThumbPosition(*m_pInt) ;
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetThumbPosition(*m_pInt) ;
+ return TRUE;
+ }
} else
#endif
-#if wxUSE_SPINBTN
-#ifndef __WIN16__
+#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+ {
+ wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+ if (m_pInt)
+ {
+ pControl->SetValue(*m_pInt);
+ return TRUE;
+ }
+ } else
+#endif
+#if wxUSE_SPINBTN && !defined(__WIN16__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{
wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
- if (m_pInt)
- {
- pControl->SetValue(*m_pInt) ;
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetValue(*m_pInt) ;
+ return TRUE;
+ }
} else
#endif
-#endif
#if wxUSE_SLIDER
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
{
wxSlider* pControl = (wxSlider*) m_validatorWindow;
if (m_pInt)
{
- pControl->SetValue(*m_pInt) ;
- return TRUE;
- }
+ pControl->SetValue(*m_pInt) ;
+ return TRUE;
+ }
} else
#endif
- // string controls
-#if 1
+ // 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;
- }
+ if (m_pString)
+ {
+ pControl->SetLabel(*m_pString) ;
+ return TRUE;
+ }
} else
#endif
#if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
- if (m_pString)
- {
- pControl->SetValue(*m_pString) ;
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetSelection(*m_pInt) ;
+ return TRUE;
+ }
+ else if (m_pString)
+ {
+ if (pControl->FindString(* m_pString) > -1)
+ {
+ pControl->SetStringSelection(* m_pString);
+ }
+ else
+ {
+ pControl->SetValue(* m_pString);
+ }
+ return TRUE;
+ }
} else
#endif
#if wxUSE_CHOICE
if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
{
wxChoice* pControl = (wxChoice*) m_validatorWindow;
- if (m_pInt)
- {
- pControl->SetSelection(*m_pInt) ;
- return TRUE;
- }
+ if (m_pInt)
+ {
+ pControl->SetSelection(*m_pInt) ;
+ return TRUE;
+ }
+ else if (m_pString)
+ {
+ if (pControl->FindString(* m_pString) > -1)
+ {
+ pControl->SetStringSelection(* m_pString);
+ }
+ return TRUE;
+ }
} else
#endif
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
{
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
- if (m_pString)
- {
- pControl->SetLabel(*m_pString) ;
- return TRUE;
- }
- } else
+ if (m_pString)
+ {
+ pControl->SetLabel(*m_pString) ;
+ return TRUE;
+ }
+ } else
+#if wxUSE_TEXTCTRL
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
- if (m_pString)
- {
- pControl->SetValue(*m_pString) ;
- return TRUE;
- }
+ if (m_pString)
+ {
+ pControl->SetValue(*m_pString) ;
+ return TRUE;
+ }
+ else if (m_pInt)
+ {
+ wxString str;
+ str.Printf(wxT("%d"), *m_pInt);
+ pControl->SetValue(str);
+ return TRUE;
+ }
} else
-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
- // array controls
- // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
- // MUST come first:
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
- {
- wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
- if (m_pArrayInt)
- {
- // clear all selections
- int i;
- for (i = 0 ; i < pControl->Number(); ++i)
- pControl->Check(i, FALSE);
- // select each item in our array
- unsigned u;
- for (u = 0; u < m_pArrayInt->Count(); ++u)
- pControl->Check(m_pArrayInt->Item(u));
- return TRUE;
- }
- else
- return FALSE;
- } else
#endif
+ // array controls
+#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
+ // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+ {
+ wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+ if (m_pArrayInt)
+ {
+ // clear all selections
+ size_t i,
+ count = pControl->GetCount();
+ for ( i = 0 ; i < count; i++ )
+ 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;
+ }
+ else
+ return FALSE;
+ } else
#endif
#if wxUSE_LISTBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
{
wxListBox* pControl = (wxListBox*) m_validatorWindow;
- if (m_pArrayInt)
- {
- // clear all selections
- int i;
- for (i = 0 ; i < pControl->Number(); ++i)
- pControl->Deselect(i);
- // select each item in our array
- unsigned u;
- for (u = 0; u < m_pArrayInt->Count(); ++u)
- pControl->SetSelection(m_pArrayInt->Item(u));
- return TRUE;
- }
+ if (m_pArrayInt)
+ {
+ // clear all selections
+ size_t i,
+ count = pControl->GetCount();
+ for ( i = 0 ; i < count; i++ )
+ pControl->Deselect(i);
+
+ // select each item in our array
+ count = m_pArrayInt->GetCount();
+ for ( i = 0 ; i < count; i++ )
+ pControl->SetSelection(m_pArrayInt->Item(i));
+
+ return TRUE;
+ }
} else
#endif
+ ; // to match the last 'else' above
// unrecognized control, or bad pointer
- return FALSE;
return FALSE;
}
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
{
wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
- if (m_pBool)
+ if (m_pBool)
{
*m_pBool = pControl->GetValue() ;
return TRUE;
if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
{
wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
- if (m_pBool)
+ if (m_pBool)
{
*m_pBool = pControl->GetValue() ;
return TRUE;
if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
{
wxGauge* pControl = (wxGauge*) m_validatorWindow;
- if (m_pInt)
+ if (m_pInt)
{
*m_pInt = pControl->GetValue() ;
return TRUE;
if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
{
wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
- if (m_pInt)
+ if (m_pInt)
{
*m_pInt = pControl->GetSelection() ;
return TRUE;
if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
{
wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
- if (m_pInt)
+ if (m_pInt)
{
*m_pInt = pControl->GetThumbPosition() ;
return TRUE;
}
} else
#endif
-#if wxUSE_SPINBTN
-#ifndef __WIN16__
+#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+ {
+ wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+ if (m_pInt)
+ {
+ *m_pInt=pControl->GetValue();
+ return TRUE;
+ }
+ } else
+#endif
+#if wxUSE_SPINBTN && !defined(__WIN16__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{
wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
- if (m_pInt)
+ if (m_pInt)
{
*m_pInt = pControl->GetValue() ;
return TRUE;
}
} else
#endif
-#endif
#if wxUSE_SLIDER
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
{
wxSlider* pControl = (wxSlider*) m_validatorWindow;
if (m_pInt)
{
- pControl->SetValue(*m_pInt) ;
+ *m_pInt = pControl->GetValue() ;
return TRUE;
}
} else
#endif
// string controls
+#if wxUSE_BUTTON
if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
{
wxButton* pControl = (wxButton*) m_validatorWindow;
- if (m_pString)
+ if (m_pString)
{
*m_pString = pControl->GetLabel() ;
return TRUE;
}
- }
- else
+ } else
+#endif
#if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
- if (m_pString)
+ if (m_pInt)
{
- *m_pString = pControl->GetValue() ;
+ *m_pInt = pControl->GetSelection() ;
return TRUE;
}
+ else if (m_pString)
+ {
+ *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)
+ 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 (m_pString)
{
*m_pString = pControl->GetLabel() ;
return TRUE;
}
} else
+#if wxUSE_TEXTCTRL
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
- if (m_pString)
+ if (m_pString)
{
*m_pString = pControl->GetValue() ;
return TRUE;
}
+ else if (m_pInt)
+ {
+ *m_pInt = wxAtoi(pControl->GetValue());
+ return TRUE;
+ }
} else
+#endif
+ // array controls
#if wxUSE_CHECKLISTBOX
#ifndef __WIN16__
- // array controls
- // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
- // MUST come first:
+ // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
{
wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
- if (m_pArrayInt)
+ if (m_pArrayInt)
{
// clear our array
m_pArrayInt->Clear();
+
// add each selected item to our array
- int i;
- for (i = 0 ; i < pControl->Number(); ++i)
+ 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
+ return FALSE;
} else
#endif
#endif
if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
{
wxListBox* pControl = (wxListBox*) m_validatorWindow;
- if (m_pArrayInt)
+ if (m_pArrayInt)
{
// clear our array
m_pArrayInt->Clear();
+
// add each selected item to our array
- int i;
- for (i = 0 ; i < pControl->Number(); ++i)
+ size_t i,
+ count = pControl->GetCount();
+ for ( i = 0; i < count; i++ )
+ {
if (pControl->Selected(i))
m_pArrayInt->Add(i);
+ }
+
return TRUE;
}
} else
projects / wxWidgets.git / blobdiff