Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-12 15:45:54 +01:00
Code Issues Releases Wiki Activity

Add missing files to Mac build.

Browse Source 
Also moved the constructor into the .cpp file, so that wxWindow is a fully defined class.
This commit is contained in:
James Crook
2018-04-04 14:01:51 +01:00
parent 082ab5ca28
commit c0e1c82be9
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mac/Audacity.xcodeproj/project.pbxproj
View File

@@ -1274,6 +1274,7 @@
5EF3E65F203FDFE9006C6882 /* SetEnvelopeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF3E65D203FDFE9006C6882 /* SetEnvelopeCommand.cpp */; }; 5EF3E65F203FDFE9006C6882 /* SetEnvelopeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF3E65D203FDFE9006C6882 /* SetEnvelopeCommand.cpp */; };
5EF3E662203FE73C006C6882 /* DragCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF3E660203FE73C006C6882 /* DragCommand.cpp */; }; 5EF3E662203FE73C006C6882 /* DragCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF3E660203FE73C006C6882 /* DragCommand.cpp */; };
5EF958851DEB121800191280 /* InconsistencyException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF958831DEB121800191280 /* InconsistencyException.cpp */; }; 5EF958851DEB121800191280 /* InconsistencyException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF958831DEB121800191280 /* InconsistencyException.cpp */; };
659B26C5207501970039894A /* WindowAccessible.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 659B26C3207501970039894A /* WindowAccessible.cpp */; };
8406A93812D0F2510011EA01 /* EQDefaultCurves.xml in Resources */ = {isa = PBXBuildFile; fileRef = 8406A93712D0F2510011EA01 /* EQDefaultCurves.xml */; }; 8406A93812D0F2510011EA01 /* EQDefaultCurves.xml in Resources */ = {isa = PBXBuildFile; fileRef = 8406A93712D0F2510011EA01 /* EQDefaultCurves.xml */; };
8484F31413086237002DF7F0 /* DeviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484F31213086237002DF7F0 /* DeviceManager.cpp */; }; 8484F31413086237002DF7F0 /* DeviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484F31213086237002DF7F0 /* DeviceManager.cpp */; };
AA0084191EA8C6E70070CCE3 /* TracksBehaviorsPrefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0084181EA8C6E70070CCE3 /* TracksBehaviorsPrefs.cpp */; }; AA0084191EA8C6E70070CCE3 /* TracksBehaviorsPrefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0084181EA8C6E70070CCE3 /* TracksBehaviorsPrefs.cpp */; };
@@ -3190,6 +3191,8 @@
5EF3E661203FE73C006C6882 /* DragCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragCommand.h; sourceTree = "<group>"; }; 5EF3E661203FE73C006C6882 /* DragCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragCommand.h; sourceTree = "<group>"; };
5EF958831DEB121800191280 /* InconsistencyException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InconsistencyException.cpp; sourceTree = "<group>"; }; 5EF958831DEB121800191280 /* InconsistencyException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InconsistencyException.cpp; sourceTree = "<group>"; };
5EF958841DEB121800191280 /* InconsistencyException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InconsistencyException.h; sourceTree = "<group>"; }; 5EF958841DEB121800191280 /* InconsistencyException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InconsistencyException.h; sourceTree = "<group>"; };
659B26C3207501970039894A /* WindowAccessible.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowAccessible.cpp; sourceTree = "<group>"; };
659B26C4207501970039894A /* WindowAccessible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowAccessible.h; sourceTree = "<group>"; };
82FF184D13CF01A600C1B664 /* dBTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dBTable.cpp; path = sbsms/src/dBTable.cpp; sourceTree = "<group>"; }; 82FF184D13CF01A600C1B664 /* dBTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dBTable.cpp; path = sbsms/src/dBTable.cpp; sourceTree = "<group>"; };
82FF184E13CF01A600C1B664 /* dBTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dBTable.h; path = sbsms/src/dBTable.h; sourceTree = "<group>"; }; 82FF184E13CF01A600C1B664 /* dBTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dBTable.h; path = sbsms/src/dBTable.h; sourceTree = "<group>"; };
82FF184F13CF01A600C1B664 /* slide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slide.cpp; path = sbsms/src/slide.cpp; sourceTree = "<group>"; }; 82FF184F13CF01A600C1B664 /* slide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slide.cpp; path = sbsms/src/slide.cpp; sourceTree = "<group>"; };
@@ -4546,6 +4549,8 @@
1790B0FD09883BFD008A330A /* widgets */ = { 1790B0FD09883BFD008A330A /* widgets */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
659B26C3207501970039894A /* WindowAccessible.cpp */,
659B26C4207501970039894A /* WindowAccessible.h */,
1790B0FE09883BFD008A330A /* AButton.cpp */, 1790B0FE09883BFD008A330A /* AButton.cpp */,
1790B0FF09883BFD008A330A /* AButton.h */, 1790B0FF09883BFD008A330A /* AButton.h */,
1790B10009883BFD008A330A /* ASlider.cpp */, 1790B10009883BFD008A330A /* ASlider.cpp */,
@@ -7963,6 +7968,7 @@
5E73966B1DAFDB5600BA0A4D /* LabelTextHandle.cpp in Sources */, 5E73966B1DAFDB5600BA0A4D /* LabelTextHandle.cpp in Sources */,
284B27E40FC66CCD005EAC96 /* TracksPrefs.cpp in Sources */, 284B27E40FC66CCD005EAC96 /* TracksPrefs.cpp in Sources */,
284B27E50FC66CCD005EAC96 /* WarningsPrefs.cpp in Sources */, 284B27E50FC66CCD005EAC96 /* WarningsPrefs.cpp in Sources */,
659B26C5207501970039894A /* WindowAccessible.cpp in Sources */,
5E15125B1DB000DC00702E29 /* LabelTrackUI.cpp in Sources */, 5E15125B1DB000DC00702E29 /* LabelTrackUI.cpp in Sources */,
5E667A691F0D723A00C942A5 /* TrackPanelResizerCell.cpp in Sources */, 5E667A691F0D723A00C942A5 /* TrackPanelResizerCell.cpp in Sources */,
28D540050FD1912A00FA7C75 /* AppCommandEvent.cpp in Sources */, 28D540050FD1912A00FA7C75 /* AppCommandEvent.cpp in Sources */,

8
src/widgets/WindowAccessible.cpp
View File

@@ -19,6 +19,12 @@ contained GetParent() which was incorrect.
#if wxUSE_ACCESSIBILITY #if wxUSE_ACCESSIBILITY
WindowAccessible::WindowAccessible(wxWindow* win)
: wxAccessible(win)
{
if (win) win->SetAccessible(this);
}
wxAccStatus WindowAccessible::GetName(int childId, wxString* name) wxAccStatus WindowAccessible::GetName(int childId, wxString* name)
{ {
wxCHECK( GetWindow() != nullptr, wxACC_FAIL); wxCHECK( GetWindow() != nullptr, wxACC_FAIL);
@@ -31,4 +37,4 @@ wxAccStatus WindowAccessible::GetName(int childId, wxString* name)
return wxACC_OK; return wxACC_OK;
} }
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY

4
src/widgets/WindowAccessible.h
View File

@@ -20,7 +20,7 @@
class WindowAccessible: public wxAccessible class WindowAccessible: public wxAccessible
{ {
public: public:
WindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } WindowAccessible(wxWindow* win);
virtual ~WindowAccessible() {} virtual ~WindowAccessible() {}
wxAccStatus GetName(int childId, wxString* name) override; wxAccStatus GetName(int childId, wxString* name) override;
@@ -28,4 +28,4 @@ public:
}; };
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY
#endif // __AUDACITY_WINDOW_ACCESSIBLE__ #endif // __AUDACITY_WINDOW_ACCESSIBLE__