diff options
| author | Thales Lima <thaleslima.ufu@gmail.com> | 2017-10-21 11:57:45 -0200 |
|---|---|---|
| committer | Thales Lima <thaleslima.ufu@gmail.com> | 2017-10-21 11:57:45 -0200 |
| commit | b1b026397c58c45c46ca7a525fb1e98b20ddfab8 (patch) | |
| tree | 224130696322c70d8296119603b36b7fcee3cc25 /Project/Text.cpp | |
| parent | f6a410c1c23bb0cf75d218354cb1f7e21c420fb3 (diff) | |
| download | PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.tar.gz PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.tar.xz PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.zip | |
Several changes and bugfixes to compile the program on linux (ubuntu-xenial-amb64)
Diffstat (limited to 'Project/Text.cpp')
| -rw-r--r-- | Project/Text.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Project/Text.cpp b/Project/Text.cpp index 52ec26f..2d53c3c 100644 --- a/Project/Text.cpp +++ b/Project/Text.cpp @@ -99,7 +99,8 @@ void Text::SetText(wxString text) { glEnable(GL_TEXTURE_2D); m_text = text; - wxFont font(m_fontSize, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + //wxFont font(m_fontSize, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + wxFont font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT); wxScreenDC dc; GLuint* idString = NULL; |