diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2011-09-01 04:03:20 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2011-09-01 04:03:20 +0400 |
| commit | 22676a434efdb99e38535b2f4a2623ea670ebf4d (patch) | |
| tree | 728e60808a6d14da84e1033ef0164b16a96eba77 /intern/ghost | |
| parent | 1ad8ed8a60bbd0e4b2a602259821745dc4af01cf (diff) | |
making carbon to build again (note: NDOF is not working here)
- fix typo
- isolate NDOF callsi in #ifdefs
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_ISystemPaths.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCarbon.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cpp index 8873398a320..1aa043ebc80 100644 --- a/intern/ghost/intern/GHOST_ISystemPaths.cpp +++ b/intern/ghost/intern/GHOST_ISystemPaths.cpp @@ -70,7 +70,7 @@ GHOST_TSuccess GHOST_ISystemPaths::create() # 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 (); diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index d5e5fbc7a58..e02e569cc6e 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -48,7 +48,9 @@ #include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" #include "GHOST_EventWheel.h" +#ifdef WITH_INPUT_NDOF #include "GHOST_EventNDOF.h" +#endif #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; +#ifdef WITH_INPUT_NDOF GHOST_TEventNDOFData data; +#endif UInt32 kind; switch (::GetEventClass(event)) @@ -1122,6 +1126,7 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even 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); @@ -1137,6 +1142,7 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even // printf("button\n"); break; } +#endif err = noErr; break; default : |