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

Make new patch work with -p0

Browse Source
This commit is contained in:
Paul Licameli 2016-07-31 21:13:30 -04:00
parent e0f1e9a5ff
commit c637b09631
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mac/wxMac_additions/eventloops.patch
View File

@ -20,8 +20,8 @@ http://bugzilla.audacityteam.org/show_bug.cgi?id=1338
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 1133473..4b23610 100644 index 1133473..4b23610 100644
--- a/include/wx/evtloop.h --- include/wx/evtloop.h
+++ b/include/wx/evtloop.h +++ include/wx/evtloop.h
@@ -177,6 +177,16 @@ public: @@ -177,6 +177,16 @@ public:
// set currently active (running) event loop // set currently active (running) event loop
static void SetActive(wxEventLoopBase* loop); static void SetActive(wxEventLoopBase* loop);
@ -41,8 +41,8 @@ index 1133473..4b23610 100644
// real implementation of Run() // real implementation of Run()
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index f7b5138..325fd54 100644 index f7b5138..325fd54 100644
--- a/src/common/evtloopcmn.cpp --- src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp +++ src/common/evtloopcmn.cpp
@@ -56,6 +56,20 @@ void wxEventLoopBase::SetActive(wxEventLoopBase* loop) @@ -56,6 +56,20 @@ void wxEventLoopBase::SetActive(wxEventLoopBase* loop)
wxTheApp->OnEventLoopEnter(loop); wxTheApp->OnEventLoopEnter(loop);
} }
@ -66,8 +66,8 @@ index f7b5138..325fd54 100644
// event loops are not recursive, you need to create another loop! // event loops are not recursive, you need to create another loop!
diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 7e70dec..510af80 100644 index 7e70dec..510af80 100644
--- a/src/osx/core/evtloop_cf.cpp --- src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp +++ src/osx/core/evtloop_cf.cpp
@@ -243,7 +243,8 @@ int wxCFEventLoop::DoProcessEvents() @@ -243,7 +243,8 @@ int wxCFEventLoop::DoProcessEvents()
} }
else else