Clean up #if GTK_CHECK_VERSION(3,0,0)

Desktop / LibreOffice - Stephan Bergmann [redhat.com] - 13 January 2014 02:46 UTC



###

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index c125905..1f4db2b 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

38ab09e Clean up #if GTK_CHECK_VERSION(3,0,0)
vcl/inc/unx/gtk/gtkdata.hxx | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

Upstream: cgit.freedesktop.org

  • Share