mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 14:04:27 +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");