diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-23 03:58:06 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-23 03:58:06 +0100 |
| commit | bfb0ba2b0417a043e39689592a807ede41f12034 (patch) | |
| tree | bc3227800a23dfa852e848b22ae218e624f98fd0 /guilib/GUILabelControl.h | |
| parent | 4e98a514c6a2975ec234fe19fe058e7e74bcfb7d (diff) | |
Revert "Merge remote branch 'upstream/master'"
This reverts commit 4e98a514c6a2975ec234fe19fe058e7e74bcfb7d, reversing
changes made to 8d73cbde1dcd240d80bee9301d0321703a15c995.
Diffstat (limited to 'guilib/GUILabelControl.h')
| -rw-r--r-- | guilib/GUILabelControl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/guilib/GUILabelControl.h b/guilib/GUILabelControl.h index 11a4c1106b..c82e89c891 100644 --- a/guilib/GUILabelControl.h +++ b/guilib/GUILabelControl.h @@ -50,7 +50,6 @@ public: virtual bool OnMessage(CGUIMessage& message); virtual CStdString GetDescription() const; virtual float GetWidth() const; - virtual void SetWidth(float width); const CLabelInfo& GetLabelInfo() const { return m_label.GetLabelInfo(); }; void SetLabel(const std::string &strLabel); |