Second Life viewer sources 1.19.1.0

1 files changed, 14 insertions, 23 deletions

diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index c5a36f5..f1f971e 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -1,6 +1,6 @@
 /** 
  * @file llspinctrl.h
- * @brief LLSpinCtrl base class
+ * @brief Typical spinner with "up" and "down" arrow buttons.
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
@@ -47,15 +47,6 @@ const S32	SPINCTRL_SPACING		=  2;							// space between label right and button
 const S32       SPINCTRL_HEIGHT                 =  2 * SPINCTRL_BTN_HEIGHT;
 const S32       SPINCTRL_DEFAULT_LABEL_WIDTH = 10;
 
-//
-// Classes
-//
-class LLFontGL;
-class LLButton;
-class LLTextBox;
-class LLLineEditor;
-class LLUICtrlFactory;
-
 
 class LLSpinCtrl
 : public LLUICtrl
@@ -70,31 +61,33 @@ public:
                 const LLString& control_name = LLString(),
                 S32 label_width = SPINCTRL_DEFAULT_LABEL_WIDTH );
 
-        virtual ~LLSpinCtrl();
+        virtual ~LLSpinCtrl() {} // Children all cleaned up by default view destructor.
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SPINNER; }
         virtual LLString getWidgetTag() const { return LL_SPIN_CTRL_TAG; }
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
-        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
 
         virtual void    setValue(const LLSD& value );
-        virtual LLSD    getValue() const;
-                        F32             get() { return (F32)getValue().asReal(); }
+        virtual LLSD    getValue() const { return mValue; }
+                        F32             get() const { return (F32)getValue().asReal(); }
                         void    set(F32 value) { setValue(value); mInitialValue = value; }
 
         virtual void    setMinValue(LLSD min_value)     { setMinValue((F32)min_value.asReal()); }
         virtual void    setMaxValue(LLSD max_value)     { setMaxValue((F32)max_value.asReal());  }
 
-        BOOL                    isMouseHeldDown();
+        BOOL                    isMouseHeldDown() const;
 
         virtual void    setEnabled( BOOL b );
         virtual void    setFocus( BOOL b );
         virtual void    clear();
-        virtual BOOL    isDirty() const;
+        virtual BOOL    isDirty() const { return( mValue != mInitialValue ); }
 
         virtual void    setPrecision(S32 precision);
         virtual void    setMinValue(F32 min)                    { mMinValue = min; }
         virtual void    setMaxValue(F32 max)                    { mMaxValue = max; }
         virtual void    setIncrement(F32 inc)                   { mIncrement = inc; }
+        virtual F32             getMinValue()                   { return mMinValue ; }
+        virtual F32     getMaxValue()                   { return mMaxValue ; }
 
         void                    setLabel(const LLStringExplicit& label);
         void                    setLabelColor(const LLColor4& c)                        { mTextEnabledColor = c; }
@@ -119,12 +112,10 @@ public:
         static void             onUpBtn(void *userdata);
         static void             onDownBtn(void *userdata);
 
-protected:
+private:
         void                    updateEditor();
         void                    reportInvalidData();
 
-protected:
-
         F32                             mValue;
         F32                             mInitialValue;
         F32                             mMaxValue;
@@ -132,14 +123,14 @@ protected:
         F32                             mIncrement;
 
         S32                             mPrecision;
-        LLTextBox*              mLabelBox;
+        class LLTextBox*        mLabelBox;
 
-        LLLineEditor*   mEditor;
+        class LLLineEditor*     mEditor;
         LLColor4                mTextEnabledColor;
         LLColor4                mTextDisabledColor;
 
-        LLButton*               mUpBtn;
-        LLButton*               mDownBtn;
+        class LLButton*         mUpBtn;
+        class LLButton*         mDownBtn;
 
         BOOL                    mbHasBeenSet;
 };