espeak 1.47.14 defines wxWidget 3.0 compatibility in main.h

src/compiledata.cpp

@@ -43,10 +43,6 @@
 #include <unistd.h>
 #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);

src/espeakedit.cpp

@@ -43,11 +43,6 @@
 #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"
 "http://espeak.sourceforge.net/";

src/extras.cpp

@@ -36,10 +36,6 @@
 #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);
 

src/spectdisplay.cpp

@@ -40,13 +40,6 @@
 #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
 

src/spectseq.cpp

@@ -33,11 +33,6 @@
 #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
 
 

src/transldlg.cpp

@@ -44,11 +44,6 @@
 #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

src/vowelchart.cpp

@@ -38,10 +38,6 @@
 #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;