summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-09 09:33:34 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-09 09:33:34 +0000
commit577a95c2028790cbb856feda6ac6880ddd1aaad2 (patch)
tree4ff78f6fa8f0c1b740fd43b0ade2b91dbf9226d0 /src/main.cpp
parentMerged trunk (diff)
parentRemove deprecated Autotools and btool files. Please use CMake instead (diff)
downloadinkscape-577a95c2028790cbb856feda6ac6880ddd1aaad2.tar.gz
inkscape-577a95c2028790cbb856feda6ac6880ddd1aaad2.zip
Merged trunk
(bzr r14954.1.30)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 1cfcc57fc..28bdf8359 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -46,10 +46,8 @@
#include <libxml/tree.h>
-#if GTK_CHECK_VERSION(3,0,0)
#include <gtkmm/cssprovider.h>
#include <gdkmm/screen.h>
-#endif
#include "inkgc/gc-core.h"
@@ -1042,8 +1040,6 @@ sp_main_gui(int argc, char const **argv)
#endif
g_free(usericondir);
-
-#if GTK_CHECK_VERSION(3,0,0)
// Add style sheet (GTK3)
Glib::RefPtr<Gdk::Screen> screen = Gdk::Screen::get_default();
@@ -1100,7 +1096,6 @@ sp_main_gui(int argc, char const **argv)
Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
-#endif
gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL);
Inkscape::Debug::log_display_config();