diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
commit | e58c809a5816383674d0f1957440fad728e88893 (patch) | |
tree | 83f1ff2c4bee8237c4557793143b2133623943a4 /indra/llui/llcombobox.h | |
parent | f9af1f4fca028709b0262c0e8c40eefc2ab13d00 (diff) | |
parent | e6c0615b97019cf9c8aee267513757c0c2510420 (diff) |
merge changes for STORM-1131
Diffstat (limited to 'indra/llui/llcombobox.h')
-rw-r--r-- | indra/llui/llcombobox.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 5f0e4a6843..e9ef9d07e4 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -73,7 +73,8 @@ public: allow_new_values; Optional<S32> max_chars; Optional<commit_callback_t> prearrange_callback, - text_entry_callback; + text_entry_callback, + text_changed_callback; Optional<EPreferredPosition, PreferredPositionValues> list_position; @@ -147,6 +148,9 @@ public: // This is probably a UI abuse. void setLabel(const LLStringExplicit& name); + // Updates the combobox label to match the selected list item. + void updateLabel(); + BOOL remove(const std::string& name); // remove item "name", return TRUE if found and removed BOOL setCurrentByIndex( S32 index ); @@ -190,6 +194,7 @@ public: void setPrearrangeCallback( commit_callback_t cb ) { mPrearrangeCallback = cb; } void setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; } + void setTextChangedCallback( commit_callback_t cb ) { mTextChangedCallback = cb; } void setButtonVisible(BOOL visible); @@ -220,6 +225,7 @@ private: BOOL mTextEntryTentative; commit_callback_t mPrearrangeCallback; commit_callback_t mTextEntryCallback; + commit_callback_t mTextChangedCallback; commit_callback_t mSelectionCallback; boost::signals2::connection mTopLostSignalConnection; S32 mLastSelectedIndex; |