diff options
| -rw-r--r-- | guilib/GUIWindow.cpp | 5 | ||||
| -rw-r--r-- | guilib/GUIWindow.h | 2 | ||||
| -rw-r--r-- | xbmc/osx/WinSystemOSXGL.mm | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/guilib/GUIWindow.cpp b/guilib/GUIWindow.cpp index f13ade167a..c4bfb9422d 100644 --- a/guilib/GUIWindow.cpp +++ b/guilib/GUIWindow.cpp @@ -721,6 +721,11 @@ bool CGUIWindow::ControlGroupHasFocus(int groupID, int controlID) return false; } +bool CGUIWindow::HasID(int id) +{ + return (id >= m_controlID && id < m_controlID + m_idRange); +} + void CGUIWindow::SaveControlStates() { ResetControlStates(); diff --git a/guilib/GUIWindow.h b/guilib/GUIWindow.h index dc3c3bfd84..cab88c1203 100644 --- a/guilib/GUIWindow.h +++ b/guilib/GUIWindow.h @@ -114,7 +114,7 @@ public: virtual bool OnMessage(CGUIMessage& message); bool ControlGroupHasFocus(int groupID, int controlID); - virtual bool HasID(int id) { return (id >= m_controlID && id < m_controlID + m_idRange); }; + virtual bool HasID(int id); void SetIDRange(int range) { m_idRange = range; }; int GetIDRange() const { return m_idRange; }; int GetPreviousWindow() { return m_previousWindow; }; diff --git a/xbmc/osx/WinSystemOSXGL.mm b/xbmc/osx/WinSystemOSXGL.mm index 73b8f77bb9..37a98b3620 100644 --- a/xbmc/osx/WinSystemOSXGL.mm +++ b/xbmc/osx/WinSystemOSXGL.mm @@ -23,8 +23,10 @@ //hack around problem with xbmc's typedef int BOOL // and obj-c's typedef unsigned char BOOL -#define BOOL XBMC_BOOL +#define BOOL XBMC_BOOL +#include "../guilib/Texture.h" #include "WinSystemOSXGL.h" +#include "RenderSystemGL.h" #include "SystemGlobals.h" #undef BOOL |