From 959eec5cc2c784662bc319c9ae32bec60c9d5a43 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 5 Mar 2013 03:45:44 +0000
Subject: load custom mono font on OS X too

git-svn-id: svn://localhost/ardour2/branches/3.0@14140 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/main.cc | 2 --
 gtk2_ardour/wscript | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e53df29e21..19f48e9925 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -222,7 +222,6 @@ fixup_bundle_environment (int, char* [])
 }
 
 static void load_custom_fonts() {
-#ifdef OSX_CUSTOM_FONT
 	std::string ardour_mono_file;
 
 	if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
@@ -240,7 +239,6 @@ static void load_custom_fonts() {
 	if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
 		cerr << _("Cannot load ArdourMono TrueType font.") << endl;
 	}
-#endif
 }
 
 #else
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 6bf208958a..dd394fa68a 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -513,7 +513,7 @@ def build(bld):
                 'MASSIVE' : '60',
         }
         font_names = {
-                'MONOSPACE' : 'monospace',
+                'MONOSPACE' : 'ArdourMono',
         }
     else: # Linux/X11 fonts
         basefont = '' # unspecified - use system defaults
-- 
cgit v1.2.3