Fix build error with WITH_X11_XINPUT=OFF after recent changes
This commit is contained in:
parent
ff2c67d7e8
commit
fd487b1f4e
|
@ -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;
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue