waf build works on OS X ; new bindings file and processing system in place for mnemonic-us

git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 48 insertions, 35 deletions

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 60ec7e1cd6..53d642ce23 100644
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -369,7 +369,7 @@ BarController::expose (GdkEventExpose* /*event*/)
 }
 
 void
-BarController::set_style (Style s)
+BarController::set_style (barStyle s)
 {
 	_style = s;
 	darea.queue_draw ();
diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
index 9c9c4c18b9..e5c01c7191 100644
--- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h
@@ -33,7 +33,7 @@ class BarController : public Gtk::Frame
 
 	virtual ~BarController () {}
 
-	enum Style {
+	enum barStyle {
 		LeftToRight,
 		RightToLeft,
 		Line,
@@ -43,8 +43,8 @@ class BarController : public Gtk::Frame
 		BottomToTop
 	};
 
-	Style style() const { return _style; }
-	void set_style (Style);
+	barStyle style() const { return _style; }
+	void set_style (barStyle);
 	void set_use_parent (bool yn);
 
 	void set_sensitive (bool yn);
@@ -64,7 +64,7 @@ class BarController : public Gtk::Frame
 	BindingProxy        binding_proxy;
 	Gtk::DrawingArea    darea;
 	Glib::RefPtr<Pango::Layout> layout;
-	Style              _style;
+	barStyle              _style;
 	bool                grabbed;
 	bool                switching;
 	bool                switch_on_release;
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
index 18c1e5cac0..4a1bbb9051 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
@@ -17,6 +17,13 @@
 
 */
 
+#ifdef GTKOSX
+#include <MacTypes.h>
+#if defined(Style)
+#undef style
+#endif
+#endif
+
 #ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ 
 #define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__
 
@@ -37,7 +44,7 @@ class CellRendererPixbufToggle : public Gtk::CellRenderer
 	CellRendererPixbufToggle();  
 	virtual ~CellRendererPixbufToggle(){};
 
-	virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags);  
+	virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags);
 
 	virtual void get_size_vfunc (Gtk::Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const;
 
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 212a471989..7c8f4cda99 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -18,6 +18,34 @@ GTKMM2EXT_LIB_VERSION = '0.8.3'
 APPNAME = 'gtkmm2ext'
 VERSION = GTKMM2EXT_VERSION
 
+gtkmm2ext_sources = [
+	'auto_spin.cc',
+	'barcontroller.cc',
+	'binding_proxy.cc',
+	'cell_renderer_pixbuf_toggle.cc',
+	'choice.cc',
+	'click_box.cc',
+	'dndtreeview.cc',
+	'fastmeter.cc',
+	'focus_entry.cc',
+	'grouped_buttons.cc',
+	'gtk_ui.cc',
+	'idle_adjustment.cc',
+	'pixfader.cc',
+	'pixscroller.cc',
+	'popup.cc',
+	'prompter.cc',
+	'scroomer.cc',
+	'selector.cc',
+	'slider_controller.cc',
+	'stateful_button.cc',
+	'tearoff.cc',
+	'textviewer.cc',
+	'utils.cc',
+	'version.cc',
+	'window_title.cc'
+]
+
 # Mandatory variables
 srcdir = '.'
 blddir = 'build'
@@ -33,41 +61,17 @@ def configure(conf):
 	autowaf.configure(conf)
 	conf.check_tool('compiler_cxx')
 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
+	autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
+
 
 def build(bld):
-	obj = bld.new_task_gen('cxx', 'shlib')
-	obj.source = '''
-		auto_spin.cc
-		barcontroller.cc
-		binding_proxy.cc
-		cell_renderer_pixbuf_toggle.cc
-		choice.cc
-		click_box.cc
-		dndtreeview.cc
-		fastmeter.cc
-		focus_entry.cc
-		grouped_buttons.cc
-		gtk_ui.cc
-		idle_adjustment.cc
-		pixfader.cc
-		pixscroller.cc
-		popup.cc
-		prompter.cc
-		scroomer.cc
-		selector.cc
-		slider_controller.cc
-		stateful_button.cc
-		tearoff.cc
-		textviewer.cc
-		utils.cc
-		version.cc
-		window_title.cc
-	'''
+	obj = bld.new_task_gen(features = 'cc cxx cshlib')
+	obj.source = gtkmm2ext_sources
 	obj.export_incdirs = ['.']
 	obj.includes     = ['.']
 	obj.name         = 'libgtkmm2ext'
 	obj.target       = 'gtkmm2ext'
-	obj.uselib       = 'GTKMM'
+	obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
 	obj.uselib_local = 'libpbd'
 	obj.vnum         = GTKMM2EXT_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
@@ -75,6 +79,8 @@ def build(bld):
 			'-DPACKAGE="libgtkmm2ext"',
 			'-DLOCALEDIR="' + os.path.join(
 				os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
+	if bld.env['GTKOSX']:
+		obj.source	+= ['sync-menu.c']
 
 def shutdown():
 	autowaf.shutdown()