Merge branch 'octoprint'

This commit is contained in:
bubnikv 2018-03-06 11:39:44 +01:00
commit 4a90ab1f6a
15 changed files with 978 additions and 56 deletions

View file

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