From 9d29dde68863f207eba2d84746cd38094810932d Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 20 Jan 2017 18:19:59 -0200 Subject: Button click event trigger implemented --- Project/MainFrame.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index bb180a3..6049a8d 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -111,8 +111,7 @@ void MainFrame::CreateAddElementsMenu() m_addElementsMenu->Append(capacitorElement); m_addElementsMenu->Append(inductorElement); - m_addElementsMenu->Connect( - wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAddElementsClick), NULL, this); + m_addElementsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, &MainFrame::OnAddElementsClick, this); } void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) -- cgit From bdb0625280d827ba7333b6fc9d6c6534e0720100 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 24 Jan 2017 18:25:17 -0200 Subject: Control editor implementation start --- Project/MainFrame.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 6049a8d..87c547e 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -197,7 +197,7 @@ void MainFrame::OnMoveClick(wxRibbonButtonBarEvent& event) element->StartMove(averagePos); } } - workspace->SetWorkspaceMode(MODE_MOVE_ELEMENT); + workspace->SetWorkspaceMode(Workspace::MODE_MOVE_ELEMENT); } } @@ -303,7 +303,7 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) Workspace* workspace = static_cast(m_auiNotebook->GetCurrentPage()); if(workspace) { - if(workspace->GetWorkspaceMode() != MODE_INSERT) { + if(workspace->GetWorkspaceMode() != Workspace::MODE_INSERT) { auto elementList = workspace->GetElementList(); wxString statusBarText = ""; bool newElement = false; @@ -382,7 +382,7 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) } if(newElement) { workspace->SetElementList(elementList); - workspace->SetWorkspaceMode(MODE_INSERT); + workspace->SetWorkspaceMode(Workspace::MODE_INSERT); workspace->SetStatusBarText(statusBarText); workspace->Redraw(); } -- cgit