From 38ab09ecea3a983b315c6a69b1a941e45a933320 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 13 Jan 2014 09:46:47 +0100 Subject: Clean up #if GTK_CHECK_VERSION(3,0,0) Change-Id: Idad6d064a20b0be83aebb8bf72013a65acb2d322 --- vcl/inc/unx/gtk/gtkdata.hxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index c1259050373d..1f4db2ba44cb 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -155,8 +155,7 @@ public: int GetXScreenCount() { return m_pSys->GetDisplayXScreenCount(); } #if GTK_CHECK_VERSION(3,0,0) // int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); } -#endif -#if !GTK_CHECK_VERSION(3,0,0) +#else virtual ScreenData *initScreen( SalX11Screen nXScreen ) const; #endif @@ -169,10 +168,10 @@ public: virtual void PostUserEvent(); -#if !GTK_CHECK_VERSION(3,0,0) - virtual long Dispatch( XEvent *pEvent ); -#else +#if GTK_CHECK_VERSION(3,0,0) guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack +#else + virtual long Dispatch( XEvent *pEvent ); #endif }; @@ -184,8 +183,6 @@ inline GdkDisplay *GtkData::GetGdkDisplay() { return GetGtkDisplay()->GetGdkDisplay(); } -#if !GTK_CHECK_VERSION(3,0,0) -#endif #endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX -- cgit