diff --git a/src/menu.cc b/src/menu.cc index 55c86c1..e8888e6 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -435,13 +435,8 @@ void Menu::set_keys() { auto application=Glib::RefPtr::cast_static(gio_application); for(auto &key: Config::get().menu.keys) { - if(key.second.size()>0 && actions.find(key.first)!=actions.end()) { -#if GTK_VERSION_GE(3, 12) - application->set_accel_for_action("app."+key.first, key.second); -#else - application->add_accelerator(key.second, "app."+key.first); //For Ubuntu 14... -#endif - } + if(key.second.size()>0 && actions.find(key.first)!=actions.end()) + application->set_accel_for_action("app."+key.first, key.second); } } diff --git a/src/terminal.cc b/src/terminal.cc index cc74e2f..0c8d71f 100644 --- a/src/terminal.cc +++ b/src/terminal.cc @@ -310,9 +310,7 @@ void Terminal::async_print(size_t line_nr, const std::string &message) { } void Terminal::configure() { -#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=12) link_tag->property_foreground_rgba()=get_style_context()->get_color(Gtk::StateFlags::STATE_FLAG_LINK); -#endif if(Config::get().terminal.font.size()>0) { override_font(Pango::FontDescription(Config::get().terminal.font)); diff --git a/src/window.cc b/src/window.cc index f900b2d..6df4059 100644 --- a/src/window.cc +++ b/src/window.cc @@ -47,12 +47,7 @@ Window::Window() { auto info_and_status_hbox=Gtk::manage(new Gtk::HBox()); info_and_status_hbox->pack_start(Notebook::get().info, Gtk::PACK_SHRINK); -#if GTK_VERSION_GE(3, 12) info_and_status_hbox->set_center_widget(Project::debug_status_label()); -#else - Project::debug_status_label().set_halign(Gtk::Align::ALIGN_CENTER); - info_and_status_hbox->pack_start(Project::debug_status_label()); -#endif info_and_status_hbox->pack_end(Notebook::get().status, Gtk::PACK_SHRINK); terminal_scrolled_window.add(Terminal::get()); @@ -65,7 +60,6 @@ Window::Window() { vpaned.pack1(directory_and_notebook_panes, true, false); vpaned.pack2(*terminal_vbox, true, true); -#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=14) auto overlay_vbox=Gtk::manage(new Gtk::VBox()); auto overlay_hbox=Gtk::manage(new Gtk::HBox()); overlay_vbox->set_hexpand(false); @@ -82,9 +76,6 @@ Window::Window() { overlay->set_overlay_pass_through(*overlay_hbox, true); #endif add(*overlay); -#else - add(vpaned); -#endif show_all_children(); Info::get().hide();