diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llui/llcombobox.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index bc98690a01..517210f629 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -39,7 +39,6 @@ #include "llbutton.h" #include "lluictrl.h" #include "llctrlselectioninterface.h" -#include "llimagegl.h" #include "llrect.h" #include "llscrolllistctrl.h" #include "lllineeditor.h" @@ -84,7 +83,6 @@ public: Optional<commit_callback_t> prearrange_callback, text_entry_callback, selection_callback; - Optional<LLUIImage*> arrow_image; Optional<EPreferredPosition, PreferredPositionValues> list_position; @@ -93,6 +91,8 @@ public: Optional<LLScrollListCtrl::Params> combo_list; Optional<LLLineEditor::Params> combo_editor; + Optional<LLButton::Params> drop_down_button; + Multiple<ItemParams> items; Params(); @@ -233,12 +233,4 @@ private: commit_callback_t mTextEntryCallback; commit_callback_t mSelectionCallback; }; - -#ifdef LL_WINDOWS -#ifndef INSTANTIATE_GETCHILD_COMBOBOX -#pragma warning (disable : 4231) -extern template LLComboBox* LLView::getChild<LLComboBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const; -#endif -#endif - #endif |