From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 12:06:06 +0200
Subject: Removed unused includes, decrease compilation time

(bzr r15025)
---
 src/inkview.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..b377a3bd0 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,7 +35,6 @@
 #include <locale.h>
 
 #include <gtkmm/main.h>
-#include <glib.h>
 
 // #include <stropts.h>
 
@@ -58,8 +57,6 @@
 
 #include "inkscape.h"
 
-#include <iostream>
-
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
-- 
cgit v1.2.3


From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 13:26:17 +0200
Subject: Reverted changes to r15024 after many building problems

(bzr r15027)
---
 src/inkview.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index b377a3bd0..db4b1aeb0 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,6 +35,7 @@
 #include <locale.h>
 
 #include <gtkmm/main.h>
+#include <glib.h>
 
 // #include <stropts.h>
 
@@ -57,6 +58,8 @@
 
 #include "inkscape.h"
 
+#include <iostream>
+
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
-- 
cgit v1.2.3


From 49a7927ecf31ace696e9e5770e8d6543c356db7a Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 28 Jul 2016 19:15:34 +0100
Subject: Finish removing GTK+ 2 fallbacks

(bzr r15023.2.8)
---
 src/inkview.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..f6dfe34fe 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -346,13 +346,7 @@ static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss)
         gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window));
         g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss);
         g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL);
-
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-        GtkWidget *t = gtk_hbutton_box_new();
-#endif
-
+        auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
         gtk_container_add(GTK_CONTAINER(ctrlwin), t);
 
 #if GTK_CHECK_VERSION(3,10,0)
@@ -431,19 +425,11 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss)
     GdkDisplay *display = gdk_display_get_default();
     GdkCursor  *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
     gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
     g_object_unref(waiting);
-#else
-    gdk_cursor_unref(waiting);
-#endif
     if (ctrlwin) {
         GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
         gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
         g_object_unref(waiting);
-#else
-        gdk_cursor_unref(waiting);
-#endif
     }
     while(gtk_events_pending()) {
        gtk_main_iteration();
-- 
cgit v1.2.3


From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 3 Aug 2016 15:29:38 +0200
Subject: Removed unused includes, decreased compilation time. Once again

(bzr r15034)
---
 src/inkview.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..b377a3bd0 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,7 +35,6 @@
 #include <locale.h>
 
 #include <gtkmm/main.h>
-#include <glib.h>
 
 // #include <stropts.h>
 
@@ -58,8 +57,6 @@
 
 #include "inkscape.h"
 
-#include <iostream>
-
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
-- 
cgit v1.2.3