[gnome-commander] Increases minimum GTK version from 2.8.0 to 2.18.0
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Increases minimum GTK version from 2.8.0 to 2.18.0
- Date: Sat, 3 Jun 2017 21:01:12 +0000 (UTC)
commit 650c482557f5c22b02a71608906b353f61c87318
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sat Jun 3 22:58:11 2017 +0200
Increases minimum GTK version from 2.8.0 to 2.18.0
NEWS | 3 +
configure.ac | 2 +-
doc/C/releases.xml | 11 +++
src/dialogs/gnome-cmd-advrename-regex-dialog.cc | 16 ----
src/dialogs/gnome-cmd-edit-bookmark-dialog.cc | 16 ----
src/dialogs/gnome-cmd-edit-profile-dialog.h | 16 ----
src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc | 14 ---
src/dialogs/gnome-cmd-manage-profiles-dialog.h | 14 ---
src/dialogs/gnome-cmd-mkdir-dialog.cc | 16 ----
src/dialogs/gnome-cmd-options-dialog.cc | 16 ----
src/eggcellrendererkeys.cc | 21 -----
src/eggcellrendererkeys.h | 8 --
src/gnome-cmd-advrename-profile-component.cc | 4 -
src/gnome-cmd-data.cc | 2 -
src/gnome-cmd-file-selector.cc | 2 -
src/gnome-cmd-user-actions.cc | 43 ---------
src/gnome-cmd-user-actions.h | 4 -
src/gnome-cmd-xml-config.cc | 6 --
src/intviewer/image-render.cc | 104 +---------------------
src/tags/gnome-cmd-tags-poppler.cc | 72 ---------------
src/utils.h | 5 -
21 files changed, 16 insertions(+), 379 deletions(-)
---
diff --git a/NEWS b/NEWS
index 7a272ea..eb9e22a 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ New features:
* [build] Don't use gnome-autogen.sh anymore (Many thanks to Philip Withnall and David King)
* [build] Translations are now handled by upstream gettext instead of intltool
* [build] New documentation infrastructure: Use yelp-tools instead of gnome-doc-utils
+
+Other changes:
+ * Increased minimum GTK version from 2.8.0 to 2.18.0
* Code cleanup
Bug fixes:
diff --git a/configure.ac b/configure.ac
index abd9585..98ae119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ dnl ===================
GLIB_REQ=2.44.0
GMODULE_REQ=2.0.0
-GTK_REQ=2.8.0
+GTK_REQ=2.18.0
GNOME_REQ=2.0.0
GNOMEUI_REQ=2.4.0
GNOMEVFS_REQ=2.0.0
diff --git a/doc/C/releases.xml b/doc/C/releases.xml
index 0012dfc..1ccae5e 100644
--- a/doc/C/releases.xml
+++ b/doc/C/releases.xml
@@ -40,6 +40,17 @@
</listitem>
</itemizedlist>
</para>
+ <para>New features:</para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>Increased minimum GTK version from 2.8.0 to 2.18.0</para>
+ </listitem>
+ <listitem>
+ <para>Code cleanup</para>
+ </listitem>
+ </itemizedlist>
+ </para>
<para>Bug fixes:</para>
<para>
<itemizedlist>
diff --git a/src/dialogs/gnome-cmd-advrename-regex-dialog.cc b/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
index d5e8b5c..9a1d223 100644
--- a/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
+++ b/src/dialogs/gnome-cmd-advrename-regex-dialog.cc
@@ -61,24 +61,16 @@ gboolean gnome_cmd_advrename_regex_dialog_new (const gchar *title, GtkWindow *pa
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
// HIG defaults
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
gtk_box_set_spacing (GTK_BOX (content_area),6);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
-#endif
GtkWidget *table, *align, *label, *entry, *check;
@@ -86,11 +78,7 @@ gboolean gnome_cmd_advrename_regex_dialog_new (const gchar *title, GtkWindow *pa
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), table);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
-#endif
label = gtk_label_new_with_mnemonic (_("_Search for:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -123,11 +111,7 @@ gboolean gnome_cmd_advrename_regex_dialog_new (const gchar *title, GtkWindow *pa
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), rx ? rx->match_case : FALSE);
gtk_container_add (GTK_CONTAINER (align), check);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/dialogs/gnome-cmd-edit-bookmark-dialog.cc b/src/dialogs/gnome-cmd-edit-bookmark-dialog.cc
index 52d845b..09c03aa 100644
--- a/src/dialogs/gnome-cmd-edit-bookmark-dialog.cc
+++ b/src/dialogs/gnome-cmd-edit-bookmark-dialog.cc
@@ -75,24 +75,16 @@ gboolean gnome_cmd_edit_bookmark_dialog (GtkWindow *parent, const gchar *title,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
// HIG defaults
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
gtk_box_set_spacing (GTK_BOX (content_area),6);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
-#endif
GtkWidget *table, *label, *entry;
@@ -100,11 +92,7 @@ gboolean gnome_cmd_edit_bookmark_dialog (GtkWindow *parent, const gchar *title,
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), table);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
-#endif
label = gtk_label_new_with_mnemonic (_("Bookmark _name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -128,11 +116,7 @@ gboolean gnome_cmd_edit_bookmark_dialog (GtkWindow *parent, const gchar *title,
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 1, 2);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/dialogs/gnome-cmd-edit-profile-dialog.h b/src/dialogs/gnome-cmd-edit-profile-dialog.h
index 30774b2..974bfaa 100644
--- a/src/dialogs/gnome-cmd-edit-profile-dialog.h
+++ b/src/dialogs/gnome-cmd-edit-profile-dialog.h
@@ -86,32 +86,20 @@ namespace GnomeCmd
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
// HIG defaults
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
gtk_box_set_spacing (GTK_BOX (content_area),6);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
-#endif
GtkWidget *vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gchar *str = g_strdup_printf ("<b>%s</b>", _("_Name"));
GtkWidget *label = gtk_label_new_with_mnemonic (str);
@@ -136,11 +124,7 @@ namespace GnomeCmd
component->update();
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
index a3b73eb..4c96fee 100644
--- a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
+++ b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
@@ -76,29 +76,19 @@ void gnome_cmd_bookmark_dialog_new (const gchar *title, GtkWindow *parent)
GTK_STOCK_JUMP_TO, RESPONSE_JUMP_TO,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area(GTK_DIALOG (dialog));
-#endif
GtkWidget *vbox, *hbox, *scrolled_window, *button;
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- #if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), vbox);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
-#endif
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_add (GTK_CONTAINER (vbox), hbox);
@@ -147,11 +137,7 @@ void gnome_cmd_bookmark_dialog_new (const gchar *title, GtkWindow *parent)
gtk_dialog_set_default_response (GTK_DIALOG (dialog), RESPONSE_JUMP_TO);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), RESPONSE_JUMP_TO, FALSE);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
g_signal_connect (dialog, "size-allocate", G_CALLBACK (size_allocate_callback), NULL);
g_signal_connect (dialog, "response", G_CALLBACK (response_callback), view);
diff --git a/src/dialogs/gnome-cmd-manage-profiles-dialog.h b/src/dialogs/gnome-cmd-manage-profiles-dialog.h
index a17c275..c8568ff 100644
--- a/src/dialogs/gnome-cmd-manage-profiles-dialog.h
+++ b/src/dialogs/gnome-cmd-manage-profiles-dialog.h
@@ -295,29 +295,19 @@ namespace GnomeCmd
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
GtkWidget *vbox, *hbox, *scrolled_window, *view, *box, *button;
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), vbox);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
-#endif
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_add (GTK_CONTAINER (vbox), hbox);
@@ -354,11 +344,7 @@ namespace GnomeCmd
g_signal_connect (button, "clicked", G_CALLBACK (remove_clicked_callback), view);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/dialogs/gnome-cmd-mkdir-dialog.cc b/src/dialogs/gnome-cmd-mkdir-dialog.cc
index add369e..0b575fe 100644
--- a/src/dialogs/gnome-cmd-mkdir-dialog.cc
+++ b/src/dialogs/gnome-cmd-mkdir-dialog.cc
@@ -162,35 +162,23 @@ gboolean gnome_cmd_mkdir_dialog_new (GnomeCmdDir *dir, GnomeCmdFile *selected_fi
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
// HIG defaults
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
gtk_box_set_spacing (GTK_BOX (content_area),6);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
-#endif
GtkWidget *table, *label, *entry;
table = gtk_table_new (3, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), table);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
-#endif
label = gtk_label_new_with_mnemonic (_("Directory name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -220,11 +208,7 @@ gboolean gnome_cmd_mkdir_dialog_new (GnomeCmdDir *dir, GnomeCmdFile *selected_fi
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 7613bdb..ea2ea62 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -2071,32 +2071,20 @@ gboolean gnome_cmd_options_dialog (GtkWindow *parent, GnomeCmdData::Options &cfg
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-#if GTK_CHECK_VERSION (2, 14, 0)
GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#endif
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_default_size(GTK_WINDOW (dialog), 560, 600);
// HIG defaults
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
gtk_box_set_spacing (GTK_BOX (content_area),6);
-#else
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area),6);
-#endif
GnomeCmdNotebook *notebook = new GnomeCmdNotebook(GnomeCmdNotebook::SHOW_TABS);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_container_add (GTK_CONTAINER (content_area), *notebook);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), *notebook);
-#endif
notebook->append_page(create_general_tab (dialog, cfg), _("General"));
notebook->append_page(create_format_tab (dialog, cfg), _("Format"));
@@ -2110,11 +2098,7 @@ gboolean gnome_cmd_options_dialog (GtkWindow *parent, GnomeCmdData::Options &cfg
// open the tab which was actinve when closing the options notebook last time
notebook->set_current_page (activetab);
-#if GTK_CHECK_VERSION (2, 14, 0)
gtk_widget_show_all (content_area);
-#else
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/eggcellrendererkeys.cc b/src/eggcellrendererkeys.cc
index 3c4a84a..7b062f0 100644
--- a/src/eggcellrendererkeys.cc
+++ b/src/eggcellrendererkeys.cc
@@ -242,17 +242,11 @@ gchar *egg_accelerator_get_label (guint accel_key, GdkModifierType accel_mods)
static const gchar text_mod1[] = "Alt+";
static const gchar text_mod2[] = "Mod2+";
static const gchar text_mod3[] = "Mod3+";
-#if GTK_CHECK_VERSION (2, 10, 0)
static const gchar text_mod4[] = "Mod4+";
-#else
- static const gchar text_mod4[] = "Super+";
-#endif
static const gchar text_mod5[] = "Mod5+";
-#if GTK_CHECK_VERSION (2, 10, 0)
static const gchar text_meta[] = "Meta+";
static const gchar text_super[] = "Super+";
static const gchar text_hyper[] = "Hyper+";
-#endif
const gchar *keyval_name = gdk_keyval_name (gdk_keyval_to_upper (accel_key));
if (!keyval_name)
@@ -274,14 +268,12 @@ gchar *egg_accelerator_get_label (guint accel_key, GdkModifierType accel_mods)
l += sizeof(text_mod4)-1;
if (accel_mods & GDK_MOD5_MASK)
l += sizeof(text_mod5)-1;
-#if GTK_CHECK_VERSION (2, 10, 0)
if (accel_mods & GDK_META_MASK)
l += sizeof(text_meta)-1;
if (accel_mods & GDK_HYPER_MASK)
l += sizeof(text_hyper)-1;
if (accel_mods & GDK_SUPER_MASK)
l += sizeof(text_super)-1;
-#endif
gchar *accelerator = g_new (gchar, l+1);
gchar *s = accelerator;
@@ -321,7 +313,6 @@ gchar *egg_accelerator_get_label (guint accel_key, GdkModifierType accel_mods)
strcpy (s, text_mod5);
s += sizeof(text_mod5)-1;
}
-#if GTK_CHECK_VERSION (2, 10, 0)
if (accel_mods & GDK_META_MASK)
{
strcpy (s, text_meta);
@@ -337,7 +328,6 @@ gchar *egg_accelerator_get_label (guint accel_key, GdkModifierType accel_mods)
strcpy (s, text_super);
s += sizeof(text_super)-1;
}
-#endif
strcpy (s, keyval_name);
@@ -447,13 +437,8 @@ void egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
static gboolean grab_key_callback (GtkWidget *widget, GdkEventKey *event, EggCellRendererKeys *keys)
{
-#if GTK_CHECK_VERSION (2, 10, 0)
if (event->is_modifier)
return TRUE;
-#else
- if (is_modifier (event->hardware_keycode))
- return TRUE;
-#endif
switch (event->keyval)
{
@@ -486,11 +471,7 @@ static gboolean grab_key_callback (GtkWidget *widget, GdkEventKey *event, EggCel
if (accel_key == GDK_ISO_Left_Tab)
accel_key = GDK_Tab;
-#if GTK_CHECK_VERSION (2, 10, 0)
accel_mods = event->state & gtk_accelerator_get_default_mod_mask ();
-#else
- accel_mods = event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK);
-#endif
// filter consumed modifiers
if (keys->accel_mode == GTK_CELL_RENDERER_ACCEL_MODE_GTK)
@@ -517,9 +498,7 @@ static gboolean grab_key_callback (GtkWidget *widget, GdkEventKey *event, EggCel
if (keys->accel_mode == GTK_CELL_RENDERER_ACCEL_MODE_GTK)
if (accel_key != GDK_Tab && !gtk_accelerator_valid (accel_key, (GdkModifierType) accel_mods))
{
-#if GTK_CHECK_VERSION (2, 12, 0)
gtk_widget_error_bell (widget);
-#endif
return TRUE;
}
diff --git a/src/eggcellrendererkeys.h b/src/eggcellrendererkeys.h
index 6abd77b..46b8cee 100644
--- a/src/eggcellrendererkeys.h
+++ b/src/eggcellrendererkeys.h
@@ -58,14 +58,6 @@ struct EggCellRendererKeysClass
GType egg_cell_renderer_keys_get_type ();
GtkCellRenderer *egg_cell_renderer_keys_new ();
-#if !GTK_CHECK_VERSION (2, 10, 0)
-enum GtkCellRendererAccelMode
-{
- GTK_CELL_RENDERER_ACCEL_MODE_GTK,
- GTK_CELL_RENDERER_ACCEL_MODE_OTHER
-};
-#endif
-
void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, GdkModifierType mask);
void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, GdkModifierType
*mask);
void egg_cell_renderer_keys_set_accel_mode (EggCellRendererKeys *keys, GtkCellRendererAccelMode accel_mode);
diff --git a/src/gnome-cmd-advrename-profile-component.cc b/src/gnome-cmd-advrename-profile-component.cc
index 4f67b03..8df6e27 100644
--- a/src/gnome-cmd-advrename-profile-component.cc
+++ b/src/gnome-cmd-advrename-profile-component.cc
@@ -641,11 +641,7 @@ inline gchar *GnomeCmdAdvrenameProfileComponent::Private::get_selected_range (Gt
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (local_entry), &beg, &end))
{
-#if GTK_CHECK_VERSION (2, 16, 0)
guint16 len = gtk_entry_get_text_length (GTK_ENTRY (local_entry));
-#else
- guint16 len = (guint16) g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (local_entry)), -1);
-#endif
if (!inversed)
range = end==len ? g_strdup_printf ("%s(%i:)", placeholder, beg) :
g_strdup_printf ("%s(%i:%i)", placeholder, beg, end);
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 29686a3..f27932d 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -3805,13 +3805,11 @@ void GnomeCmdData::load()
{GDK_SHIFT_MASK, "<shift>"},
{GDK_CONTROL_MASK, "<control>"},
{GDK_MOD1_MASK, "<alt>"},
-#if GTK_CHECK_VERSION (2, 10, 0)
{GDK_SUPER_MASK, "<super>"},
{GDK_SUPER_MASK, "<win>"},
{GDK_SUPER_MASK, "<mod4>"},
{GDK_HYPER_MASK, "<hyper>"},
{GDK_META_MASK, "<meta>"},
-#endif
{GDK_MOD1_MASK, "<mod1>"},
{GDK_MOD4_MASK, "<super>"},
{GDK_MOD4_MASK, "<win>"},
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index dc0762a..46a0723 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -1529,9 +1529,7 @@ GtkWidget *GnomeCmdFileSelector::new_tab(GnomeCmdDir *dir, GnomeCmdFileList::Col
gtk_widget_show (fl->tab_label_text);
gint n = notebook->append_page(scrolled_window, hbox);
-#if GTK_CHECK_VERSION (2, 10, 0)
gtk_notebook_set_tab_reorderable (*notebook, scrolled_window, TRUE);
-#endif
gtk_widget_show_all (scrolled_window);
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index fa3a988..bd44d10 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -21,7 +21,6 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-url.h>
#include <set>
#include <algorithm>
@@ -177,11 +176,7 @@ inline bool operator < (const GdkEventKey &e1, const GdkEventKey &e2)
if (e1.keyval > e2.keyval)
return false;
-#if GTK_CHECK_VERSION (2, 10, 0)
return (e1.state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK
| GDK_META_MASK)) < (e2.state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK |
GDK_HYPER_MASK | GDK_META_MASK));
-#else
- return (e1.state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK)) < (e2.state &
(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK));
-#endif
}
@@ -330,21 +325,13 @@ void GnomeCmdUserActions::init()
if (!registered("connections.change_left"))
{
register_action(GDK_MOD1_MASK, GDK_1, "connections.change_left");
-#if GTK_CHECK_VERSION (2, 10, 0)
register_action(GDK_SUPER_MASK, GDK_1, "connections.change_left");
-#else
- register_action(GDK_MOD4_MASK, GDK_1, "connections.change_left");
-#endif
}
if (!registered("connections.change_right"))
{
register_action(GDK_MOD1_MASK, GDK_2, "connections.change_right");
-#if GTK_CHECK_VERSION (2, 10, 0)
register_action(GDK_SUPER_MASK, GDK_2, "connections.change_right");
-#else
- register_action(GDK_MOD4_MASK, GDK_2, "connections.change_right");
-#endif
}
if (!registered("edit.copy_filenames"))
@@ -356,11 +343,7 @@ void GnomeCmdUserActions::init()
if (!registered("edit.search"))
{
register_action(GDK_MOD1_MASK, GDK_F7, "edit.search");
-#if GTK_CHECK_VERSION (2, 10, 0)
register_action(GDK_SUPER_MASK, GDK_F, "edit.search");
-#else
- register_action(GDK_MOD4_MASK, GDK_F, "edit.search");
-#endif
}
if (!registered("file.advrename"))
@@ -515,11 +498,7 @@ gboolean GnomeCmdUserActions::register_action(guint state, guint keyval, const g
GdkEventKey event;
event.keyval = keyval;
-#if GTK_CHECK_VERSION (2, 10, 0)
event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK |
GDK_HYPER_MASK | GDK_META_MASK);
-#else
- event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK);
-#endif
if (action.find(event)!=action.end())
return FALSE;
@@ -547,11 +526,7 @@ void GnomeCmdUserActions::unregister(guint state, guint keyval)
GdkEventKey event;
event.keyval = keyval;
-#if GTK_CHECK_VERSION (2, 10, 0)
event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK |
GDK_HYPER_MASK | GDK_META_MASK);
-#else
- event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK);
-#endif
map <GdkEventKey, UserAction>::iterator pos = action.find(event);
if (pos!=action.end())
@@ -579,11 +554,7 @@ gboolean GnomeCmdUserActions::registered(guint state, guint keyval)
GdkEventKey event;
event.keyval = keyval;
-#if GTK_CHECK_VERSION (2, 10, 0)
event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK |
GDK_HYPER_MASK | GDK_META_MASK);
-#else
- event.state = state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK);
-#endif
return action.find(event)!=action.end();
}
@@ -622,13 +593,9 @@ XML::xstream &operator << (XML::xstream &xml, GnomeCmdUserActions &usr)
if (state & GDK_SHIFT_MASK) xml << XML::attr("shift") << 1;
if (state & GDK_CONTROL_MASK) xml << XML::attr("control") << 1;
if (state & GDK_MOD1_MASK) xml << XML::attr("alt") << 1;
-#if GTK_CHECK_VERSION (2, 10, 0)
if (state & GDK_SUPER_MASK) xml << XML::attr("super") << 1;
if (state & GDK_HYPER_MASK) xml << XML::attr("hyper") << 1;
if (state & GDK_META_MASK) xml << XML::attr("meta") << 1;
-#else
- if (state & GDK_MOD4_MASK) xml << XML::attr("super") << 1;
-#endif
xml << XML::attr("action") << usr.action_func[i->second.func];
if (!i->second.user_data.empty())
@@ -2031,13 +1998,8 @@ void help_web (GtkMenuItem *menuitem, gpointer not_used)
{
GError *error = NULL;
-#if GTK_CHECK_VERSION (2, 14, 0)
if (!gtk_show_uri (NULL, "http://gcmd.github.io/";, GDK_CURRENT_TIME, &error))
gnome_cmd_error_message (_("There was an error opening home page."), error);
-#else
- if (!gnome_url_show ("http://gcmd.github.io/";, &error))
- gnome_cmd_error_message (_("There was an error opening home page."), error);
-#endif
}
@@ -2045,13 +2007,8 @@ void help_problem (GtkMenuItem *menuitem, gpointer not_used)
{
GError *error = NULL;
-#if GTK_CHECK_VERSION (2, 14, 0)
if (!gtk_show_uri (NULL, "http://bugzilla.gnome.org/browse.cgi?product=gnome-commander";,
GDK_CURRENT_TIME, &error))
gnome_cmd_error_message (_("There was an error reporting problem."), error);
-#else
- if (!gnome_url_show("http://bugzilla.gnome.org/browse.cgi?product=gnome-commander";, &error))
- gnome_cmd_error_message (_("There was an error reporting problem."), error);
-#endif
}
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index 4fd9b1d..2dd668b 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -70,13 +70,9 @@ inline std::string key2str(guint state, guint key_val)
if (state & GDK_SHIFT_MASK) key_name += gdk_modifiers_names[GDK_SHIFT_MASK];
if (state & GDK_CONTROL_MASK) key_name += gdk_modifiers_names[GDK_CONTROL_MASK];
if (state & GDK_MOD1_MASK) key_name += gdk_modifiers_names[GDK_MOD1_MASK];
-#if GTK_CHECK_VERSION (2, 10, 0)
if (state & GDK_SUPER_MASK) key_name += gdk_modifiers_names[GDK_SUPER_MASK];
if (state & GDK_HYPER_MASK) key_name += gdk_modifiers_names[GDK_HYPER_MASK];
if (state & GDK_META_MASK) key_name += gdk_modifiers_names[GDK_META_MASK];
-#else
- if (state & GDK_MOD4_MASK) key_name += gdk_modifiers_names[GDK_MOD4_MASK];
-#endif
if (ascii_isalnum (key_val))
key_name += g_ascii_tolower (key_val);
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index 0eb4693..006aea5 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -371,10 +371,8 @@ static void xml_start(GMarkupParseContext *context,
G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
"control", &control,
G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
"alt", &alt,
G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
"super", &super,
-#if GTK_CHECK_VERSION (2, 10, 0)
G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
"hyper", &hyper,
G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
"meta", &meta,
-#endif
G_MARKUP_COLLECT_INVALID))
{
if (gcmd_user_actions.has_action(param2))
@@ -392,13 +390,9 @@ static void xml_start(GMarkupParseContext *context,
if (shift) accel_mask |= GDK_SHIFT_MASK;
if (control) accel_mask |= GDK_CONTROL_MASK;
if (alt) accel_mask |= GDK_MOD1_MASK;
-#if GTK_CHECK_VERSION (2, 10, 0)
if (super) accel_mask |= GDK_SUPER_MASK;
if (hyper) accel_mask |= GDK_HYPER_MASK;
if (meta) accel_mask |= GDK_META_MASK;
-#else
- if (super) accel_mask |= GDK_MOD4_MASK;
-#endif
gcmd_user_actions.register_action(accel_mask, keyval, param2, param3);
}
else
diff --git a/src/intviewer/image-render.cc b/src/intviewer/image-render.cc
index 4ba1b01..d29052e 100644
--- a/src/intviewer/image-render.cc
+++ b/src/intviewer/image-render.cc
@@ -141,13 +141,8 @@ void image_render_set_h_adjustment (ImageRender *obj, GtkAdjustment *adjustment)
g_signal_connect (adjustment, "value-changed", G_CALLBACK (image_render_h_adjustment_value_changed),
obj);
obj->priv->old_h_adj_value = gtk_adjustment_get_value (adjustment);
-#if GTK_CHECK_VERSION (2, 14, 0)
obj->priv->old_h_adj_lower = gtk_adjustment_get_lower (adjustment);
obj->priv->old_h_adj_upper = gtk_adjustment_get_upper (adjustment);
-#else
- obj->priv->old_h_adj_lower = adjustment->lower;
- obj->priv->old_h_adj_upper = adjustment->upper;
-#endif
image_render_h_adjustment_update (obj);
}
@@ -170,13 +165,8 @@ void image_render_set_v_adjustment (ImageRender *obj, GtkAdjustment *adjustment)
g_signal_connect (adjustment, "value-changed", G_CALLBACK (image_render_v_adjustment_value_changed),
obj);
obj->priv->old_v_adj_value = gtk_adjustment_get_value (adjustment);
-#if GTK_CHECK_VERSION (2, 14, 0)
obj->priv->old_v_adj_lower = gtk_adjustment_get_lower (adjustment);
obj->priv->old_v_adj_upper = gtk_adjustment_get_upper (adjustment);
-#else
- obj->priv->old_v_adj_lower = adjustment->lower;
- obj->priv->old_v_adj_upper = adjustment->upper;
-#endif
image_render_v_adjustment_update (obj);
}
@@ -332,11 +322,8 @@ static void image_render_realize (GtkWidget *widget)
gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
GdkWindow *window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
-#if GTK_CHECK_VERSION (2,18,0)
gtk_widget_set_window (widget, window);
-#else
- widget->window = window;
-#endif
+
widget->style = gtk_style_attach (widget->style, window);
gdk_window_set_user_data (window, widget);
gtk_style_set_background (widget->style, window, GTK_STATE_ACTIVE);
@@ -353,11 +340,7 @@ static void image_render_redraw (ImageRender *w)
return;
image_render_notify_status_changed (w);
-#if GTK_CHECK_VERSION (2,14,0)
gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (w)), NULL, FALSE);
-#else
- gdk_window_invalidate_rect (GTK_WIDGET (w)->window, NULL, FALSE);
-#endif
}
@@ -377,11 +360,7 @@ static void image_render_size_allocate (GtkWidget *widget, GtkAllocation *alloca
if (GTK_WIDGET_REALIZED (widget))
{
-#if GTK_CHECK_VERSION (2,14,0)
gdk_window_move_resize (gtk_widget_get_window (widget), allocation->x, allocation->y,
allocation->width, allocation->height);
-#else
- gdk_window_move_resize (widget->window, allocation->x, allocation->y, allocation->width,
allocation->height);
-#endif
image_render_prepare_disp_pixbuf (IMAGE_RENDER (widget));
}
}
@@ -397,11 +376,7 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
ImageRender *w = IMAGE_RENDER (widget);
-#if GTK_CHECK_VERSION (2,14,0)
gdk_window_clear_area (gtk_widget_get_window (widget), 0, 0, widget->allocation.width,
widget->allocation.height);
-#else
- gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width, widget->allocation.height);
-#endif
if (!w->priv->disp_pixbuf)
return FALSE;
@@ -415,11 +390,7 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
xc = widget->allocation.width / 2 - gdk_pixbuf_get_width (w->priv->disp_pixbuf)/2;
yc = widget->allocation.height / 2 - gdk_pixbuf_get_height (w->priv->disp_pixbuf)/2;
-#if GTK_CHECK_VERSION (2,14,0)
gdk_draw_pixbuf (gtk_widget_get_window (widget),
-#else
- gdk_draw_pixbuf (widget->window,
-#endif
NULL,
w->priv->disp_pixbuf,
0, 0, // source X, Y
@@ -477,11 +448,7 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
(int)w->priv->h_adjustment->value,
(int)w->priv->v_adjustment->value);
#endif
-#if GTK_CHECK_VERSION (2,14,0)
gdk_draw_pixbuf(gtk_widget_get_window (widget),
-#else
- gdk_draw_pixbuf(widget->window,
-#endif
NULL,
w->priv->disp_pixbuf,
src_x, src_y,
@@ -549,15 +516,10 @@ static gboolean image_render_motion_notify (GtkWidget *widget, GdkEventMotion *e
gint x = event->x;
gint y = event->y;
-#if GTK_CHECK_VERSION (2,14,0)
GdkWindow *window = gtk_widget_get_window (widget);
if (event->is_hint || (event->window != window))
gdk_window_get_pointer (window, &x, &y, &mods);
-#else
- if (event->is_hint || (event->window != widget->window))
- gdk_window_get_pointer (widget->window, &x, &y, &mods);
-#endif
// TODO: respond to motion event
}
@@ -571,19 +533,11 @@ static void image_render_h_adjustment_update (ImageRender *obj)
gfloat new_value = gtk_adjustment_get_value (obj->priv->h_adjustment);
-#if GTK_CHECK_VERSION (2,14,0)
if (new_value < gtk_adjustment_get_lower (obj->priv->h_adjustment))
new_value = gtk_adjustment_get_lower (obj->priv->h_adjustment);
if (new_value > gtk_adjustment_get_upper (obj->priv->h_adjustment))
new_value = gtk_adjustment_get_upper (obj->priv->h_adjustment);
-#else
- if (new_value < obj->priv->h_adjustment->lower)
- new_value = obj->priv->h_adjustment->lower;
-
- if (new_value > obj->priv->h_adjustment->upper)
- new_value = obj->priv->h_adjustment->upper;
-#endif
if (new_value != gtk_adjustment_get_value (obj->priv->h_adjustment))
{
@@ -605,7 +559,6 @@ static void image_render_h_adjustment_changed (GtkAdjustment *adjustment, gpoint
ImageRender *obj = IMAGE_RENDER (data);
-#if GTK_CHECK_VERSION (2,14,0)
if ((obj->priv->old_h_adj_value != gtk_adjustment_get_value (adjustment)) ||
(obj->priv->old_h_adj_lower != gtk_adjustment_get_lower (adjustment)) ||
(obj->priv->old_h_adj_upper != gtk_adjustment_get_upper (adjustment)))
@@ -616,18 +569,6 @@ static void image_render_h_adjustment_changed (GtkAdjustment *adjustment, gpoint
obj->priv->old_h_adj_lower = gtk_adjustment_get_lower (adjustment);
obj->priv->old_h_adj_upper = gtk_adjustment_get_upper (adjustment);
}
-#else
- if ((obj->priv->old_h_adj_value != adjustment->value) ||
- (obj->priv->old_h_adj_lower != adjustment->lower) ||
- (obj->priv->old_h_adj_upper != adjustment->upper))
- {
- image_render_h_adjustment_update (obj);
-
- obj->priv->old_h_adj_value = adjustment->value;
- obj->priv->old_h_adj_lower = adjustment->lower;
- obj->priv->old_h_adj_upper = adjustment->upper;
- }
-#endif
}
@@ -652,19 +593,11 @@ static void image_render_v_adjustment_update (ImageRender *obj)
gfloat new_value = gtk_adjustment_get_value (obj->priv->v_adjustment);
-#if GTK_CHECK_VERSION (2,14,0)
if (new_value < gtk_adjustment_get_lower (obj->priv->v_adjustment))
new_value = gtk_adjustment_get_lower (obj->priv->v_adjustment);
if (new_value > gtk_adjustment_get_upper (obj->priv->v_adjustment))
new_value = gtk_adjustment_get_upper (obj->priv->v_adjustment);
-#else
- if (new_value < obj->priv->v_adjustment->lower)
- new_value = obj->priv->v_adjustment->lower;
-
- if (new_value > obj->priv->v_adjustment->upper)
- new_value = obj->priv->v_adjustment->upper;
-#endif
if (new_value != gtk_adjustment_get_value (obj->priv->v_adjustment))
{
@@ -686,7 +619,6 @@ static void image_render_v_adjustment_changed (GtkAdjustment *adjustment, gpoint
ImageRender *obj = IMAGE_RENDER (data);
-#if GTK_CHECK_VERSION (2,14,0)
if ((obj->priv->old_v_adj_value != gtk_adjustment_get_value (adjustment)) ||
(obj->priv->old_v_adj_lower != gtk_adjustment_get_lower (adjustment)) ||
(obj->priv->old_v_adj_upper != gtk_adjustment_get_upper (adjustment)))
@@ -697,18 +629,6 @@ static void image_render_v_adjustment_changed (GtkAdjustment *adjustment, gpoint
obj->priv->old_v_adj_lower = gtk_adjustment_get_lower (adjustment);
obj->priv->old_v_adj_upper = gtk_adjustment_get_upper (adjustment);
}
-#else
- if ((obj->priv->old_v_adj_value != adjustment->value) ||
- (obj->priv->old_v_adj_lower != adjustment->lower) ||
- (obj->priv->old_v_adj_upper != adjustment->upper))
- {
- image_render_v_adjustment_update (obj);
-
- obj->priv->old_v_adj_value = adjustment->value;
- obj->priv->old_v_adj_lower = adjustment->lower;
- obj->priv->old_v_adj_upper = adjustment->upper;
- }
-#endif
}
@@ -922,25 +842,15 @@ static void image_render_update_adjustments (ImageRender *obj)
{
if (obj->priv->h_adjustment)
{
-#if GTK_CHECK_VERSION (2,14,0)
gtk_adjustment_set_lower (obj->priv->h_adjustment, 0);
gtk_adjustment_set_upper (obj->priv->h_adjustment, 0);
-#else
- obj->priv->h_adjustment->lower = 0;
- obj->priv->h_adjustment->upper = 0;
-#endif
gtk_adjustment_set_value (obj->priv->h_adjustment, 0);
gtk_adjustment_changed (obj->priv->h_adjustment);
}
if (obj->priv->v_adjustment)
{
-#if GTK_CHECK_VERSION (2,14,0)
gtk_adjustment_set_lower (obj->priv->v_adjustment, 0);
gtk_adjustment_set_upper (obj->priv->v_adjustment, 0);
-#else
- obj->priv->v_adjustment->lower = 0;
- obj->priv->v_adjustment->upper = 0;
-#endif
gtk_adjustment_set_value (obj->priv->v_adjustment, 0);
gtk_adjustment_changed (obj->priv->v_adjustment);
}
@@ -949,28 +859,16 @@ static void image_render_update_adjustments (ImageRender *obj)
{
if (obj->priv->h_adjustment)
{
-#if GTK_CHECK_VERSION (2,14,0)
gtk_adjustment_set_lower (obj->priv->h_adjustment, 0);
gtk_adjustment_set_upper (obj->priv->h_adjustment, gdk_pixbuf_get_width
(obj->priv->disp_pixbuf));
gtk_adjustment_set_page_size (obj->priv->h_adjustment, GTK_WIDGET (obj)->allocation.width);
-#else
- obj->priv->h_adjustment->lower = 0;
- obj->priv->h_adjustment->upper = gdk_pixbuf_get_width (obj->priv->disp_pixbuf);
- obj->priv->h_adjustment->page_size = GTK_WIDGET (obj)->allocation.width;
-#endif
gtk_adjustment_changed (obj->priv->h_adjustment);
}
if (obj->priv->v_adjustment)
{
-#if GTK_CHECK_VERSION (2,14,0)
gtk_adjustment_set_lower (obj->priv->v_adjustment, 0);
gtk_adjustment_set_upper (obj->priv->v_adjustment, gdk_pixbuf_get_height
(obj->priv->disp_pixbuf));
gtk_adjustment_set_page_size (obj->priv->v_adjustment, GTK_WIDGET (obj)->allocation.height);
-#else
- obj->priv->v_adjustment->lower = 0;
- obj->priv->v_adjustment->upper = gdk_pixbuf_get_height (obj->priv->disp_pixbuf);
- obj->priv->v_adjustment->page_size = GTK_WIDGET (obj)->allocation.height;
-#endif
gtk_adjustment_changed (obj->priv->v_adjustment);
}
}
diff --git a/src/tags/gnome-cmd-tags-poppler.cc b/src/tags/gnome-cmd-tags-poppler.cc
index 14f7027..f71b757 100644
--- a/src/tags/gnome-cmd-tags-poppler.cc
+++ b/src/tags/gnome-cmd-tags-poppler.cc
@@ -71,7 +71,6 @@ inline guint enum_bit_to_01(int enum_value, int enum_bit)
}
-#if GTK_CHECK_VERSION (2, 12, 0)
inline gdouble get_tolerance (gdouble size)
{
if (size < 150.0f)
@@ -79,65 +78,12 @@ inline gdouble get_tolerance (gdouble size)
return size >= 150.0f && size <= 600.0f ? 2.0f : 3.0f;
}
-#else /* ! GTK 2.12.0 */
-struct regular_paper_size
-{
- double width;
- double height;
- double width_tolerance;
- double height_tolerance;
- const char *description;
-}
-const regular_paper_sizes[] =
-{
- // ISO 216 paper sizes, all values are in mm. Source: http://en.wikipedia.org/wiki/Paper_size
- { 210.0f, 297.0f, 2.0f, 2.0f, "A4" },
- { 841.0f, 1189.0f, 3.0f, 3.0f, "A0" },
- { 594.0f, 841.0f, 2.0f, 3.0f, "A1" },
- { 420.0f, 594.0f, 2.0f, 2.0f, "A2" },
- { 297.0f, 420.0f, 2.0f, 2.0f, "A3" },
- { 148.0f, 210.0f, 1.5f, 2.0f, "A5" },
- { 105.0f, 148.0f, 1.5f, 1.5f, "A6" },
- { 74.0f, 105.0f, 1.5f, 1.5f, "A7" },
- { 52.0f, 74.0f, 1.5f, 1.5f, "A8" },
- { 37.0f, 52.0f, 1.5f, 1.5f, "A9" },
- { 26.0f, 37.0f, 1.5f, 1.5f, "A10" },
- { 1000.0f, 1414.0f, 3.0f, 3.0f, "B0" },
- { 707.0f, 1000.0f, 3.0f, 3.0f, "B1" },
- { 500.0f, 707.0f, 2.0f, 3.0f, "B2" },
- { 353.0f, 500.0f, 2.0f, 2.0f, "B3" },
- { 250.0f, 353.0f, 2.0f, 2.0f, "B4" },
- { 176.0f, 250.0f, 2.0f, 2.0f, "B5" },
- { 125.0f, 176.0f, 1.5f, 2.0f, "B6" },
- { 88.0f, 125.0f, 1.5f, 1.5f, "B7" },
- { 62.0f, 88.0f, 1.5f, 1.5f, "B8" },
- { 44.0f, 62.0f, 1.5f, 1.5f, "B9" },
- { 31.0f, 44.0f, 1.5f, 1.5f, "B10" },
- { 917.0f, 1297.0f, 3.0f, 3.0f, "C0" },
- { 648.0f, 917.0f, 3.0f, 3.0f, "C1" },
- { 458.0f, 648.0f, 2.0f, 3.0f, "C2" },
- { 324.0f, 458.0f, 2.0f, 2.0f, "C3" },
- { 229.0f, 324.0f, 2.0f, 2.0f, "C4" },
- { 162.0f, 229.0f, 2.0f, 2.0f, "C5" },
- { 114.0f, 162.0f, 1.5f, 2.0f, "C6" },
- { 81.0f, 114.0f, 1.5f, 1.5f, "C7" },
- { 57.0f, 81.0f, 1.5f, 1.5f, "C8" },
- { 40.0f, 57.0f, 1.5f, 1.5f, "C9" },
- { 28.0f, 40.0f, 1.5f, 1.5f, "C10" },
-
- // US paper sizes
- { 279.0f, 216.0f, 3.0f, 3.0f, "Letter" },
- { 356.0f, 216.0f, 3.0f, 3.0f, "Legal" },
- { 432.0f, 279.0f, 3.0f, 3.0f, "Ledger" }
-};
-#endif
static gchar *paper_name (gdouble doc_width, double doc_height)
{
gchar *s = NULL;
-#if GTK_CHECK_VERSION (2, 12, 0)
GList *paper_sizes = gtk_paper_size_get_paper_sizes (FALSE);
for (GList *l = paper_sizes; l && l->data; l = g_list_next (l))
@@ -170,24 +116,6 @@ static gchar *paper_name (gdouble doc_width, double doc_height)
g_list_foreach (paper_sizes, (GFunc) gtk_paper_size_free, NULL);
g_list_free (paper_sizes);
-#else /* ! GTK 2.12.0 */
-
- for (int i=G_N_ELEMENTS (regular_paper_sizes)-1; i >= 0; --i)
- {
- const regular_paper_size *size = ®ular_paper_sizes[i];
-
- if (ABS(doc_height - size->height) <= size->height_tolerance &&
- ABS(doc_width - size->width) <= size->width_tolerance)
- // Note to translators: first placeholder is the paper name (eg. * A4)
- return g_strdup_printf (_("%s, Portrait"), size->description);
- else
- if (ABS(doc_width - size->height) <= size->height_tolerance &&
- ABS(doc_height - size->width) <= size->width_tolerance)
- // Note to translators: first placeholder is the paper name (eg. * A4)
- return g_strdup_printf (_("%s, Landscape"), size->description);
- }
-#endif
-
return s;
}
#endif
diff --git a/src/utils.h b/src/utils.h
index 2a7b1ca..32d44aa 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -196,15 +196,10 @@ void set_cursor_busy_for_widget (GtkWidget *widget);
inline void set_cursor_default_for_widget (GtkWidget *widget)
{
-#if GTK_CHECK_VERSION (2, 14, 0)
GdkWindow *window = gtk_widget_get_window (widget);
if (window)
gdk_window_set_cursor (window, NULL);
-#else
- if (widget->window)
- gdk_window_set_cursor (widget->window, NULL);
-#endif
}
void set_cursor_busy ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
