From a4c116ec07eefeb113a2087c2091b7090e0036ec Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Thu, 8 Feb 2007 18:13:57 +0000 Subject: [PATCH] Removed usage of deprecated APIs. git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1433 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SConscript | 3 +++ gtk2_ardour/mixer_strip.cc | 3 +-- gtk2_ardour/time_axis_view.cc | 7 ++----- libs/ardour/SConscript | 1 + libs/glibmm2/SConscript | 5 +++-- libs/gtkmm2/gdk/SConscript | 8 +++++++- libs/gtkmm2/gtk/SConscript | 2 ++ libs/gtkmm2ext/SConscript | 3 +++ 8 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index bf97529d49..755b779fec 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -19,6 +19,9 @@ gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS="-DGLIBMM_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS="-DGDKMM_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS="-DGTKMM_DISABLE_DEPRECATED") gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA") gtkardour.Append(PACKAGE=domain) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 10f65536af..e75a7d907c 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -268,8 +268,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt if (scrollbar_height == 0) { HScrollbar scrollbar; - Gtk::Requisition requisition; - scrollbar.size_request (requisition); + Gtk::Requisition requisition(scrollbar.size_request ()); scrollbar_height = requisition.height; } diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 36bf40ae36..ce135706d7 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -969,13 +969,10 @@ TimeAxisView::compute_controls_size_info () buttons[i]->set_name ("TrackMuteButton"); } - Gtk::Requisition req; - one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); one_row_table.show_all (); - one_row_table.size_request (req); - + Gtk::Requisition req (one_row_table.size_request ()); // height required to show 1 row of buttons @@ -990,7 +987,7 @@ TimeAxisView::compute_controls_size_info () two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); two_row_table.show_all (); - two_row_table.size_request (req); + req = two_row_table.size_request (); // height required to show all normal buttons diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index b602613a6a..bc3b16d067 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -17,6 +17,7 @@ domain = 'libardour' ardour.Append(DOMAIN = domain, MAJOR = 2, MINOR = 0, MICRO = 0) ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"") ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +ardour.Append(CXXFLAGS="-DGLIBMM_DISABLE_DEPRECATED") ardour.Append(PACKAGE = domain) ardour.Append(POTFILE = domain + '.pot') diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 199cb1ef7f..8fc3e7003d 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -10,10 +10,11 @@ glibmm2_files = glob.glob('glibmm/*.cc') Import('env libraries install_prefix') glibmm2 = env.Copy() -glibmm2.Merge([libraries['sigc2'], libraries['glib2']]) +glibmm2.Merge([ libraries['sigc2'], + libraries['glib2'] ]) glibmm2.Append(CXXFLAGS='-DHAVE_CONFIG_H') -glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED') +glibmm2.Append(CXXFLAGS='-DGLIBMM_DISABLE_DEPRECATED') glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files) diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript index 671c3b87b7..dbd8c0845f 100644 --- a/libs/gtkmm2/gdk/SConscript +++ b/libs/gtkmm2/gdk/SConscript @@ -8,8 +8,14 @@ gdkmm2_files = glob.glob('gdkmm/*.cc') Import('env libraries install_prefix') gdkmm2 = env.Copy() -gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['cairomm']]) +gdkmm2.Merge([ libraries['glibmm2'], + libraries['gtk2'], + libraries['sigc2'], + libraries['pangomm'], + libraries['cairomm'] ]) + gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk") +gdkmm2.Append(CXXFLAGS="-DGDKMM_DISABLE_DEPRECATED") libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files) Default(libgdkmm2) diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript index 4ba028fd6b..feb4a24618 100644 --- a/libs/gtkmm2/gtk/SConscript +++ b/libs/gtkmm2/gtk/SConscript @@ -9,6 +9,8 @@ gtkmm2_files = glob.glob('gtkmm/*.cc') Import('env libraries install_prefix') gtkmm2 = env.Copy() +gtkmm2.Append(CXXFLAGS="-DGTKMM_DISABLE_DEPRECATED") + gtkmm2.Merge([ libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 3c1b367c8a..429836080a 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -28,6 +28,9 @@ domain = 'libgtkmm2ext' gtkmm2ext.Append(DOMAIN=domain,MAJOR=0,MINOR=8,MICRO=3) gtkmm2ext.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkmm2ext.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkmm2ext.Append(CXXFLAGS="-DGLIBMM_DISABLE_DEPRECATED") +gtkmm2ext.Append(CXXFLAGS="-DGDKMM_DISABLE_DEPRECATED") +gtkmm2ext.Append(CXXFLAGS="-DGTKMM_DISABLE_DEPRECATED") #gtkmm2ext.Append(CPPPATH='#libs/surfaces/control_protocol') gtkmm2ext.Append(PACKAGE=domain) gtkmm2ext.Append(POTFILE=domain + '.pot')