Index: intern/ghost/GHOST_Types.h
===================================================================
--- intern/ghost/GHOST_Types.h	(revision 11466)
+++ intern/ghost/GHOST_Types.h	(working copy)
@@ -40,7 +40,8 @@
 typedef	unsigned int		GHOST_TUns32;
 
 #ifdef WIN32
-#define WM_BLND_3DX			WM_USER + 1
+#define WM_BLND_NDOF_AXIS	WM_USER + 1
+#define WM_BLND_NDOF_BTN 	WM_USER + 2
 #endif
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
Index: intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- intern/ghost/intern/GHOST_SystemWin32.cpp	(revision 11466)
+++ intern/ghost/intern/GHOST_SystemWin32.cpp	(working copy)
@@ -843,7 +843,7 @@
 					 * In GHOST, we let DefWindowProc call the timer callback.
 					 */
 					break;
-				case WM_BLND_3DX:
+				case WM_BLND_NDOF_AXIS:
 					{
 						GHOST_TEventNDOFData ndofdata;
 						system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
@@ -854,6 +854,17 @@
 								window, ndofdata));
 					}
 					break;
+				case WM_BLND_NDOF_BTN:
+					{
+						GHOST_TEventNDOFData ndofdata;
+						system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
+						system->m_eventManager->
+							pushEvent(new GHOST_EventNDOF(
+								system->getMilliSeconds(), 
+								GHOST_kEventNDOFButton, 
+								window, ndofdata));
+					}
+					break;
 			}
 		}
 		else {