Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 08:30:06 +02:00
Code Issues Releases Wiki Activity

Initial changes to build against wx313

Browse Source
This commit is contained in:
Leland Lucius 2020-05-22 23:43:00 -05:00
parent 29201bba1b
commit fadc024432
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib-src/FileDialog/mac/FileDialogPrivate.mm
View File

@ -11,7 +11,6 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#define OSFILENAME(X) ((char *) (const char *)(X).fn_str())
// ============================================================================ // ============================================================================
// declarations // declarations
// ============================================================================ // ============================================================================
@ -41,11 +40,11 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/evtloop.h> #include <wx/evtloop.h>
#include <wx/osx/private.h> #include <wx/osx/core/private.h>
#include <wx/sysopt.h> #include <wx/sysopt.h>
#include <wx/modalhook.h> #include <wx/modalhook.h>
#include <mach-o/dyld.h> #include <AppKit/AppKit.h>
// ============================================================================ // ============================================================================
// implementation // implementation

3
src/KeyboardCapture.cpp
View File

@ -13,7 +13,8 @@
#if defined(__WXMAC__) #if defined(__WXMAC__)
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <wx/osx/private.h> #include <wx/osx/core/private.h>
#include <wx/osx/cocoa/private.h>
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include <gtk/gtk.h> #include <gtk/gtk.h>
#endif #endif

3
src/effects/VST/VSTControlOSX.h
View File

@ -15,7 +15,8 @@
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#endif #endif
#include <wx/osx/private.h> // to inherit wxWidgetCocoaImpl #include <wx/osx/core/private.h>
#include <wx/osx/cocoa/private.h>
#include "VSTControl.h" #include "VSTControl.h"

2
src/effects/VST/VSTControlOSX.mm
View File

@ -45,7 +45,7 @@
@end @end
VSTControlImpl::VSTControlImpl(wxWindowMac *peer, NSView *view) VSTControlImpl::VSTControlImpl(wxWindowMac *peer, NSView *view)
: wxWidgetCocoaImpl(peer, view, false, false) : wxWidgetCocoaImpl(peer, view)
{ {
} }

5
src/effects/audiounits/AUControl.h
View File

@ -22,8 +22,9 @@
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#endif #endif
#include <wx/osx/private.h> // to inherit wxWidgetCocoaImpl #include <wx/osx/core/private.h>
#include <wx/control.h> // to inherit #include <wx/osx/cocoa/private.h>
#include <wx/control.h>
#include <AudioUnit/AudioComponent.h> #include <AudioUnit/AudioComponent.h>
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>

2
src/effects/audiounits/AUControl.mm
View File

@ -104,7 +104,7 @@
@end @end
AUControlImpl::AUControlImpl(wxWindowMac *peer, NSView *view) AUControlImpl::AUControlImpl(wxWindowMac *peer, NSView *view)
: wxWidgetCocoaImpl(peer, view, false, false) : wxWidgetCocoaImpl(peer, view)
{ {
} }

3
src/effects/lv2/NativeWindow.h
View File

@ -17,7 +17,8 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include <wx/msw/private.h> #include <wx/msw/private.h>
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include <wx/osx/private.h> #include <wx/osx/core/private.h>
#include <wx/osx/cocoa/private.h>
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include <gtk/gtk.h> #include <gtk/gtk.h>
#endif #endif