Merge remote-tracking branch 'origin/master' into gui_improvements

This commit is contained in:
YuSanka 2018-03-06 12:47:20 +01:00
commit d0d83526b4
32 changed files with 1917 additions and 143 deletions

View file

@ -6,6 +6,7 @@
#include "Config.hpp"
class wxApp;
class wxWindow;
class wxFrame;
class wxWindow;
class wxMenuBar;
@ -123,6 +124,8 @@ wxString L_str(const std::string &str);
// Return wxString from std::string in UTF8
wxString from_u8(const std::string &str);
wxWindow *get_widget_by_id(int id);
}
}