From 0d6326efe549647d7c6de46b130e087e9cdaf49c Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Fri, 29 Nov 2013 23:56:21 +0000
Subject: [PATCH] espeak 1.47.14 defines wxWidget 3.0 compatibility in main.h

---
 src/compiledata.cpp  | 4 ----
 src/espeakedit.cpp   | 5 -----
 src/extras.cpp       | 4 ----
 src/spectdisplay.cpp | 7 -------
 src/spectseq.cpp     | 5 -----
 src/transldlg.cpp    | 5 -----
 src/vowelchart.cpp   | 4 ----
 7 files changed, 34 deletions(-)

diff --git a/src/compiledata.cpp b/src/compiledata.cpp
index 4e22e812..d614f554 100644
--- a/src/compiledata.cpp
+++ b/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);
diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp
index ec261ce7..f544ebf0 100644
--- a/src/espeakedit.cpp
+++ b/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/";
diff --git a/src/extras.cpp b/src/extras.cpp
index 2141a6e7..dd225d51 100644
--- a/src/extras.cpp
+++ b/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);
 
diff --git a/src/spectdisplay.cpp b/src/spectdisplay.cpp
index 0904547a..d3f204c9 100644
--- a/src/spectdisplay.cpp
+++ 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
 
diff --git a/src/spectseq.cpp b/src/spectseq.cpp
index 88aa12f8..c84fab24 100644
--- a/src/spectseq.cpp
+++ b/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
 
 
diff --git a/src/transldlg.cpp b/src/transldlg.cpp
index 959144fb..d25766a0 100644
--- a/src/transldlg.cpp
+++ b/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
diff --git a/src/vowelchart.cpp b/src/vowelchart.cpp
index 9a87b895..e87d4e32 100644
--- a/src/vowelchart.cpp
+++ b/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;