Index: intern/ghost/intern/GHOST_NDOFManager.cpp =================================================================== --- intern/ghost/intern/GHOST_NDOFManager.cpp (revision 11249) +++ intern/ghost/intern/GHOST_NDOFManager.cpp (working copy) @@ -20,10 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ - #include "GHOST_NDOFManager.h" - // the variable is outside the class because it must be accessed from plugin static volatile GHOST_TEventNDOFData currentNdofValues = {0,0,0,0,0,0,0,0,0,0,0}; @@ -56,7 +54,6 @@ m_DeviceHandle = 0; } - void GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window, GHOST_NDOFLibraryInit_fp setNdofLibraryInit, @@ -70,9 +67,7 @@ if (ndofLibraryInit && ndofDeviceOpen) { printf("%i client \n", ndofLibraryInit()); - - m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues); - + #if defined(_WIN32) || defined(__APPLE__) m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues); #else @@ -121,7 +116,8 @@ } -void GHOST_NDOFManager::GHOST_NDOFGetDatas(GHOST_TEventNDOFData &datas) const +void +GHOST_NDOFManager::GHOST_NDOFGetDatas(GHOST_TEventNDOFData &datas) const { datas.tx = currentNdofValues.tx; datas.ty = currentNdofValues.ty; Index: intern/ghost/intern/GHOST_SystemX11.cpp =================================================================== --- intern/ghost/intern/GHOST_SystemX11.cpp (revision 11248) +++ intern/ghost/intern/GHOST_SystemX11.cpp (working copy) @@ -451,7 +451,7 @@ { XClientMessageEvent & xcme = xe->xclient; -#ifndef __sgi +#ifndef __sgi if (xcme.data.l[0] == m_delete_window_atom) { g_event = new GHOST_Event( @@ -484,7 +484,7 @@ } else { /* Unknown client message, ignore */ } -#endif + break; } @@ -543,7 +543,7 @@ { const vector& v(m_windowManager->getWindows()); if (v.size() > 0) - sNdofInfo.window = static_cast(v[0])->getXWindow(); + sNdofInfo.window = static_cast(v[0])->getXWindow(); sNdofInfo.display = m_display; sNdofInfo.currValues = currentNdofValues; return (void*)&sNdofInfo; Index: intern/ghost/intern/GHOST_NDOFManager.h =================================================================== --- intern/ghost/intern/GHOST_NDOFManager.h (revision 11248) +++ intern/ghost/intern/GHOST_NDOFManager.h (working copy) @@ -26,19 +26,10 @@ #include "GHOST_System.h" #include "GHOST_IWindow.h" - - class GHOST_NDOFManager { public: - /** - * Constructor. - */ GHOST_NDOFManager(); - - /** - * Destructor. - */ virtual ~GHOST_NDOFManager(); void deviceOpen(GHOST_IWindow* window, @@ -55,5 +46,4 @@ void* m_DeviceHandle; }; - #endif