comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-27 14:03:15 -04:00
Code Issues Projects Releases Wiki Activity

When saving bookmarks, use active information when available

Browse Source 
+ Fixed std::string <=> std::wstring conversions using wxString
+ cleanups.
This commit is contained in:
vsonnier
2018-01-08 19:23:01 +01:00
parent 8f45451df2
commit f1208c7f5c
3 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/GLFont.cpp
+5 -3
View File
@@ -3,6 +3,8 @@
#include "GLFont.h"
#include <wx/string.h>
#include <iostream>
#include <fstream>
#include <algorithm>
@@ -245,11 +247,11 @@ void GLFont::loadFontOnce() {
//Re-compute the resource dir.
resourceFolder = fontDefFileName.GetPath();
std::wstring fontDefFileNamePath = fontDefFileName.GetFullPath(wxPATH_NATIVE).ToStdWstring();
std::string fontDefFileNamePath = fontDefFileName.GetFullPath(wxPATH_NATIVE).ToStdString();
std::wifstream input;
std::string inpFileStr(fontDefFileNamePath.begin(), fontDefFileNamePath.end());
input.open(inpFileStr, std::ios::in);
input.open(fontDefFileNamePath, std::ios::in);
std::wstring op;