diff --git a/src/compiledata.cpp b/src/compiledata.cpp index 09645c39..4e22e812 100644 --- a/src/compiledata.cpp +++ b/src/compiledata.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 to 2013 by Jonathan Duddington * * email: jonsd@users.sourceforge.net * + * Copyright (C) 2013 by Reece H. Dunn * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -42,6 +43,10 @@ #include #endif +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#endif + extern void FindPhonemesUsed(void); extern void DisplayErrorFile(const char *fname); extern int utf8_in(int *c, const char *buf); diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp index e632c5ab..4980e411 100644 --- a/src/espeakedit.cpp +++ b/src/espeakedit.cpp @@ -43,7 +43,10 @@ #include "translate.h" #include "prosodydisplay.h" - +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#define wxSAVE wxFD_SAVE +#endif static const char *about_string2 = "espeakedit: %s\nAuthor: Jonathan Duddington (c) 2009\n\n" "Licensed under GNU General Public License version 3\n" @@ -123,7 +126,7 @@ bool MyApp::OnInit(void) {//===================== int j; -wxChar *p; +const wxChar *p; char param[80]; diff --git a/src/extras.cpp b/src/extras.cpp index fa6ac3b3..2141a6e7 100644 --- a/src/extras.cpp +++ b/src/extras.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2006 to 2011 by Jonathan Duddington * * email: jonsd@users.sourceforge.net * + * Copyright (C) 2013 by Reece H. Dunn * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -35,6 +36,10 @@ #include "translate.h" #include "options.h" +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#endif + extern char word_phonemes[N_WORD_PHONEMES]; // a word translated into phoneme codes extern int __cdecl string_sorter(char **a, char **b); diff --git a/src/spectdisplay.cpp b/src/spectdisplay.cpp index efeb8978..0904547a 100644 --- a/src/spectdisplay.cpp +++ b/src/spectdisplay.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 to 2007 by Jonathan Duddington * * email: jonsd@users.sourceforge.net * + * Copyright (C) 2013 by Reece H. Dunn * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -39,6 +40,13 @@ #include "spect.h" #include "options.h" +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#define wxSAVE wxFD_SAVE +#define WXK_PRIOR WXK_PAGEUP +#define WXK_NEXT WXK_PAGEDOWN +#endif + extern MyFrame *frame ; #define SCROLLUNITS 20 diff --git a/src/spectseq.cpp b/src/spectseq.cpp index c84fab24..88aa12f8 100644 --- a/src/spectseq.cpp +++ b/src/spectseq.cpp @@ -33,6 +33,11 @@ #include "wx/txtstrm.h" #include "wx/datstrm.h" +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#define wxSAVE wxFD_SAVE +#endif + #define MAX_HARMONIC 400 // 400 * 50Hz = 20 kHz, more than enough diff --git a/src/transldlg.cpp b/src/transldlg.cpp index 58c7507b..959144fb 100644 --- a/src/transldlg.cpp +++ b/src/transldlg.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 to 2013 by Jonathan Duddington * * email: jonsd@users.sourceforge.net * + * Copyright (C) 2013 Reece H. Dunn * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -43,6 +44,11 @@ #include "wx/filename.h" #include "wx/sound.h" +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#define wxSAVE wxFD_SAVE +#endif + #define T_SOURCE 501 #define T_PHONETIC 502 #define T_TRANSLATE 503 diff --git a/src/vowelchart.cpp b/src/vowelchart.cpp index aab1f2ce..9a87b895 100644 --- a/src/vowelchart.cpp +++ b/src/vowelchart.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2005 to 2013 by Jonathan Duddington * * email: jonsd@users.sourceforge.net * + * Copyright (C) 2013 Reece H. Dunn * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -37,6 +38,10 @@ #include "translate.h" #include "options.h" +#if wxCHECK_VERSION(3, 0, 0) +#define wxOPEN wxFD_OPEN +#endif + /* Read a file of vowel symbols and f1,f2 formants, and produce a vowel diagram */ extern wxString path_phsource;