itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added back support for gtkmm-2.4 builds

This commit is contained in:
Alam Arias 2013-03-08 14:27:02 -05:00 committed by Tanu Kaskinen
parent 85e09f48a9
commit 0d7cbc57a0
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/devicewidget.cc
View File

@ -63,8 +63,13 @@ DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
for (unsigned i = 0; i < PA_CHANNELS_MAX; i++) for (unsigned i = 0; i < PA_CHANNELS_MAX; i++)
channelWidgets[i] = NULL; channelWidgets[i] = NULL;
#ifdef HAVE_GTK3
offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
offsetButton->configure(offsetAdjustment, 0, 2); offsetButton->configure(offsetAdjustment, 0, 2);
#else
offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
offsetButton->configure(*offsetAdjustment, 0.0, 2);
#endif /* HAVE_GTK3 */
} }
void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) { void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) {

4
src/devicewidget.h
View File

@ -98,7 +98,11 @@ protected:
Gtk::HBox *portSelect, *offsetSelect; Gtk::HBox *portSelect, *offsetSelect;
Gtk::ComboBox *portList; Gtk::ComboBox *portList;
Glib::RefPtr<Gtk::ListStore> treeModel; Glib::RefPtr<Gtk::ListStore> treeModel;
#ifdef HAVE_GTK3
Glib::RefPtr<Gtk::Adjustment> offsetAdjustment; Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
#else
Gtk::Adjustment *offsetAdjustment;
#endif /* HAVE_GTK3 */
private: private:
Glib::ustring mDeviceType; Glib::ustring mDeviceType;