1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 07:39:42 +02:00

Initial changes to build against wx313

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

View File

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

View File

@ -13,7 +13,8 @@
#if defined(__WXMAC__)
#include <wx/textctrl.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__)
#include <gtk/gtk.h>
#endif

View File

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

View File

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

View File

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

View File

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

View File

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