diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowX11.h')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 5b2ffced29c..10d44987647 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -196,32 +196,9 @@ public: getXWindow( ); #ifdef WITH_X11_XINPUT - class XTablet + GHOST_TabletData *GetTabletData() { -public: - GHOST_TabletData CommonData; - - XDevice *StylusDevice; - XDevice *EraserDevice; - - XID StylusID, EraserID; - - int MotionEvent; - int ProxInEvent; - int ProxOutEvent; - - int PressureLevels; - int XtiltLevels, YtiltLevels; - }; - - XTablet& GetXTablet() - { - return m_xtablet; - } - - const GHOST_TabletData *GetTabletData() - { - return &m_xtablet.CommonData; + return &m_tabletData; } #else // WITH_X11_XINPUT const GHOST_TabletData *GetTabletData() @@ -387,8 +364,7 @@ private: #endif #ifdef WITH_X11_XINPUT - /* Tablet devices */ - XTablet m_xtablet; + GHOST_TabletData m_tabletData; #endif #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) |