ardour/livetrax
13
0
Fork 0
Code

Removed usage of deprecated APIs.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1433 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2007-02-08 18:13:57 +00:00
parent 766b3d8a6d
commit a4c116ec07
8 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/SConscript
View File

@ -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)

3
gtk2_ardour/mixer_strip.cc
View File

@ -268,8 +268,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
if (scrollbar_height == 0) {
HScrollbar scrollbar;
Gtk::Requisition requisition;
scrollbar.size_request (requisition);
Gtk::Requisition requisition(scrollbar.size_request ());
scrollbar_height = requisition.height;
}

7
gtk2_ardour/time_axis_view.cc
View File

@ -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

1
libs/ardour/SConscript
View File

@ -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')

5
libs/glibmm2/SConscript
View File

@ -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)

8
libs/gtkmm2/gdk/SConscript
View File

@ -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)

2
libs/gtkmm2/gtk/SConscript
View File

@ -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'],

3
libs/gtkmm2ext/SConscript
View File

@ -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')