Cycle dependence fixed.

Next step: remove mouse handler

1 files changed, 11 insertions, 7 deletions

diff --git a/Project/Workspace.h b/Project/Workspace.h
index ca4245f..ef837fb 100644
--- a/Project/Workspace.h
+++ b/Project/Workspace.h
@@ -6,11 +6,14 @@
 #include <wx/dcclient.h>
 #include <wx/msgdlg.h>
 
+#include "WorkspaceBase.h"
+
 class MouseEventsHandler;
+class Element;
+class Bus;
 
-#include "WorkspaceBase.h"
 //#include "MouseEventsHandler.h"
-#include "Bus.h"
+//#include "Bus.h"
 
 class Camera;
 
@@ -18,7 +21,7 @@ class Workspace : public WorkspaceBase
 {
    protected:
     virtual void OnMouseMotion(wxMouseEvent& event);
-    virtual void OnKeyDown(wxKeyEvent& event) = 0;
+    virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); };
     virtual void OnLeftClickDown(wxMouseEvent& event);
     virtual void OnPaint(wxPaintEvent& event);
 
@@ -33,18 +36,19 @@ class Workspace : public WorkspaceBase
     std::vector<Element*> m_elementList;
 
    public:
+    Workspace();
     Workspace(wxWindow* parent, wxString name = wxEmptyString);
     ~Workspace();
 
     MouseEventsHandler* m_mouseEventsHandler;
-    Camera* m_camera;
+    Camera* m_camera;  // why public?
 
     wxString GetName() const { return m_name; }
     void SetName(wxString name) { m_name = name; }
-    void SetDragMode(bool dragMode) { this->m_dragMode = dragMode; }
-    void SetInsertMode(bool insertMode) { this->m_insertMode = insertMode; }
+    void SetDragMode(bool dragMode = true) { this->m_dragMode = dragMode; }
+    void SetInsertMode(bool insertMode = true) { this->m_insertMode = insertMode; }
     bool IsDragMode() const { return m_dragMode; }
-    const std::vector<Element*>& GetElementList() const { return m_elementList; }
+    std::vector<Element*> GetElementList() { return m_elementList; }
     bool IsInsertMode() const { return m_insertMode; }
     void Redraw() { this->Refresh(); }
 };