smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

additional GTKOSX => __APPLE__ changes missed in previous commit

Browse source
This commit is contained in:
Paul Davis 2015-10-27 14:35:55 -04:00
parent 56770ff0af
commit d2a6fec03a
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour.menus.in
View file

@ -43,12 +43,12 @@
</menu> </menu>
<separator/> <separator/>
<menuitem action='toggle-session-options-editor'/> <menuitem action='toggle-session-options-editor'/>
#ifdef GTKOSX #ifdef __APPLE__
<menuitem action='toggle-about'/> <menuitem action='toggle-about'/>
#endif #endif
<separator/> <separator/>
<menuitem action='lock'/> <menuitem action='lock'/>
#ifndef GTKOSX #ifndef __APPLE__
<separator/> <separator/>
<menuitem action='Quit'/> <menuitem action='Quit'/>
#endif #endif
@ -550,7 +550,7 @@
<separator/> <separator/>
</menu> </menu>
<menu name='Help' action='Help'> <menu name='Help' action='Help'>
#ifndef GTKOSX #ifndef __APPLE__
<menuitem action='toggle-about'/> <menuitem action='toggle-about'/>
#endif #endif
<menuitem action='chat'/> <menuitem action='chat'/>

4
gtk2_ardour/wscript
View file

@ -659,8 +659,8 @@ def build(bld):
# Menus # Menus
menus_argv = [] menus_argv = []
if bld.is_defined('GTKOSX'): if sys.platform == 'darwin':
menus_argv = [ '-E', '-P', '-DGTKOSX', '-' ] menus_argv = [ '-E', '-P', '-D__APPLE__', '-' ]
else: else:
menus_argv = [ '-E', '-P' ] menus_argv = [ '-E', '-P' ]

4
libs/gtkmm2ext/keyboard.cc
View file

@ -57,7 +57,7 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK;
guint Keyboard::insert_note_but = 1; guint Keyboard::insert_note_but = 1;
guint Keyboard::insert_note_mod = GDK_CONTROL_MASK; guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
#ifdef GTKOSX #ifdef __APPLE__
uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK; // Command uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK; // Command
guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control
@ -591,7 +591,7 @@ Keyboard::is_insert_note_event (GdkEventButton *ev)
bool bool
Keyboard::is_button2_event (GdkEventButton* ev) Keyboard::is_button2_event (GdkEventButton* ev)
{ {
#ifdef GTKOSX #ifdef __APPLE__
return (ev->button == 2) || return (ev->button == 2) ||
((ev->button == 1) && ((ev->button == 1) &&
((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers));

6
libs/gtkmm2ext/wscript
View file

@ -2,6 +2,8 @@
from waflib.extras import autowaf as autowaf from waflib.extras import autowaf as autowaf
from waflib import Options from waflib import Options
import os import os
import sys
import platform as PLATFORM
# Version of this package (even if built as a child) # Version of this package (even if built as a child)
MAJOR = '0' MAJOR = '0'
@ -105,7 +107,7 @@ def build(bld):
obj.includes = ['.'] obj.includes = ['.']
obj.name = 'libgtkmm2ext' obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext' obj.target = 'gtkmm2ext'
obj.uselib = 'GTKMM GTK GTKOSX OSX GDK' obj.uselib = 'GTKMM GTK'
obj.use = [ 'libpbd', 'libardour' ] obj.use = [ 'libpbd', 'libardour' ]
obj.vnum = GTKMM2EXT_LIB_VERSION obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
@ -113,7 +115,7 @@ def build(bld):
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join( 'LOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
if bld.is_defined('GTKOSX'): if sys.platform == 'darwin':
obj.source += ['gtkapplication_quartz.mm'] obj.source += ['gtkapplication_quartz.mm']
else: else:
obj.source += ['gtkapplication_x11.c'] obj.source += ['gtkapplication_x11.c']

2
wscript
View file

@ -846,7 +846,7 @@ def configure(conf):
conf.define ('HAVE_COREAUDIO', 1) conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 1) conf.define ('AUDIOUNIT_SUPPORT', 1)
conf.define ('TOP_MENUBAR',1) Conf.define ('TOP_MENUBAR',1)
# It would be nice to be able to use this to force back-compatibility with 10.4 # It would be nice to be able to use this to force back-compatibility with 10.4
# but even by the time of 11, the 10.4 SDK is no longer available in any normal # but even by the time of 11, the 10.4 SDK is no longer available in any normal