refactor: factored out some more label code and cleaned up a bunch of mess. Skinners please check your skins for any oddness.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27702 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 1 insertions, 35 deletions

diff --git a/guilib/GUIControl.h b/guilib/GUIControl.h
index d6fe758bbd..f7408e6784 100644
--- a/guilib/GUIControl.h
+++ b/guilib/GUIControl.h
@@ -30,9 +30,8 @@
 
 #include "GraphicContext.h" // needed by any rendering operation (all controls)
 #include "GUIMessage.h"     // needed by practically all controls
-#include "GUIFont.h"        // needed for the CAngle member (CLabelInfo) among other stuff
 #include "VisibleEffect.h"  // needed for the CAnimation members
-#include "GUIInfoTypes.h"   // needed for CGuiInfoColor to handle infolabel'ed colors
+#include "GUIInfoTypes.h"   // needed for CGUIInfoColor to handle infolabel'ed colors
 #include "GUIActionDescriptor.h"
 
 class CGUIListItem; // forward
@@ -41,39 +40,6 @@ class CMouseEvent;
 
 enum ORIENTATION { HORIZONTAL = 0, VERTICAL };
 
-class CLabelInfo
-{
-public:
-  CLabelInfo()
-  {
-    font = NULL;
-    align = XBFONT_LEFT;
-    offsetX = offsetY = 0;
-    width = 0;
-    angle = 0;
-  };
-  void UpdateColors()
-  {
-    textColor.Update();
-    shadowColor.Update();
-    selectedColor.Update();
-    disabledColor.Update();
-    focusedColor.Update();
-  };
-
-  CGUIInfoColor textColor;
-  CGUIInfoColor shadowColor;
-  CGUIInfoColor selectedColor;
-  CGUIInfoColor disabledColor;
-  CGUIInfoColor focusedColor;
-  uint32_t align;
-  float offsetX;
-  float offsetY;
-  float width;
-  float angle;
-  CGUIFont *font;
-};
-
 class CControlState
 {
 public: