mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 05:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

wxwidgets 3.0: move FONT_* construction to SpectFrame

Browse Source 
When using wxWidgets 3.0, creating a wxFont requires the gtk+
library to be initialized. This is causing espeakedit to segfault.

SpectFrame::Draw is the only place where the FONT_* variables are
used, so move them into the SpectFrame class and create them in
the constructor.

Also, FONT_NORMAL is not used so it has been removed.
This commit is contained in:
Reece H. Dunn
2013-11-16 00:53:39 +00:00
parent fdf52edf89
commit fcaf5d9012
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/espeakedit.cpp
-4
View File
@@ -96,10 +96,6 @@ int frame_x, frame_y, frame_w, frame_h;
int adding_page = 0; // fix for wxWidgets (2,8,7) bug, adding first page to a wxNotebook gives emptystring for GetPageTex() in Notebook_Page_Changed event.
wxFont FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL);
wxFont FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL);
wxFont FONT_NORMAL(10,wxSWISS,wxNORMAL,wxNORMAL);
IMPLEMENT_APP(MyApp)
wxString AppName = _T("espeakedit");
src/main.h
-4
View File
@@ -111,10 +111,6 @@ extern wchar_t ipa1[256];
extern wxFont FONT_SMALL;
extern wxFont FONT_MEDIUM;
extern wxFont FONT_NORMAL;
enum {
MENU_QUIT = 1,
MENU_SPECTRUM,
src/spect.cpp
+3
View File
@@ -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 *
@@ -92,6 +93,8 @@ float SpectTilt(int value, int freq)
SpectFrame::SpectFrame(SpectFrame *copy)
: FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL)
, FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL)
{//=====================================
int ix;
src/spect.h
+3
View File
@@ -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 *
@@ -171,6 +172,8 @@ public:
private:
void DrawPeaks(wxDC *dc, int offy, int frame_width, int seq_amplitude, double scalex);
wxFont FONT_SMALL;
wxFont FONT_MEDIUM;
};
class SpectSeq