Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2468 from ulion/winevent_cleanup

[WinEvents] Move win32 only code into win32 file.
  • Loading branch information...
commit 5cf890ce2105d50fc8b8b0bd1440fc7c3ebb4251 2 parents a0f7b47 + bb3b276
@ulion ulion authored
View
2  xbmc/windowing/WinEvents.h
@@ -30,8 +30,6 @@ typedef bool (* PHANDLE_EVENT_FUNC)(XBMC_Event& newEvent);
class CWinEventsBase
{
-public:
- static PHANDLE_EVENT_FUNC m_pEventFunc;
};
#if defined(TARGET_WINDOWS)
View
2  xbmc/windowing/WinEventsLinux.cpp
@@ -30,8 +30,6 @@
#include "utils/log.h"
#include "powermanagement/PowerManager.h"
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
-
bool CWinEventsLinux::m_initialized = false;
CLinuxInputDevices CWinEventsLinux::m_devices;
View
2  xbmc/windowing/WinEventsSDL.cpp
@@ -43,8 +43,6 @@
#include "utils/log.h"
#endif
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
-
#if defined(_LINUX) && !defined(__APPLE__)
// The following chunk of code is Linux specific. For keys that have
// with keysym.sym set to zero it checks the scan code, and sets the sym
View
2  xbmc/windowing/android/WinEventsAndroid.cpp
@@ -27,8 +27,6 @@
static CCriticalSection g_inputCond;
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
-
static std::list<XBMC_Event> events;
void CWinEventsAndroid::DeInit()
View
2  xbmc/windowing/osx/WinEventsIOS.mm
@@ -30,8 +30,6 @@
static CCriticalSection g_inputCond;
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
-
static std::list<XBMC_Event> events;
void CWinEventsIOS::DeInit()
View
2  xbmc/windowing/windows/WinEventsWin32.cpp
@@ -64,7 +64,7 @@ uint32_t g_uQueryCancelAutoPlay = 0;
int XBMC_TranslateUNICODE = 1;
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
+PHANDLE_EVENT_FUNC CWinEventsWin32::m_pEventFunc = NULL;
int CWinEventsWin32::m_lastGesturePosX = 0;
int CWinEventsWin32::m_lastGesturePosY = 0;
View
1  xbmc/windowing/windows/WinEventsWin32.h
@@ -30,6 +30,7 @@ class CWinEventsWin32 : public CWinEventsBase
public:
static bool MessagePump();
static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ static PHANDLE_EVENT_FUNC m_pEventFunc;
private:
static void RegisterDeviceInterfaceToHwnd(GUID InterfaceClassGuid, HWND hWnd, HDEVNOTIFY *hDeviceNotify);
static void WindowFromScreenCoords(HWND hWnd, POINT *point);
Please sign in to comment.
Something went wrong with that request. Please try again.