Merge pull request #4687 from ruuk/textboxgettext

[vuplus_xbmc] / xbmc / guilib / GUITextBox.h

diff --git a/xbmc/guilib/GUITextBox.h b/xbmc/guilib/GUITextBox.h
index 40edfb4..995ed9e 100644 (file)
--- a/xbmc/guilib/GUITextBox.h
+++ b/xbmc/guilib/GUITextBox.h
@@ -52,6 +52,8 @@ public:
   virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
   virtual void Render();
   virtual bool OnMessage(CGUIMessage& message);
+  virtual float GetHeight() const;
+  void SetMinHeight(float minHeight);
 
   void SetPageControl(int pageControl);
 
@@ -60,6 +62,7 @@ public:
   void SetAutoScrolling(const TiXmlNode *node);
   void ResetAutoScrolling();
   CStdString GetLabel(int info) const;
+  CStdString GetDescription() const;
 
   void Scroll(unsigned int offset);
 
@@ -72,6 +75,10 @@ protected:
   unsigned int GetRows() const;
   int GetCurrentPage() const;
 
+  // auto-height
+  float m_minHeight;
+  float m_renderHeight;
+
   // offset of text in the control for scrolling
   unsigned int m_offset;
   float m_scrollOffset;