summaryrefslogtreecommitdiffstats
path: root/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
diff options
context:
space:
mode:
Diffstat (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h')
-rw-r--r--xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h27
1 files changed, 8 insertions, 19 deletions
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
index c369c62..f188f34 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -1,24 +1,13 @@
1#pragma once
2/* 1/*
3 * Copyright (C) 2005-2017 Team Kodi 2 * Copyright (C) 2005-2018 Team Kodi
4 * http://kodi.tv 3 * This file is part of Kodi - https://kodi.tv
5 *
6 * This Program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2, or (at your option)
9 * any later version.
10 *
11 * This Program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with KODI; see the file COPYING. If not, see
18 * <http://www.gnu.org/licenses/>.
19 * 4 *
5 * SPDX-License-Identifier: GPL-2.0-or-later
6 * See LICENSES/README.md for more information.
20 */ 7 */
21 8
9#pragma once
10
22#include "../AddonBase.h" 11#include "../AddonBase.h"
23#include "ListItem.h" 12#include "ListItem.h"
24 13
@@ -98,7 +87,7 @@ namespace gui
98 if (!m_controlHandle) 87 if (!m_controlHandle)
99 kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow can't create window class from Kodi !!!"); 88 kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow can't create window class from Kodi !!!");
100 m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, this, 89 m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
101 CBOnInit, CBOnFocus, CBOnClick, CBOnAction, 90 CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
102 CBGetContextButtons, CBOnContextButton); 91 CBGetContextButtons, CBOnContextButton);
103 } 92 }
104 //-------------------------------------------------------------------------- 93 //--------------------------------------------------------------------------
@@ -867,7 +856,7 @@ namespace gui
867 static_cast<CWindow*>(cbhdl)->GetContextButtons(itemNumber, buttonList); 856 static_cast<CWindow*>(cbhdl)->GetContextButtons(itemNumber, buttonList);
868 if (!buttonList.empty()) 857 if (!buttonList.empty())
869 { 858 {
870 unsigned int presentSize = buttonList.size(); 859 unsigned int presentSize = static_cast<unsigned int>(buttonList.size());
871 if (presentSize > *size) 860 if (presentSize > *size)
872 kodi::Log(ADDON_LOG_WARNING, "GetContextButtons: More as allowed '%i' entries present!", *size); 861 kodi::Log(ADDON_LOG_WARNING, "GetContextButtons: More as allowed '%i' entries present!", *size);
873 else 862 else