GuiInspector

-Required changes for guiInspector and slider.

engine/source/gui/containers/guiPanelCtrl.h

@@ -37,13 +37,10 @@ private:
    typedef GuiExpandCtrl Parent;
    GuiButtonCtrl*      mHeader;
 
-protected:
-	virtual bool calcExpandedExtent();
-
 public:
 	GuiPanelCtrl();
 	virtual ~GuiPanelCtrl();
-
+   virtual bool calcExpandedExtent();
 	bool onAdd();
 	virtual void onRender(Point2I offset, const RectI &updateRect);
 

engine/source/gui/guiSliderCtrl.cc

@@ -91,7 +91,7 @@ bool GuiSliderCtrl::onWake()
 }
 
 //----------------------------------------------------------------------------
-void GuiSliderCtrl::onMouseDown(const GuiEvent &event)
+void GuiSliderCtrl::onTouchDown(const GuiEvent &event)
 {
     if (!mActive || !mAwake || !mVisible)
         return;
@@ -111,7 +111,7 @@ void GuiSliderCtrl::onMouseDown(const GuiEvent &event)
 }
 
 //----------------------------------------------------------------------------
-void GuiSliderCtrl::onMouseDragged(const GuiEvent &event)
+void GuiSliderCtrl::onTouchDragged(const GuiEvent &event)
 {
     if (!mActive || !mAwake || !mVisible)
         return;
@@ -147,7 +147,7 @@ void GuiSliderCtrl::onMouseDragged(const GuiEvent &event)
 }
 
 //----------------------------------------------------------------------------
-void GuiSliderCtrl::onMouseUp(const GuiEvent &)
+void GuiSliderCtrl::onTouchUp(const GuiEvent &)
 {
     if (!mActive || !mAwake || !mVisible)
         return;
@@ -156,7 +156,7 @@ void GuiSliderCtrl::onMouseUp(const GuiEvent &)
     execConsoleCallback();
 }
 
-void GuiSliderCtrl::onMouseEnter(const GuiEvent &event)
+void GuiSliderCtrl::onTouchEnter(const GuiEvent &event)
 {
     setUpdate();
     if (isMouseLocked())
@@ -176,7 +176,7 @@ void GuiSliderCtrl::onMouseEnter(const GuiEvent &event)
     }
 }
 
-void GuiSliderCtrl::onMouseLeave(const GuiEvent &)
+void GuiSliderCtrl::onTouchLeave(const GuiEvent &)
 {
     setUpdate();
     if (isMouseLocked())

engine/source/gui/guiSliderCtrl.h

@@ -66,11 +66,11 @@ public:
    //Parental methods
    bool onWake();
 
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &);
-   void onMouseLeave(const GuiEvent &);
-   void onMouseEnter(const GuiEvent &);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &);
+   void onTouchLeave(const GuiEvent &);
+   void onTouchEnter(const GuiEvent &);
    F32 getValue() { return mValue; }
    void setScriptValue(const char *val);