mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-10-31 21:39:47 +00:00
wxwidgets 3.0: move FONT_* construction to SpectFrame
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user