diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-07-05 21:39:08 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-07-05 21:39:08 +0000 |
| commit | 9abd33133650d77714fccf09d0c9ff27c9b75a78 (patch) | |
| tree | e450b556c03d2335a40b85c5945f7ab5b0c8b5e2 /src/widgets | |
| parent | Patch for bug #728081 (Keyboard shortcut - Lock current layer). (diff) | |
| download | inkscape-9abd33133650d77714fccf09d0c9ff27c9b75a78.tar.gz inkscape-9abd33133650d77714fccf09d0c9ff27c9b75a78.zip | |
Drop GTK+ 2.20 support.
Fixed bugs:
- https://launchpad.net/bugs/1020494
(bzr r11529)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/button.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/spinbutton-events.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 42dac2ef3..4b152f914 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -25,10 +25,6 @@ #include "button.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - static void sp_button_class_init (SPButtonClass *klass); static void sp_button_init (SPButton *button); static void sp_button_dispose(GObject *object); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 5bc367fe5..50c87a9a8 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -973,15 +973,10 @@ SPDesktopWidget::shutdown() "If you close without saving, your changes will be discarded."), doc->getName()); // fix for bug lp:168809 -#if GTK_CHECK_VERSION(2,22,0) GtkWidget *ma = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog)); GList *ma_labels = gtk_container_get_children(GTK_CONTAINER(ma)); GtkWidget *label = GTK_WIDGET(g_list_first(ma_labels)->data); gtk_widget_set_can_focus(label, FALSE); -#elif !defined(GSEAL_ENABLE) - GtkWidget *label = GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label); - gtk_widget_set_can_focus(label, FALSE); -#endif GtkWidget *close_button; close_button = gtk_button_new_with_mnemonic(_("Close _without saving")); @@ -1037,15 +1032,10 @@ SPDesktopWidget::shutdown() "Do you want to save this file as Inkscape SVG?"), doc->getName() ? doc->getName() : "Unnamed"); // fix for bug lp:168809 -#if GTK_CHECK_VERSION(2,22,0) GtkWidget *ma = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog)); GList *ma_labels = gtk_container_get_children(GTK_CONTAINER(ma)); GtkWidget *label = GTK_WIDGET(g_list_first(ma_labels)->data); gtk_widget_set_can_focus(label, FALSE); -#elif !defined(GSEAL_ENABLE) - GtkWidget *label = GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label); - gtk_widget_set_can_focus(label, FALSE); -#endif GtkWidget *close_button; close_button = gtk_button_new_with_mnemonic(_("Close _without saving")); diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 6949017a4..19e350c4b 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -21,10 +21,6 @@ #include "sp-widget.h" #include "widget-sizes.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) { diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f8aed71a8..db06b5d47 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -93,10 +93,6 @@ #include "toolbox.h" #include <gtk/gtk.h> -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - //#define DEBUG_TEXT using Inkscape::UnitTracker; |