Merge remote-tracking branch 'origin/dev_native' into ys_dev_native

This commit is contained in:
YuSanka 2018-10-05 23:39:51 +02:00
commit 42fd6bc7b5
13 changed files with 205 additions and 91 deletions

View file

@ -9,6 +9,7 @@
#include <map>
#include "Plater.hpp"
#include "Event.hpp"
class wxMenuBar;
class wxNotebook;
@ -71,6 +72,7 @@ class MainFrame : public wxFrame
std::string get_base_name(const wxString full_name) const ;
std::string get_dir_name(const wxString full_name) const ;
void on_presets_changed(SimpleEvent&);
Tab* get_tab(const std::string& name);
public: