diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/llui/llcombobox.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 0d6c3aef2e..c4db52cc97 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -73,8 +73,7 @@ public: virtual ~LLComboBox(); // LLView interface - virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_COMBO_BOX; } - virtual LLString getWidgetTag() const { return LL_COMBO_BOX_TAG; } + virtual LLXMLNodePtr getXML(bool save_children = true) const; static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); @@ -85,8 +84,8 @@ public: virtual void setEnabled(BOOL enabled); virtual BOOL handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect); - virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent); - virtual BOOL handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent); + virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual BOOL handleUnicodeCharHere(llwchar uni_char); // LLUICtrl interface virtual void clear(); // select nothing @@ -187,9 +186,8 @@ public: protected: LLButton* mButton; LLScrollListCtrl* mList; - LLViewBorder* mBorder; EPreferredPosition mListPosition; - LLPointer<LLImageGL> mArrowImage; + LLPointer<LLUIImage> mArrowImage; private: S32 mButtonPadding; @@ -211,9 +209,6 @@ public: void (*commit_callback)(LLUICtrl*, void*) = NULL, void *callback_userdata = NULL); - virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLYOUT_BUTTON; } - virtual LLString getWidgetTag() const { return LL_FLYOUT_BUTTON_TAG; } - virtual void updateLayout(); virtual void draw(); virtual void setEnabled(BOOL enabled); |