diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-04-08 15:02:38 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-08 15:03:54 +0300 |
| commit | fd487b1f4ec0ab06ccf5bc3f6561096a755cdce2 (patch) | |
| tree | fdc59af7d8459337e3e188538273a809a36e1aaa | |
| parent | ff2c67d7e8ed334c482681e2342bf8cce0957546 (diff) | |
Fix build error with WITH_X11_XINPUT=OFF after recent changes
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 3 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.h | 5 |
3 files changed, 2 insertions, 10 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index ca511073ea1..aebf829a546 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -960,11 +960,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) case MotionNotify: { XMotionEvent &xme = xe->xmotion; -#ifdef WITH_X11_XINPUT bool is_tablet = window->GetTabletData().Active != GHOST_kTabletModeNone; -#else - bool is_tablet = false; -#endif if (is_tablet == false && window->getCursorGrabModeIsWarp()) { GHOST_TInt32 x_new = xme.x_root; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 363a8145c5a..db9f6846b11 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -239,6 +239,7 @@ GHOST_WindowX11::GHOST_WindowX11(GHOST_SystemX11 *system, #ifdef WITH_XDND m_dropTarget(NULL), #endif + m_tabletData(GHOST_TABLET_DATA_NONE), #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) m_xic(NULL), #endif @@ -498,8 +499,6 @@ GHOST_WindowX11::GHOST_WindowX11(GHOST_SystemX11 *system, #ifdef WITH_X11_XINPUT refreshXInputDevices(); - - m_tabletData = GHOST_TABLET_DATA_NONE; #endif /* now set up the rendering context. */ diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index a9914d88340..4704cb45e58 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -144,12 +144,11 @@ class GHOST_WindowX11 : public GHOST_Window { * Return a handle to the x11 window type. */ Window getXWindow(); -#ifdef WITH_X11_XINPUT + GHOST_TabletData &GetTabletData() { return m_tabletData; } -#endif // WITH_X11_XINPUT #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) XIC getX11_XIC() @@ -269,9 +268,7 @@ class GHOST_WindowX11 : public GHOST_Window { GHOST_DropTargetX11 *m_dropTarget; #endif -#ifdef WITH_X11_XINPUT GHOST_TabletData m_tabletData; -#endif #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) XIC m_xic; |