diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/llbutton.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 74926f2b52..5f7d917b4e 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -68,7 +68,7 @@ class LLButton { public: // simple button with text label - LLButton(const LLString& name, const LLRect &rect, const LLString& control_name = "", + LLButton(const LLString& name, const LLRect &rect, const LLString& control_name = LLString(), void (*on_click)(void*) = NULL, void *data = NULL); LLButton(const LLString& name, const LLRect& rect, @@ -152,12 +152,12 @@ public: virtual void setValue(const LLSD& value ); virtual LLSD getValue() const; - void setLabel( const LLString& label); - virtual BOOL setLabelArg( const LLString& key, const LLString& text ); - void setLabelUnselected(const LLString& label); - void setLabelSelected(const LLString& label); - void setDisabledLabel(const LLString& disabled_label); - void setDisabledSelectedLabel(const LLString& disabled_label); + void setLabel( const LLStringExplicit& label); + virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text ); + void setLabelUnselected(const LLStringExplicit& label); + void setLabelSelected(const LLStringExplicit& label); + void setDisabledLabel(const LLStringExplicit& disabled_label); + void setDisabledSelectedLabel(const LLStringExplicit& disabled_label); void setDisabledLabelColor( const LLColor4& c ) { mDisabledLabelColor = c; } void setFont(const LLFontGL *font) @@ -288,12 +288,12 @@ class LLSquareButton { public: LLSquareButton(const LLString& name, const LLRect& rect, - const LLString& label, - const LLFontGL *font = NULL, - const LLString& control_name = "", - void (*click_callback)(void*) = NULL, - void *callback_data = NULL, - const LLString& selected_label = LLString::null ); + const LLString& label, + const LLFontGL *font = NULL, + const LLString& control_name = LLString(), + void (*click_callback)(void*) = NULL, + void *callback_data = NULL, + const LLString& selected_label = LLString::null ); }; // Helpful functions |