From 64ed394cdc4b3347768c2e1996518f02982b2ef5 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Mon, 26 Mar 2018 15:54:26 -0300
Subject: Import file GUI implemented

---
 Project/MainFrame.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Project/MainFrame.h')

diff --git a/Project/MainFrame.h b/Project/MainFrame.h
index 9d0aede..5566bb7 100644
--- a/Project/MainFrame.h
+++ b/Project/MainFrame.h
@@ -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;
-- 
cgit 


From 8824eb42aed594822b1a46e0d1492535efacda0e Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Tue, 10 Apr 2018 22:09:52 -0300
Subject: Base folder strategy abandoned due compatibility with wxCrafter

---
 Project/MainFrame.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Project/MainFrame.h')

diff --git a/Project/MainFrame.h b/Project/MainFrame.h
index 5566bb7..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;
-- 
cgit