From 8788c6a7dd0e9f24aa94701128d5697684e5c5e3 Mon Sep 17 00:00:00 2001 From: Pan7 Date: Fri, 23 Jun 2017 15:49:39 +0200 Subject: [PATCH] Remove deprecated Gtk1 support --- radiant/glwindow.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/radiant/glwindow.cpp b/radiant/glwindow.cpp index 0c10245d..29de2215 100644 --- a/radiant/glwindow.cpp +++ b/radiant/glwindow.cpp @@ -172,7 +172,6 @@ static gint timer( gpointer data ){ return TRUE; } -#if GTK_CHECK_VERSION( 1,3,0 ) static gint scroll_event( GtkWidget *widget, GdkEventScroll *event, gpointer data ){ @@ -180,7 +179,6 @@ static gint scroll_event( GtkWidget *widget, wnd->OnMouseWheel( ( event->direction == GDK_SCROLL_UP ) ? true : false, (int)event->x, (int)event->y ); return TRUE; } -#endif // ============================================================================= // GLWindow class @@ -205,13 +203,8 @@ GLWindow::GLWindow( bool zbuffer ) { g_qeglobals_gui.d_glBase = m_pWidget; } -#if GTK_CHECK_VERSION( 1,3,0 ) gtk_widget_set_events( m_pWidget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); -#else - gtk_widget_set_events( m_pWidget, GDK_DESTROY | GDK_EXPOSURE_MASK | - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ); -#endif // Connect signal handlers g_signal_connect( G_OBJECT( m_pWidget ), "realize", G_CALLBACK( realize ), this ); @@ -220,9 +213,7 @@ GLWindow::GLWindow( bool zbuffer ) { g_signal_connect( G_OBJECT( m_pWidget ), "button-press-event", G_CALLBACK( button_press ), this ); g_signal_connect( G_OBJECT( m_pWidget ), "button-release-event",G_CALLBACK( button_release ), this ); g_signal_connect( G_OBJECT( m_pWidget ), "size-allocate", G_CALLBACK( resize ), this ); -#if GTK_CHECK_VERSION( 1,3,0 ) g_signal_connect( G_OBJECT( m_pWidget ), "scroll-event", G_CALLBACK( scroll_event ), this ); -#endif } GLWindow::~GLWindow (){