Compare commits

...
Sign in to create a new pull request.
Author SHA1 Message Date
monsta
a956cb1559 libview: use GtkObject where it has to be in GTK+2 build
fix build warnings caused by some mistakes made in 3de4956ee7
2017-04-13 15:07:28 +03:00
raveit65
004fe59d23 use GTK_CHECK_VERSION for previous commit 2017-01-28 07:41:42 +01:00
raveit65
91ab1cd3f8 force X11 2017-01-28 07:27:16 +01:00
3 changed files with 16 additions and 0 deletions

View file

@ -1179,7 +1179,11 @@ ev_view_presentation_key_press_event (GtkWidget *widget,
EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget);
if (pview->state == EV_PRESENTATION_END)
#if GTK_CHECK_VERSION (3, 0, 0)
return gtk_bindings_activate_event (G_OBJECT (widget), event);
#else
return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
#endif
switch (event->keyval) {
case GDK_KEY_b:
@ -1239,7 +1243,11 @@ ev_view_presentation_key_press_event (GtkWidget *widget,
return TRUE;
}
#if GTK_CHECK_VERSION (3, 0, 0)
return gtk_bindings_activate_event (G_OBJECT (widget), event);
#else
return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
#endif
}
static gboolean

View file

@ -4427,7 +4427,11 @@ ev_view_key_press_event (GtkWidget *widget,
return FALSE;
}
#if GTK_CHECK_VERSION (3, 0, 0)
return gtk_bindings_activate_event (G_OBJECT (widget), event);
#else
return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
#endif
}
static gint

View file

@ -234,6 +234,10 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE);
#endif
#if GTK_CHECK_VERSION (3, 0, 0)
gdk_set_allowed_backends ("x11");
#endif
context = g_option_context_new (N_("MATE Document Viewer"));
g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);