diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llui/llradiogroup.h | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llui/llradiogroup.h')
-rw-r--r-- | linden/indra/llui/llradiogroup.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h index e208b79..c8b96db 100644 --- a/linden/indra/llui/llradiogroup.h +++ b/linden/indra/llui/llradiogroup.h | |||
@@ -43,7 +43,7 @@ | |||
43 | class LLRadioCtrl : public LLCheckBoxCtrl | 43 | class LLRadioCtrl : public LLCheckBoxCtrl |
44 | { | 44 | { |
45 | public: | 45 | public: |
46 | LLRadioCtrl(const LLString& name, const LLRect& rect, const LLString& label, const LLFontGL* font = NULL, | 46 | LLRadioCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font = NULL, |
47 | void (*commit_callback)(LLUICtrl*, void*) = NULL, void* callback_userdata = NULL) : | 47 | void (*commit_callback)(LLUICtrl*, void*) = NULL, void* callback_userdata = NULL) : |
48 | LLCheckBoxCtrl(name, rect, label, font, commit_callback, callback_userdata, FALSE, RADIO_STYLE) | 48 | LLCheckBoxCtrl(name, rect, label, font, commit_callback, callback_userdata, FALSE, RADIO_STYLE) |
49 | { | 49 | { |
@@ -67,15 +67,15 @@ public: | |||
67 | // Build a radio group. The number (0...n-1) of the currently selected | 67 | // Build a radio group. The number (0...n-1) of the currently selected |
68 | // element will be stored in the named control. After the control is | 68 | // element will be stored in the named control. After the control is |
69 | // changed the callback will be called. | 69 | // changed the callback will be called. |
70 | LLRadioGroup(const LLString& name, const LLRect& rect, | 70 | LLRadioGroup(const std::string& name, const LLRect& rect, |
71 | const LLString& control_name, | 71 | const std::string& control_name, |
72 | LLUICtrlCallback callback = NULL, | 72 | LLUICtrlCallback callback = NULL, |
73 | void* userdata = NULL, | 73 | void* userdata = NULL, |
74 | BOOL border = TRUE); | 74 | BOOL border = TRUE); |
75 | 75 | ||
76 | // Another radio group constructor, but this one doesn't rely on | 76 | // Another radio group constructor, but this one doesn't rely on |
77 | // needing a control | 77 | // needing a control |
78 | LLRadioGroup(const LLString& name, const LLRect& rect, | 78 | LLRadioGroup(const std::string& name, const LLRect& rect, |
79 | S32 initial_index, | 79 | S32 initial_index, |
80 | LLUICtrlCallback callback = NULL, | 80 | LLUICtrlCallback callback = NULL, |
81 | void* userdata = NULL, | 81 | void* userdata = NULL, |
@@ -106,7 +106,7 @@ public: | |||
106 | // You must use this method to add buttons to a radio group. | 106 | // You must use this method to add buttons to a radio group. |
107 | // Don't use addChild -- it won't set the callback function | 107 | // Don't use addChild -- it won't set the callback function |
108 | // correctly. | 108 | // correctly. |
109 | LLRadioCtrl* addRadioButton(const LLString& name, const LLString& label, const LLRect& rect, const LLFontGL* font); | 109 | LLRadioCtrl* addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font); |
110 | LLRadioCtrl* getRadioButton(const S32& index) { return mRadioButtons[index]; } | 110 | LLRadioCtrl* getRadioButton(const S32& index) { return mRadioButtons[index]; } |
111 | // Update the control as needed. Userdata must be a pointer to the button. | 111 | // Update the control as needed. Userdata must be a pointer to the button. |
112 | static void onClickButton(LLUICtrl* radio, void* userdata); | 112 | static void onClickButton(LLUICtrl* radio, void* userdata); |