]> git.pld-linux.org Git - packages/audacity.git/blame - audacity-wx28.patch
projects / packages / audacity.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- added patch wx28
[packages/audacity.git] / audacity-wx28.patch
CommitLineData
139e13a7
SS		 1--- audacity-src-1.3.2-beta/src/LabelDialog.cpp 2006/09/23 02:28:04 1.8
2+++ audacity-src-1.3.2-beta/src/LabelDialog.cpp 2006/11/18 05:16:41 1.9
3@@ -736,3 +736,21 @@
4
5 return;
6 }
7+
8+void LabelDialog::OnOK(wxCommandEvent &event)
9+{
10+ // Standard handling
11+ if (Validate() && TransferDataFromWindow()) {
12+ EndModal(wxID_OK);
13+ }
14+
15+ return;
16+}
17+
18+void LabelDialog::OnCancel(wxCommandEvent &event)
19+{
20+ // Standard handling
21+ EndModal(wxID_CANCEL);
22+
23+ return;
24+}
25--- audacity-src-1.3.2-beta/src/LabelDialog.h 2006/09/17 08:23:44 1.5
26+++ audacity-src-1.3.2-beta/src/LabelDialog.h 2006/11/18 05:16:41 1.6
27@@ -59,6 +59,8 @@
28 void OnChangeLabel(wxGridEvent &event, int row, RowData *rd);
29 void OnChangeStime(wxGridEvent &event, int row, RowData *rd);
30 void OnChangeEtime(wxGridEvent &event, int row, RowData *rd);
31+ void OnOK(wxCommandEvent &event);
32+ void OnCancel(wxCommandEvent &event);
33
34 private:
35
36--- audacity-src-1.3.2-beta/src/FileFormats.h.orig 2006-12-24 11:41:23.000000000 +0000
37+++ audacity-src-1.3.2-beta/src/FileFormats.h 2006-12-24 11:41:45.000000000 +0000
38@@ -10,6 +10,7 @@
39
40 #include <wx/list.h>
41 #include <wx/string.h>
42+#include <wx/arrstr.h>
43
44 #include "Audacity.h"
45
46--- audacity-src-1.3.2-beta/src/Languages.h.orig 2006-12-24 12:23:15.000000000 +0000
47+++ audacity-src-1.3.2-beta/src/Languages.h 2006-12-24 12:23:39.000000000 +0000
48@@ -11,6 +11,7 @@
49 #ifndef __AUDACITY_LANGUAGES__
50 #define __AUDACITY_LANGUAGES__
51
52+#include <wx/arrstr.h>
53 #include <wx/string.h>
54 #include <wx/list.h>
55
56--- audacity-src-1.3.2-beta/src/ShuttleGui.cpp.orig 2006-12-24 12:46:44.000000000 +0000
57+++ audacity-src-1.3.2-beta/src/ShuttleGui.cpp 2006-12-24 12:47:51.000000000 +0000
58@@ -98,6 +98,7 @@
59 #include <wx/wx.h>
60 #include <wx/wxprec.h>
61 #include <wx/listctrl.h>
62+#include <wx/notebook.h>
63 #include <wx/treectrl.h>
64 #include "Internat.h"
65 #include "Experimental.h"
66--- audacity-src-1.3.2-beta/src/commands/Keyboard.cpp 2006/04/17 23:10:36 1.7
67+++ audacity-src-1.3.2-beta/src/commands/Keyboard.cpp 2006/11/18 05:43:24 1.8
68@@ -66,12 +66,14 @@
69 case WXK_RETURN:
70 newStr += wxT("Return");
71 break;
72+#if !wxCHECK_VERSION(2, 7, 0)
73 case WXK_PRIOR:
74 newStr += wxT("PageUp");
75 break;
76 case WXK_NEXT:
77 newStr += wxT("PageDown");
78 break;
79+#endif
80 case WXK_END:
81 newStr += wxT("End");
82 break;
83@@ -246,15 +248,17 @@
84 case WXK_NUMPAD_DOWN:
85 newStr += wxT("NUMPAD_DOWN");
86 break;
87+#if !wxCHECK_VERSION(2, 7, 0)
88 case WXK_NUMPAD_PRIOR:
89 newStr += wxT("NUMPAD_PAGEUP");
90 break;
91- case WXK_NUMPAD_PAGEUP:
92- newStr += wxT("NUMPAD_PAGEUP");
93- break;
94 case WXK_NUMPAD_NEXT:
95 newStr += wxT("NUMPAD_PAGEDOWN");
96 break;
97+#endif
98+ case WXK_NUMPAD_PAGEUP:
99+ newStr += wxT("NUMPAD_PAGEUP");
100+ break;
101 case WXK_NUMPAD_PAGEDOWN:
102 newStr += wxT("NUMPAD_PAGEDOWN");
103 break;
104--- audacity-src-1.3.2-beta/src/export/Export.h.orig 2006-12-24 14:05:10.000000000 +0000
105+++ audacity-src-1.3.2-beta/src/export/Export.h 2006-12-24 14:05:30.000000000 +0000
106@@ -11,6 +11,7 @@
107 #ifndef __AUDACITY_EXPORT__
108 #define __AUDACITY_EXPORT__
109
110+#include <wx/panel.h>
111 #include <wx/stattext.h>
112
113 class AudacityProject;
114--- audacity-src-1.3.2-beta/src/import/Import.h.orig 2006-12-24 14:24:40.000000000 +0000
115+++ audacity-src-1.3.2-beta/src/import/Import.h 2006-12-24 14:25:40.000000000 +0000
116@@ -11,6 +11,7 @@
117 #ifndef _IMPORT_
118 #define _IMPORT_
119
120+#include <wx/arrstr.h>
121 #include <wx/string.h>
122 #include <wx/list.h>
123 #include <wx/listimpl.cpp>
124--- audacity-src-1.3.2-beta/src/toolbars/ControlToolBar.cpp.orig 2006-12-24 16:07:47.000000000 +0000
125+++ audacity-src-1.3.2-beta/src/toolbars/ControlToolBar.cpp 2006-12-24 16:08:17.000000000 +0000
126@@ -159,7 +159,7 @@
127 wxImage * down2 = OverlayImage(bmpRecoloredDownLarge, bmpLoop, xoff + 1, yoff + 1);
128 wxImage * disable2 = OverlayImage(bmpRecoloredUpLarge, bmpLoopDisabled, xoff, yoff);
129
130- mPlay->SetAlternateImages(up2, hilite2, down2, disable2);
131+ mPlay->SetAlternateImages(*up2, *hilite2, *down2, *disable2);
132
133 delete up2;
134 delete hilite2;
135--- audacity-src-1.3.2-beta/src/toolbars/ToolBar.cpp.orig 2006-12-24 16:12:42.000000000 +0000
136+++ audacity-src-1.3.2-beta/src/toolbars/ToolBar.cpp 2006-12-24 16:13:54.000000000 +0000
137@@ -34,6 +34,7 @@
138 #include <wx/gdicmn.h>
139 #include <wx/image.h>
140 #include <wx/intl.h>
141+#include <wx/settings.h>
142 #include <wx/sizer.h>
143 #include <wx/sysopt.h>
144 #include <wx/window.h>
145@@ -442,8 +443,8 @@
146 wxImage * disable2 = OverlayImage(eUp, eDisabled, xoff, yoff);
147
148 AButton * button =
149- new AButton(this, id, placement, size, up2, hilite2, down2,
150- disable2, processdownevents);
151+ new AButton(this, id, placement, size, *up2, *hilite2, *down2,
152+ *disable2, processdownevents);
153
154 delete up2;
155 delete down2;
156--- audacity-src-1.3.2-beta/src/Makefile.in.orig 2006-12-24 16:22:08.000000000 +0000
157+++ audacity-src-1.3.2-beta/src/Makefile.in 2006-12-24 16:22:12.000000000 +0000
158@@ -167,7 +167,6 @@
159 toolbars/ToolManager.o \
160 toolbars/ToolsToolBar.o \
161 toolbars/TranscriptionToolBar.o \
162- widgets/treebook.o \
163 widgets/AButton.o \
164 widgets/ASlider.o \
165 widgets/AttachableScrollBar.o \
166--- audacity-src-1.3.2-beta/configure.in.orig 2006-12-24 16:25:37.000000000 +0000
167+++ audacity-src-1.3.2-beta/configure.in 2006-12-24 16:25:58.000000000 +0000
168@@ -316,19 +316,19 @@
169 AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?")
170 fi
171
172-dnl Check that the wx version is 2.6.x
173+dnl Check that the wx version is 2.8.x
174
175 wx_version=`${WX_CONFIG} $static_preference $unicode_preference --version`
176
177-AC_MSG_NOTICE([Checking that the installed version of wxWidgets is 2.6.x])
178+AC_MSG_NOTICE([Checking that the installed version of wxWidgets is 2.8.x])
179
180 case "${wx_version}" in
181- 2.6.*)
182- echo "Great, you're using wxWidgets 2.6.x!"
183+ 2.8.*)
184+ echo "Great, you're using wxWidgets 2.8.x!"
185 ;;
186 *)
187 wx_list=`${WX_CONFIG} --list`
188- AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.6.x.
189+ AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.8.x.
190 The currently available configurations are listed below. If necessary, either
191 install the package for your distribution or download the latest version of wxWidgets
192 from http://wxwidgets.org.
193--- audacity-src-1.3.2-beta/src/TrackArtist.cpp.orig 2006-12-24 17:05:46.000000000 +0000
194+++ audacity-src-1.3.2-beta/src/TrackArtist.cpp 2006-12-24 22:31:32.000000000 +0000
195@@ -1451,7 +1451,7 @@
196 // screen, so remember the display rectangle.
197 clip->SetDisplayRect(mid);
198
199- wxBitmap converted = wxBitmap(image);
200+ wxBitmap converted = wxBitmap(*image);
201
202 wxMemoryDC memDC;
203
204--- audacity-src-1.3.2-beta/src/prefs/PrefsDialog.cpp.orig 2006-12-24 23:15:42.000000000 +0000
205+++ audacity-src-1.3.2-beta/src/prefs/PrefsDialog.cpp 2006-12-24 23:16:03.000000000 +0000
206@@ -31,6 +31,7 @@
207 #include <wx/listbook.h>
208 #include <wx/listctrl.h>
209 #include <wx/sizer.h>
210+#include "wx/treebook.h"
211
212 #include "../Project.h"
213
214@@ -50,8 +51,6 @@
215 #include "SpectrumPrefs.h"
216 #include "MousePrefs.h"
217
218-//JKC: Experimental treebook, backported from wxWidgets 2.7.x
219-#include "../widgets/treebook.h"
220
221
222 enum {
223--- audacity-src-1.3.2-beta/src/widgets/ASlider.cpp 2006/11/05 07:41:53 1.52
224+++ audacity-src-1.3.2-beta/src/widgets/ASlider.cpp 2006/11/18 07:45:29 1.54
225@@ -742,13 +742,17 @@
226 break;
227
228 case WXK_PAGEUP:
229+#if !wxCHECK_VERSION(2,7,0)
230 case WXK_PRIOR:
231+#endif
232 Increase( 5 );
233 SendUpdate( mCurrentValue );
234 break;
235
236 case WXK_PAGEDOWN:
237+#if !wxCHECK_VERSION(2,7,0)
238 case WXK_NEXT:
239+#endif
240 Decrease( 5 );
241 SendUpdate( mCurrentValue );
242 break;
243@@ -775,11 +779,12 @@
244 case WXK_RETURN:
245 case WXK_NUMPAD_ENTER:
246 {
247- wxWindow *def = mParent->GetParent()->GetDefaultItem();
248- if (def) {
249+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(mParent), wxTopLevelWindow);
250+ wxWindow *def = tlw->GetDefaultItem();
251+ if (def && def->IsEnabled()) {
252 wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED,
253 def->GetId());
254- mParent->ProcessEvent( cevent );
255+ mParent->ProcessEvent(cevent);
256 }
257 }
258
259--- audacity-src-1.3.2-beta/src/widgets/Ruler.cpp.orig 2006-12-25 00:59:27.000000000 +0000
260+++ audacity-src-1.3.2-beta/src/widgets/Ruler.cpp 2006-12-25 01:00:41.000000000 +0000
261@@ -60,6 +60,7 @@
262 #include <wx/dcscreen.h>
263 #include <wx/dcmemory.h>
264 #include <wx/dcbuffer.h>
265+#include <wx/settings.h>
266
267 #include "../Internat.h"
268 #include "../Project.h"
269--- audacity-src-1.3.2-beta/src/widgets/TimeTextCtrl.cpp.orig 2006-12-25 01:06:26.000000000 +0000
270+++ audacity-src-1.3.2-beta/src/widgets/TimeTextCtrl.cpp 2006-12-25 01:09:55.000000000 +0000
271@@ -166,6 +166,7 @@
272 #include <wx/sizer.h>
273 #include <wx/stattext.h>
274 #include <wx/tooltip.h>
275+#include <wx/toplevel.h>
276
277 #define ID_MENU 9800
278
279@@ -981,7 +982,9 @@
280
281 else if (keyCode == WXK_RETURN || keyCode == WXK_NUMPAD_ENTER) {
282 wxWindow *parent = GetParent();
283- wxWindow *def = parent->GetDefaultItem();
284+ wxTopLevelWindow *tlw =
285+ wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
286+ wxWindow *def = tlw->GetDefaultItem();
287 if (def && def->IsEnabled()) {
288 wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED,
289 def->GetId());
Audacity - manipulate digital audio waveforms
This page took 0.097538 seconds and 4 git commands to generate.