diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-27 14:35:55 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:25 -0500 |
| commit | d2a6fec03a8b1d6a91f75201a1950b08fc875d36 (patch) | |
| tree | 483ecb2db9b86727364fe021745f63463a5ea451 /libs | |
| parent | 56770ff0af1cc532837802cf66f3032a4805ba62 (diff) | |
additional GTKOSX => __APPLE__ changes missed in previous commit
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/wscript | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 41d9f668e2..690ea024cf 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -57,7 +57,7 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK; guint Keyboard::insert_note_but = 1; guint Keyboard::insert_note_mod = GDK_CONTROL_MASK; -#ifdef GTKOSX +#ifdef __APPLE__ uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK; // Command guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control @@ -591,7 +591,7 @@ Keyboard::is_insert_note_event (GdkEventButton *ev) bool Keyboard::is_button2_event (GdkEventButton* ev) { -#ifdef GTKOSX +#ifdef __APPLE__ return (ev->button == 2) || ((ev->button == 1) && ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 0640f58d51..59d9c35243 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -2,6 +2,8 @@ from waflib.extras import autowaf as autowaf from waflib import Options import os +import sys +import platform as PLATFORM # Version of this package (even if built as a child) MAJOR = '0' @@ -105,7 +107,7 @@ def build(bld): obj.includes = ['.'] obj.name = 'libgtkmm2ext' obj.target = 'gtkmm2ext' - obj.uselib = 'GTKMM GTK GTKOSX OSX GDK' + obj.uselib = 'GTKMM GTK' obj.use = [ 'libpbd', 'libardour' ] obj.vnum = GTKMM2EXT_LIB_VERSION obj.install_path = bld.env['LIBDIR'] @@ -113,7 +115,7 @@ def build(bld): 'PACKAGE="' + I18N_PACKAGE + '"', 'LOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] - if bld.is_defined('GTKOSX'): + if sys.platform == 'darwin': obj.source += ['gtkapplication_quartz.mm'] else: obj.source += ['gtkapplication_x11.c'] |