diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2018-04-11 09:23:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 09:23:12 -0300 |
| commit | af070d92462ac5586aa6a0a80c51a8fa72710600 (patch) | |
| tree | 1e78bf3ced07950a572b1d94c4b029c540c73148 /Project/MainFrame.h | |
| parent | e5a5041915127e72820a0478724a20dc41f0327e (diff) | |
| parent | f6cd17abe2e788c2b1a1983a4d7efbd3b49880ca (diff) | |
| download | PSP.git-af070d92462ac5586aa6a0a80c51a8fa72710600.tar.gz PSP.git-af070d92462ac5586aa6a0a80c51a8fa72710600.tar.xz PSP.git-af070d92462ac5586aa6a0a80c51a8fa72710600.zip | |
Merge pull request #45 from Thales1330/wip/import-ANAREDE-files
Wip import anarede files
Diffstat (limited to 'Project/MainFrame.h')
| -rw-r--r-- | Project/MainFrame.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 9d0aede..58e4824 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -23,7 +23,7 @@ #include <wx/filedlg.h> #include <wx/glcanvas.h> -#include "base/MainFrameBase.h" +#include "MainFrameBase.h" class MainFrameBase; class wxRibbonMetroArtProvider; @@ -35,6 +35,7 @@ class PropertiesData; class ChartView; class DataReport; class AboutForm; +class ImportForm; enum { ID_ADDMENU_BUS = 20000, @@ -94,7 +95,7 @@ class MainFrame : public MainFrameBase virtual void OnDragClick(wxRibbonButtonBarEvent& event); virtual void OnEnableSolutionClick(wxRibbonButtonBarEvent& event); virtual void OnExitClick(wxRibbonButtonBarEvent& event) { this->Close(); }; - virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); + //virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); virtual void OnFaultClick(wxRibbonButtonBarEvent& event); virtual void OnFitClick(wxRibbonButtonBarEvent& event); virtual void OnMoveClick(wxRibbonButtonBarEvent& event); @@ -111,6 +112,7 @@ class MainFrame : public MainFrameBase virtual void OnSnapshotClick(wxRibbonButtonBarEvent& event); virtual void OnUndoClick(wxRibbonButtonBarEvent& event); virtual void OnNewClick(wxRibbonButtonBarEvent& event); + virtual void OnImportClick(wxRibbonButtonBarEvent& event); std::vector<Workspace*> m_workspaceList; int m_projectNumber = 1; |