From: Jens F. <jfu...@us...> - 2004-12-28 18:14:23
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4516/JVCL3/run Modified Files: JvDynControlEngineDB.pas Log Message: Fixed for TypeChange Index: JvDynControlEngineDB.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineDB.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvDynControlEngineDB.pas 28 Dec 2004 16:46:05 -0000 1.3 --- JvDynControlEngineDB.pas 28 Dec 2004 18:14:12 -0000 1.4 *************** *** 151,178 **** begin Valid := inherited IsControlTypeValid(ADynControlType, AControlClass); ! case ADynControlType of ! // jctDBText: ! // Valid := Valid and Supports(AControlClass, IJvDynControlLabel); ! jctDBButtonEdit: ! Valid := Valid and Supports(AControlClass, IJvDynControlButton) and ! Supports(AControlClass, IJvDynControlData); ! jctDBMemo: ! Valid := Valid and Supports(AControlClass, IJvDynControlItems) and Supports(AControlClass, IJvDynControlData) and ! Supports(AControlClass, IJvDynControlMemo); ! jctDBRadioGroup, jctDBComboBox: ! Valid := Valid and Supports(AControlClass, IJvDynControlItems) and ! Supports(AControlClass, IJvDynControlData); ! jctDBEdit, jctDBCalculateEdit, jctDBSpinEdit, ! jctDBCheckBox, jctDBDateTimeEdit, jctDBDateEdit, jctDBTimeEdit, ! jctDBDirectoryEdit, jctDBFileNameEdit : ! Valid := Valid and Supports(AControlClass, IJvDynControlData); ! end; ! if ADynControlType in [jctDBEdit, jctDBText, jctDBListBox, jctDBComboBox, jctDBImage, ! jctDBRadioGroup, jctDBMemo, jctDBDateTimeEdit, jctDBDateEdit, jctDBTimeEdit, ! jctDBCalculateEdit, jctDBSpinEdit, jctDBDirectoryEdit, jctDBFileNameEdit, jctDBGrid] then Valid := Valid and Supports(AControlClass, IJvDynControlDataBase); Result := Valid; --- 151,196 ---- begin Valid := inherited IsControlTypeValid(ADynControlType, AControlClass); ! // if ADynControlType = jctDBText then ! // Valid := Valid and Supports(AControlClass, IJvDynControlLabel) ! // else ! if ADynControlType = jctDBButtonEdit then ! Valid := Valid and Supports(AControlClass, IJvDynControlButton) and ! Supports(AControlClass, IJvDynControlData) ! else if ADynControlType = jctDBMemo then ! Valid := Valid and Supports(AControlClass, IJvDynControlItems) and Supports(AControlClass, IJvDynControlData) and ! Supports(AControlClass, IJvDynControlMemo) ! else if (ADynControlType = jctDBRadioGroup) or ! (ADynControlType = jctDBComboBox) then ! Valid := Valid and Supports(AControlClass, IJvDynControlItems) and ! Supports(AControlClass, IJvDynControlData) ! else if (ADynControlType = jctDBEdit) or ! (ADynControlType = jctDBCalculateEdit) or ! (ADynControlType = jctDBSpinEdit) or ! (ADynControlType = jctDBCheckBox) or ! (ADynControlType = jctDBDateTimeEdit) or ! (ADynControlType = jctDBDateEdit) or ! (ADynControlType = jctDBTimeEdit) or ! (ADynControlType = jctDBDirectoryEdit) or ! (ADynControlType = jctDBFileNameEdit) then ! Valid := Valid and Supports(AControlClass, IJvDynControlData); ! if (ADynControlType = jctDBEdit) or ! (ADynControlType = jctDBCalculateEdit) or ! (ADynControlType = jctDBSpinEdit) or ! (ADynControlType = jctDBCheckBox) or ! (ADynControlType = jctDBDateTimeEdit) or ! (ADynControlType = jctDBDateEdit) or ! (ADynControlType = jctDBTimeEdit) or ! (ADynControlType = jctDBDirectoryEdit) or ! (ADynControlType = jctDBFileNameEdit) or ! (ADynControlType = jctDBText) or ! (ADynControlType = jctDBListBox) or ! (ADynControlType = jctDBImage) or ! (ADynControlType = jctDBRadioGroup) or ! (ADynControlType = jctDBMemo) or ! (ADynControlType = jctDBGrid) then Valid := Valid and Supports(AControlClass, IJvDynControlDataBase); Result := Valid; |