diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-24 22:29:05 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-24 22:29:05 +0000 |
| commit | 474439eb52f01ed44e82b7bcac008a6a4031c9d0 (patch) | |
| tree | 8a125b02869a12dd0fad4595cab9153bb0fd4175 | |
| parent | svg-canvas GTK+3 fixes (diff) | |
| download | inkscape-474439eb52f01ed44e82b7bcac008a6a4031c9d0.tar.gz inkscape-474439eb52f01ed44e82b7bcac008a6a4031c9d0.zip | |
Don't use extension events API in GTK+3 builds
(bzr r11413)
| -rw-r--r-- | src/ui/dialog/input.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index eb2ddb88f..5cd7ee14d 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -692,7 +692,12 @@ InputDialogImpl::InputDialogImpl() : // gint mask, // GdkExtensionMode mode); + + // TODO: Extension event stuff has been removed from public API in GTK+ 3 + // Need to check that this hasn't broken anything +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_set_extension_events( GTK_WIDGET(testDetector.gobj()), GDK_EXTENSION_EVENTS_ALL ); +#endif testDetector.add_events(Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK |Gdk::PROXIMITY_IN_MASK|Gdk::PROXIMITY_OUT_MASK|Gdk::SCROLL_MASK); devDetails.attach(keyEntry, 0, 2, rowNum, rowNum + 1, diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 66643c7f0..0a8064f1c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -486,8 +486,14 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(dtw->canvas))); style->bg[GTK_STATE_NORMAL] = style->white; gtk_widget_set_style (GTK_WIDGET (dtw->canvas), style); + + // TODO: Extension event stuff has been removed from public API in GTK+ 3 + // Need to check that this hasn't broken anything +#if !GTK_CHECK_VERSION(3,0,0) if ( prefs->getBool("/options/useextinput/value", true) ) gtk_widget_set_extension_events(GTK_WIDGET (dtw->canvas) , GDK_EXTENSION_EVENTS_ALL); //set extension events for tablets, unless disabled in preferences +#endif + g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw); gtk_table_attach (GTK_TABLE (canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0); |