making carbon to build again (note: NDOF is not working here)
authorDalai Felinto <dfelinto@gmail.com>
Thu, 1 Sep 2011 00:03:20 +0000 (00:03 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 1 Sep 2011 00:03:20 +0000 (00:03 +0000)
- fix typo
- isolate NDOF callsi in #ifdefs

intern/ghost/intern/GHOST_ISystemPaths.cpp
intern/ghost/intern/GHOST_SystemCarbon.cpp

index 8873398a320352e1aacc19003dc983936fe0ba22..1aa043ebc8025c77db0bab758e279db23f844bdb 100644 (file)
@@ -70,7 +70,7 @@ GHOST_TSuccess GHOST_ISystemPaths::create()
 #              ifdef GHOST_COCOA
                        m_systemPaths = new GHOST_SystemPathsCocoa ();
 #              else
 #              ifdef GHOST_COCOA
                        m_systemPaths = new GHOST_SystemPathsCocoa ();
 #              else
-                       m_systemPaths = new GHOST_SystemPathsarbon ();
+                       m_systemPaths = new GHOST_SystemPathsCarbon ();
 #              endif
 #      else 
                m_systemPaths = new GHOST_SystemPathsX11 ();
 #              endif
 #      else 
                m_systemPaths = new GHOST_SystemPathsX11 ();
index d5e5fbc7a587d42c0e81e50be29b899c53226198..e02e569cc6e758421ac51a0c17823db456bf8f15 100644 (file)
@@ -48,7 +48,9 @@
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventWheel.h"
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventWheel.h"
+#ifdef WITH_INPUT_NDOF
 #include "GHOST_EventNDOF.h"
 #include "GHOST_EventNDOF.h"
+#endif
 
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
 
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
@@ -1101,7 +1103,9 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even
        GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
     OSStatus err = eventNotHandledErr;
        GHOST_IWindow* window;
        GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
     OSStatus err = eventNotHandledErr;
        GHOST_IWindow* window;
+#ifdef WITH_INPUT_NDOF
        GHOST_TEventNDOFData data;
        GHOST_TEventNDOFData data;
+#endif
        UInt32 kind;
        
     switch (::GetEventClass(event))
        UInt32 kind;
        
     switch (::GetEventClass(event))
@@ -1122,6 +1126,7 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even
                        err = sys->handleKeyEvent(event);
                        break;
                case kEventClassBlender :
                        err = sys->handleKeyEvent(event);
                        break;
                case kEventClassBlender :
+#ifdef WITH_INPUT_NDOF
                        window = sys->m_windowManager->getActiveWindow();
                        sys->m_ndofManager->GHOST_NDOFGetDatas(data);
                        kind = ::GetEventKind(event);
                        window = sys->m_windowManager->getActiveWindow();
                        sys->m_ndofManager->GHOST_NDOFGetDatas(data);
                        kind = ::GetEventKind(event);
@@ -1137,6 +1142,7 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even
 //                                     printf("button\n");
                                        break;
                        }
 //                                     printf("button\n");
                                        break;
                        }
+#endif
                        err = noErr;
                        break;
                default : 
                        err = noErr;
                        break;
                default :