diff --git a/configure.ac b/configure.ac index ee8a0e9..9790fd5 100644 --- a/configure.ac +++ b/configure.ac @@ -41,26 +41,7 @@ AC_TYPE_SIGNAL AC_HEADER_STDC AX_CXX_COMPILE_STDCXX_11 -AC_ARG_ENABLE(gtk3, - [AS_HELP_STRING([--disable-gtk3], - [Whether to build or not against gtk3 [default=yes]])], - [enable_gtk3=$enableval], - [enable_gtk3="yes"]) - -if test "x$enable_gtk3" = "xyes"; then - gtkmm_ver="3.0" - gtkmm_min_ver="2.99" - canberra_ver="3" - AC_DEFINE([HAVE_GTK3], [1], [Define if we are building against gtk3]) - echo "***" - echo "*** Attempting build in GTK3 mode. Use --disable-gtk3 to build for GTK2" - echo "***" -else - gtkmm_ver="2.4" - gtkmm_min_ver="2.16" - canberra_ver="" -fi -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-$gtkmm_ver >= $gtkmm_min_ver sigc++-2.0 libcanberra-gtk$canberra_ver >= 0.16 ]) +PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.0 sigc++-2.0 libcanberra-gtk3 >= 0.16 ]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) diff --git a/src/devicewidget.cc b/src/devicewidget.cc index ce9850f..0a51bc0 100644 --- a/src/devicewidget.cc +++ b/src/devicewidget.cc @@ -70,13 +70,8 @@ DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtrconfigure(offsetAdjustment, 0, 2); -#else - offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 5000.0, 10.0, 50.0, 0.0); - offsetButton->configure(*offsetAdjustment, 0.0, 2); -#endif /* HAVE_GTK3 */ } void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) { diff --git a/src/devicewidget.h b/src/devicewidget.h index 3bff264..30a6672 100644 --- a/src/devicewidget.h +++ b/src/devicewidget.h @@ -101,11 +101,7 @@ protected: Gtk::HBox *portSelect, *offsetSelect; Gtk::ComboBox *portList; Glib::RefPtr treeModel; -#ifdef HAVE_GTK3 Glib::RefPtr offsetAdjustment; -#else - Gtk::Adjustment *offsetAdjustment; -#endif /* HAVE_GTK3 */ private: Glib::ustring mDeviceType; diff --git a/src/mainwindow.cc b/src/mainwindow.cc index da598fd..3f5bf2b 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -196,11 +196,7 @@ MainWindow* MainWindow::create(bool maximize) { void MainWindow::on_realize() { Gtk::Window::on_realize(); -#ifdef HAVE_GTK3 get_window()->set_cursor(Gdk::Cursor::create(Gdk::WATCH)); -#else - get_window()->set_cursor(Gdk::Cursor(Gdk::WATCH)); -#endif /* HAVE_GTK3 */ } bool MainWindow::on_key_press_event(GdkEventKey* event) { diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 03e4fb0..3602d5b 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -1,6 +1,6 @@ - + 100 44.2408370972