X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e679c4070e70f42ea4361fcdefd20867580e8fc..9ac71bef070f553f4ecef2c549dba33b10422f06:/src/common/valgen.cpp diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 2c43f60648..d6fc453323 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -6,7 +6,7 @@ // Created: Jan 22 1999 // RCS-ID: // Copyright: (c) 1999 Kevin Smith -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -81,6 +81,7 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val) } wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) + : wxValidator() { Copy(val); } @@ -113,21 +114,21 @@ bool wxGenericValidator::TransferToWindow(void) { 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 @@ -136,33 +137,33 @@ bool wxGenericValidator::TransferToWindow(void) 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_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__) @@ -180,11 +181,11 @@ bool wxGenericValidator::TransferToWindow(void) 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 #if wxUSE_SLIDER @@ -193,21 +194,21 @@ bool wxGenericValidator::TransferToWindow(void) wxSlider* pControl = (wxSlider*) m_validatorWindow; if (m_pInt) { - pControl->SetValue(*m_pInt) ; - return TRUE; - } + pControl->SetValue(*m_pInt) ; + return TRUE; + } } else #endif - // string controls + // string controls 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 #if wxUSE_COMBOBOX if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) ) @@ -224,6 +225,10 @@ bool wxGenericValidator::TransferToWindow(void) { pControl->SetStringSelection(* m_pString); } + else + { + pControl->SetValue(* m_pString); + } return TRUE; } } else @@ -255,7 +260,7 @@ bool wxGenericValidator::TransferToWindow(void) pControl->SetLabel(*m_pString) ; return TRUE; } - } else + } else if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) { wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; @@ -272,52 +277,55 @@ bool wxGenericValidator::TransferToWindow(void) 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; } @@ -332,7 +340,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) ) { wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow; - if (m_pBool) + if (m_pBool) { *m_pBool = pControl->GetValue() ; return TRUE; @@ -343,7 +351,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) ) { wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow; - if (m_pBool) + if (m_pBool) { *m_pBool = pControl->GetValue() ; return TRUE; @@ -355,7 +363,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) ) { wxGauge* pControl = (wxGauge*) m_validatorWindow; - if (m_pInt) + if (m_pInt) { *m_pInt = pControl->GetValue() ; return TRUE; @@ -366,7 +374,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) ) { wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow; - if (m_pInt) + if (m_pInt) { *m_pInt = pControl->GetSelection() ; return TRUE; @@ -377,7 +385,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) ) { wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow; - if (m_pInt) + if (m_pInt) { *m_pInt = pControl->GetThumbPosition() ; return TRUE; @@ -399,7 +407,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) { wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; - if (m_pInt) + if (m_pInt) { *m_pInt = pControl->GetValue() ; return TRUE; @@ -412,7 +420,7 @@ bool wxGenericValidator::TransferFromWindow(void) wxSlider* pControl = (wxSlider*) m_validatorWindow; if (m_pInt) { - pControl->SetValue(*m_pInt) ; + *m_pInt = pControl->GetValue() ; return TRUE; } } else @@ -421,7 +429,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) ) { wxButton* pControl = (wxButton*) m_validatorWindow; - if (m_pString) + if (m_pString) { *m_pString = pControl->GetLabel() ; return TRUE; @@ -432,14 +440,14 @@ bool wxGenericValidator::TransferFromWindow(void) 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->GetStringSelection(); + *m_pString = pControl->GetValue(); return TRUE; } } else @@ -448,7 +456,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) ) { wxChoice* pControl = (wxChoice*) m_validatorWindow; - if (m_pInt) + if (m_pInt) { *m_pInt = pControl->GetSelection() ; return TRUE; @@ -463,7 +471,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) ) { wxStaticText* pControl = (wxStaticText*) m_validatorWindow; - if (m_pString) + if (m_pString) { *m_pString = pControl->GetLabel() ; return TRUE; @@ -472,7 +480,7 @@ bool wxGenericValidator::TransferFromWindow(void) if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) { wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; - if (m_pString) + if (m_pString) { *m_pString = pControl->GetValue() ; return TRUE; @@ -483,27 +491,31 @@ bool wxGenericValidator::TransferFromWindow(void) return TRUE; } } else + // 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 @@ -511,15 +523,20 @@ bool wxGenericValidator::TransferFromWindow(void) 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 @@ -532,7 +549,6 @@ bool wxGenericValidator::TransferFromWindow(void) /* Called by constructors to initialize ALL data members - Last change: JAC 21 Jul 100 5:00 pm */ void wxGenericValidator::Initialize() {