#715 nsDialogs: ComboBox not like IO, DropList missing

[Anders]

The nsD combobox had no "combostyle" set, this patch adds ${CBS_DROPDOWN} to combobox and adds the DropList control aka ${CBS_DROPDOWNLIST}. The nsD macro did not support this so had to add a Ex version (this adds even more compiler output, maybe its time the nsD include file gets some !verbose loving)

Too lazy to generate a proper patch, so I hope this paste comes out ok:

!macro __NSD_DefineControlEx Name BaseName OrStyle
!if "${OrStyle}" != ""
!define __NSD_DefineControlEx_S ${OrStyle}|${__NSD_${BaseName}_STYLE}
!else
!define __NSD_DefineControlEx_S ${__NSD_${BaseName}_STYLE}
!endif
!define NSD_Create${NAME} "nsDialogs::CreateControl /NOUNLOAD ${__NSD_${BaseName}_CLASS} ${__NSD_DefineControlEx_S} ${__NSD_${BaseName}_EXSTYLE}"
!undef __NSD_DefineControlEx_S
!macroend
!macro __NSD_DefineControl NAME
!insertmacro __NSD_DefineControlEx ${Name} ${Name} ""
!macroend

!insertmacro __NSD_DefineControl HLine
!insertmacro __NSD_DefineControl VLine
!insertmacro __NSD_DefineControl Label
!insertmacro __NSD_DefineControl Icon
!insertmacro __NSD_DefineControl Bitmap
!insertmacro __NSD_DefineControl BrowseButton
!insertmacro __NSD_DefineControl Link
!insertmacro __NSD_DefineControl Button
!insertmacro __NSD_DefineControl GroupBox
!insertmacro __NSD_DefineControl CheckBox
!insertmacro __NSD_DefineControl RadioButton
!insertmacro __NSD_DefineControl Text
!insertmacro __NSD_DefineControl FileRequest
!insertmacro __NSD_DefineControl DirRequest
!insertmacro __NSD_DefineControlEx ComboBox ComboBox ${CBS_DROPDOWN}
!insertmacro __NSD_DefineControlEx DropList ComboBox ${CBS_DROPDOWNLIST}
!insertmacro __NSD_DefineControl ListBox

[Amir Szekely]

Logged In: YES
user_id=584402
Originator: NO

Thanks, fixed.