ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove deprecated Gtk1 support

Browse source
This commit is contained in:
Pan7 2017-06-23 15:49:39 +02:00
parent 5622d0b02b
commit 8788c6a7dd
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
radiant/glwindow.cpp
View file

@ -172,7 +172,6 @@ static gint timer( gpointer data ){
return TRUE; return TRUE;
} }
#if GTK_CHECK_VERSION( 1,3,0 )
static gint scroll_event( GtkWidget *widget, static gint scroll_event( GtkWidget *widget,
GdkEventScroll *event, GdkEventScroll *event,
gpointer data ){ 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 ); wnd->OnMouseWheel( ( event->direction == GDK_SCROLL_UP ) ? true : false, (int)event->x, (int)event->y );
return TRUE; return TRUE;
} }
#endif
// ============================================================================= // =============================================================================
// GLWindow class // GLWindow class
@ -205,13 +203,8 @@ GLWindow::GLWindow( bool zbuffer ) {
g_qeglobals_gui.d_glBase = m_pWidget; 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 | 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 ); 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 // Connect signal handlers
g_signal_connect( G_OBJECT( m_pWidget ), "realize", G_CALLBACK( realize ), this ); 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-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 ), "button-release-event",G_CALLBACK( button_release ), this );
g_signal_connect( G_OBJECT( m_pWidget ), "size-allocate", G_CALLBACK( resize ), 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 ); g_signal_connect( G_OBJECT( m_pWidget ), "scroll-event", G_CALLBACK( scroll_event ), this );
#endif
} }
GLWindow::~GLWindow (){ GLWindow::~GLWindow (){