commiting fixes from Ettore for building on linux & win 32

4 files changed, 12 insertions, 23 deletions

diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index f88016b6b3e..501d6c57dd5 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -70,9 +70,6 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
     if (ndofLibraryInit  && ndofDeviceOpen)
     {
        printf("%i client \n", ndofLibraryInit());
-		
-		m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
-		
 		#if defined(_WIN32) || defined(__APPLE__)
 			m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
 		#else
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h
index 03037797e1e..c1f0b2c80af 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@ -31,14 +31,7 @@
 class GHOST_NDOFManager
 {
 public:
-	/**
-	 * Constructor.
-	 */
 	GHOST_NDOFManager();
-
-	/**
-	 * Destructor.
-	 */
 	virtual ~GHOST_NDOFManager();
 
     void deviceOpen(GHOST_IWindow* window,
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index bfd41e29946..89a96987113 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -843,6 +843,17 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 					 * In GHOST, we let DefWindowProc call the timer callback.
 					 */
 					break;
+				case WM_BLND_3DX:
+					{
+						GHOST_TEventNDOFData ndofdata;
+						system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
+						system->m_eventManager->
+							pushEvent(new GHOST_EventNDOF(
+								system->getMilliSeconds(), 
+								GHOST_kEventNDOFMotion, 
+								window, ndofdata));
+					}
+					break;
 			}
 		}
 		else {
@@ -855,17 +866,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			   WM_CREATE			0x01
 			   We let DefWindowProc do the work.
 			*/
-				case WM_BLND_3DX:
-					{
-						GHOST_TEventNDOFData ndofdata;
-						system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
-						system->m_eventManager->
-							pushEvent(new GHOST_EventNDOF(
-								system->getMilliSeconds(), 
-								GHOST_kEventNDOFMotion, 
-								window, ndofdata));
-					}
-					break;
 		}
 	}
 	else {
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 6eefb48f6e8..e3d4ee405e8 100755
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -484,7 +484,6 @@ GHOST_SystemX11::processEvent(XEvent *xe)
 			} else {
 				/* Unknown client message, ignore */
 			}
-#endif
 			break;
 		}
 			
@@ -543,7 +542,7 @@ prepareNdofInfo(volatile GHOST_TEventNDOFData *currentNdofValues)
 {
 	const vector<GHOST_IWindow*>& v(m_windowManager->getWindows());
 	if (v.size() > 0)
-	sNdofInfo.window = static_cast<GHOST_WindowX11*>(v[0])->getXWindow();
+		sNdofInfo.window = static_cast<GHOST_WindowX11*>(v[0])->getXWindow();
 	sNdofInfo.display = m_display;
 	sNdofInfo.currValues = currentNdofValues;
 	return (void*)&sNdofInfo;