Skip to content
This repository
Browse code

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 authored March 23, 2013
2  xbmc/windowing/WinEvents.h
@@ -30,8 +30,6 @@ typedef bool (* PHANDLE_EVENT_FUNC)(XBMC_Event& newEvent);
30 30
 
31 31
 class CWinEventsBase
32 32
 {
33  
-public:
34  
-  static PHANDLE_EVENT_FUNC m_pEventFunc;
35 33
 };
36 34
 
37 35
 #if   defined(TARGET_WINDOWS)
2  xbmc/windowing/WinEventsLinux.cpp
@@ -30,8 +30,6 @@
30 30
 #include "utils/log.h"
31 31
 #include "powermanagement/PowerManager.h"
32 32
 
33  
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
34  
-
35 33
 bool CWinEventsLinux::m_initialized = false;
36 34
 CLinuxInputDevices CWinEventsLinux::m_devices;
37 35
 
2  xbmc/windowing/WinEventsSDL.cpp
@@ -43,8 +43,6 @@
43 43
 #include "utils/log.h"
44 44
 #endif
45 45
 
46  
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
47  
-
48 46
 #if defined(_LINUX) && !defined(__APPLE__)
49 47
 // The following chunk of code is Linux specific. For keys that have
50 48
 // with keysym.sym set to zero it checks the scan code, and sets the sym
2  xbmc/windowing/android/WinEventsAndroid.cpp
@@ -27,8 +27,6 @@
27 27
 
28 28
 static CCriticalSection g_inputCond;
29 29
 
30  
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
31  
-
32 30
 static std::list<XBMC_Event> events;
33 31
 
34 32
 void CWinEventsAndroid::DeInit()
2  xbmc/windowing/osx/WinEventsIOS.mm
@@ -30,8 +30,6 @@
30 30
 
31 31
 static CCriticalSection g_inputCond;
32 32
 
33  
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
34  
-
35 33
 static std::list<XBMC_Event> events;
36 34
 
37 35
 void CWinEventsIOS::DeInit()
2  xbmc/windowing/windows/WinEventsWin32.cpp
@@ -64,7 +64,7 @@ uint32_t g_uQueryCancelAutoPlay = 0;
64 64
 
65 65
 int XBMC_TranslateUNICODE = 1;
66 66
 
67  
-PHANDLE_EVENT_FUNC CWinEventsBase::m_pEventFunc = NULL;
  67
+PHANDLE_EVENT_FUNC CWinEventsWin32::m_pEventFunc = NULL;
68 68
 int CWinEventsWin32::m_lastGesturePosX = 0;
69 69
 int CWinEventsWin32::m_lastGesturePosY = 0;
70 70
 
1  xbmc/windowing/windows/WinEventsWin32.h
@@ -30,6 +30,7 @@ class CWinEventsWin32 : public CWinEventsBase
30 30
 public:
31 31
   static bool MessagePump();
32 32
   static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
  33
+  static PHANDLE_EVENT_FUNC m_pEventFunc;
33 34
 private:
34 35
   static void RegisterDeviceInterfaceToHwnd(GUID InterfaceClassGuid, HWND hWnd, HDEVNOTIFY *hDeviceNotify);
35 36
   static void WindowFromScreenCoords(HWND hWnd, POINT *point);

0 notes on commit 5cf890c

Please sign in to comment.
Something went wrong with that request. Please try again.