Browse Source

wxwidgets 3.0: make espeakedit compile

master
Reece H. Dunn 11 years ago
parent
commit
fdf52edf89
7 changed files with 39 additions and 2 deletions
  1. 5
    0
      src/compiledata.cpp
  2. 5
    2
      src/espeakedit.cpp
  3. 5
    0
      src/extras.cpp
  4. 8
    0
      src/spectdisplay.cpp
  5. 5
    0
      src/spectseq.cpp
  6. 6
    0
      src/transldlg.cpp
  7. 5
    0
      src/vowelchart.cpp

+ 5
- 0
src/compiledata.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington * * Copyright (C) 2005 to 2013 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* Copyright (C) 2013 by Reece H. Dunn *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
#include <unistd.h> #include <unistd.h>
#endif #endif


#if wxCHECK_VERSION(3, 0, 0)
#define wxOPEN wxFD_OPEN
#endif

extern void FindPhonemesUsed(void); extern void FindPhonemesUsed(void);
extern void DisplayErrorFile(const char *fname); extern void DisplayErrorFile(const char *fname);
extern int utf8_in(int *c, const char *buf); extern int utf8_in(int *c, const char *buf);

+ 5
- 2
src/espeakedit.cpp View File

#include "translate.h" #include "translate.h"
#include "prosodydisplay.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" static const char *about_string2 = "espeakedit: %s\nAuthor: Jonathan Duddington (c) 2009\n\n"
"Licensed under GNU General Public License version 3\n" "Licensed under GNU General Public License version 3\n"
{//===================== {//=====================


int j; int j;
wxChar *p;
const wxChar *p;
char param[80]; char param[80];





+ 5
- 0
src/extras.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2006 to 2011 by Jonathan Duddington * * Copyright (C) 2006 to 2011 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* Copyright (C) 2013 by Reece H. Dunn *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
#include "translate.h" #include "translate.h"
#include "options.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 char word_phonemes[N_WORD_PHONEMES]; // a word translated into phoneme codes
extern int __cdecl string_sorter(char **a, char **b); extern int __cdecl string_sorter(char **a, char **b);



+ 8
- 0
src/spectdisplay.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 to 2007 by Jonathan Duddington * * Copyright (C) 2005 to 2007 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* Copyright (C) 2013 by Reece H. Dunn *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
#include "spect.h" #include "spect.h"
#include "options.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 ; extern MyFrame *frame ;
#define SCROLLUNITS 20 #define SCROLLUNITS 20



+ 5
- 0
src/spectseq.cpp View File

#include "wx/txtstrm.h" #include "wx/txtstrm.h"
#include "wx/datstrm.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 #define MAX_HARMONIC 400 // 400 * 50Hz = 20 kHz, more than enough





+ 6
- 0
src/transldlg.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington * * Copyright (C) 2005 to 2013 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* Copyright (C) 2013 Reece H. Dunn *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/sound.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_SOURCE 501
#define T_PHONETIC 502 #define T_PHONETIC 502
#define T_TRANSLATE 503 #define T_TRANSLATE 503

+ 5
- 0
src/vowelchart.cpp View File

/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington * * Copyright (C) 2005 to 2013 by Jonathan Duddington *
* email: [email protected] * * email: [email protected] *
* Copyright (C) 2013 Reece H. Dunn *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
#include "translate.h" #include "translate.h"
#include "options.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 /* Read a file of vowel symbols and f1,f2 formants, and produce a vowel diagram
*/ */
extern wxString path_phsource; extern wxString path_phsource;

Loading…
Cancel
Save