diff options
Diffstat (limited to 'xbmc/guilib/GUIButtonControl.cpp')
| -rw-r--r-- | xbmc/guilib/GUIButtonControl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/guilib/GUIButtonControl.cpp b/xbmc/guilib/GUIButtonControl.cpp index e1aea6c550..ac0c1889e4 100644 --- a/xbmc/guilib/GUIButtonControl.cpp +++ b/xbmc/guilib/GUIButtonControl.cpp @@ -122,7 +122,7 @@ void CGUIButtonControl::ProcessText(unsigned int currentTime) changed |= m_label.SetScrolling(HasFocus()); // render the second label if it exists - CStdString label2(m_info2.GetLabel(m_parentID)); + std::string label2(m_info2.GetLabel(m_parentID)); changed |= m_label2.SetMaxRect(m_posX, m_posY, m_width, m_height); changed |= m_label2.SetText(label2); if (!label2.empty()) @@ -288,13 +288,13 @@ std::string CGUIButtonControl::GetDescription() const return strLabel; } -CStdString CGUIButtonControl::GetLabel2() const +std::string CGUIButtonControl::GetLabel2() const { - CStdString strLabel(m_info2.GetLabel(m_parentID)); + std::string strLabel(m_info2.GetLabel(m_parentID)); return strLabel; } -void CGUIButtonControl::PythonSetLabel(const CStdString &strFont, const string &strText, color_t textColor, color_t shadowColor, color_t focusedColor) +void CGUIButtonControl::PythonSetLabel(const std::string &strFont, const string &strText, color_t textColor, color_t shadowColor, color_t focusedColor) { m_label.GetLabelInfo().font = g_fontManager.GetFont(strFont); m_label.GetLabelInfo().textColor = textColor; |