From fc258c8e3f71aff8b57a8299d540b292405b7fe6 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Fri, 7 Nov 2008 10:43:35 +0000 Subject: [PATCH] Compiling under windows and linux --- .../interfEditMenu.cxx | 4 +- .../interfIOMenu.cxx | 4 +- .../interfToolsMenu.cxx | 2 +- .../wxContourEventHandler.cxx | 52 ++++++++++--------- .../wxContourEventHandler.h | 2 +- .../wxContour_ButtonsBar.cxx | 40 +++++++------- .../wxVtkBaseView_SceneManager.cxx | 14 ++--- 7 files changed, 61 insertions(+), 57 deletions(-) diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx index d566f3e..75aec01 100644 --- a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx @@ -33,8 +33,8 @@ void interfEditMenu::initButtons(wxEvtHandler* evtHandler) { this->addButtons(path, nom); this->setVectorFunction(funct); - this->setButtonName(0, wxContour_ActionCommnadsID::COPY_TOOL); - this->setButtonName(1, wxContour_ActionCommnadsID::PASTE_TOOL); + this->setButtonName(0, wxContour_ActionCommandsID::COPY_TOOL); + this->setButtonName(1, wxContour_ActionCommandsID::PASTE_TOOL); this->setButtonName(2, '-'); this->setButtonName(3, '-'); diff --git a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx index 4884a6a..ddf20f9 100644 --- a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx @@ -24,8 +24,8 @@ void interfIOMenu::initButtons(wxEvtHandler* evtHandler) { this->addButtons(path, nom); this->setVectorFunction(funct); - this->setButtonName(0, wxContour_ActionCommnadsID::OPEN_TOOL); - this->setButtonName(1, wxContour_ActionCommnadsID::SAVE_TOOL); + this->setButtonName(0, wxContour_ActionCommandsID::OPEN_TOOL); + this->setButtonName(1, wxContour_ActionCommandsID::SAVE_TOOL); this->connectEvents(evtHandler); diff --git a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx index 6ee87b3..b4c8e00 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx @@ -42,7 +42,7 @@ void interfToolsMenu::initButtons(wxEvtHandler* evtHandler) { this->addButtons(path, nom); this->setVectorFunction(funct); - this->setButtonName(0, wxContour_ActionCommnadsID::CHANGE_TOOL); + this->setButtonName(0, wxContour_ActionCommandsID::CHANGE_TOOL); this->connectEvents(evtHandler); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx index e53cf87..7ac56e5 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx @@ -84,7 +84,7 @@ digraph example_0 { // Includes //------------------------------------------------------------------------------------------------------------ -#include "wxContour_ActionCommnadsID.h" +#include "wxContour_ActionCommandsID.h" #include "NameWrapper.h" #include "ConceptDataWrap.h" #include "OutlineGroup.h" @@ -368,7 +368,11 @@ double PanelBullEyeOptions::GetAngDeltaOfCrownSection(int nCrown) inundo = 0; inredo = 0; stundoredo = "data/temp"; +#if(WIN32) + mkdir(stundoredo.c_str()); +#else mkdir(stundoredo.c_str(),755); +#endif stundoredo += "/cont"; } //------------------------------------------------------------------------------------------------------------ @@ -2098,7 +2102,7 @@ myfile.close(); std::vector tempVector; _instantPanel->getInstant( tempVector ); _performingOperation->reset(); - _performingOperation->setStartCommand( (char)wxContour_ActionCommnadsID::COPY_TOOL ); + _performingOperation->setStartCommand( (char)wxContour_ActionCommandsID::COPY_TOOL ); _performingOperation->setStartOperationInstantVector( tempVector ); _performingOperation->setKeyNamesOperationElems( keyNamesVector ); @@ -2107,7 +2111,7 @@ myfile.close(); void wxContourEventHandler :: onPasteOutlines( ) { char theStartCommand = _performingOperation->getStartCommand(); - if ( theStartCommand == wxContour_ActionCommnadsID::COPY_TOOL ) + if ( theStartCommand == wxContour_ActionCommandsID::COPY_TOOL ) { //JCP 20-10-08 Undo redo implementation saveState(); @@ -3131,35 +3135,35 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event) { std::vector currentSelection = _sceneManager->getSelectedObjects(); int elementsSelected = currentSelection.size(); - if( toolCommand == (wxContour_ActionCommnadsID::CREATE_TOOL) ) + if( toolCommand == (wxContour_ActionCommandsID::CREATE_TOOL) ) { onCreateContourFrame(); } - if( toolCommand == (wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY) ) + if( toolCommand == (wxContour_ActionCommandsID::CREATE_CONTOUR_KEY) ) { createContour(); } - else if( toolCommand == wxContour_ActionCommnadsID::DELETE_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::DELETE_TOOL ) { onDeleteFrame( ); } - else if( toolCommand == wxContour_ActionCommnadsID::DELETE_KEY ) + else if( toolCommand == wxContour_ActionCommandsID::DELETE_KEY ) { deleteContours( currentSelection ); } - else if( toolCommand == wxContour_ActionCommnadsID::SAVE_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::SAVE_TOOL ) { saveFileWithContours( ); } - else if( toolCommand == wxContour_ActionCommnadsID::SAVE_KEY ) + else if( toolCommand == wxContour_ActionCommandsID::SAVE_KEY ) { saveFileWithContoursAutomatique( ); } - else if( toolCommand == wxContour_ActionCommnadsID::OPEN_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::OPEN_TOOL ) { openFileWithContours( ); } - else if( toolCommand == wxContour_ActionCommnadsID::CHANGE_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::CHANGE_TOOL ) { if ( elementsSelected >= 1 ) { @@ -3167,69 +3171,69 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event) } } - else if( toolCommand == wxContour_ActionCommnadsID::HIDE_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::HIDE_TOOL ) { if ( elementsSelected >= 1 ) { onHideOutlines( currentSelection ); } } - else if( toolCommand == wxContour_ActionCommnadsID::SHOW_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::SHOW_TOOL ) { if ( elementsSelected >= 1 ) { onShowOutlines( currentSelection ); } } - else if( toolCommand == wxContour_ActionCommnadsID::COPY_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::COPY_TOOL ) { if ( elementsSelected >= 1 ) { onCopyOutlines( currentSelection ); } } - else if( toolCommand == wxContour_ActionCommnadsID::PASTE_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::PASTE_TOOL ) { onPasteOutlines( ); } - else if( toolCommand == wxContour_ActionCommnadsID::SPREAD_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::SPREAD_TOOL ) { onSpread(); } - else if( toolCommand == wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL ) { onAutomatiqueSegmentation( ); } - else if( toolCommand == wxContour_ActionCommnadsID::SELECT_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::SELECT_TOOL ) { onSelectOutlines( currentSelection ); } - else if( toolCommand == wxContour_ActionCommnadsID::EDIT_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::EDIT_TOOL ) { if ( elementsSelected >= 1 ) { onEditOutlines( currentSelection ); } } - else if( toolCommand == wxContour_ActionCommnadsID::UNDO_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::UNDO_TOOL ) { onUNDO(); } - else if( toolCommand == wxContour_ActionCommnadsID::REDO_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::REDO_TOOL ) { onREDO(); } - else if( toolCommand == wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL ) { onInformationContourFrame(); } - else if( toolCommand == wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL ) { onInterfaceConfigurationFrame(); } - else if( toolCommand == wxContour_ActionCommnadsID::TEST_TOOL ) + else if( toolCommand == wxContour_ActionCommandsID::TEST_TOOL ) { onInterfaceTestFrame(); } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h index 401b41c..f08018e 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h @@ -33,7 +33,7 @@ #include "wxContour_StandardToolsPanel.h" #include "wxContour_EdtionToolsPanel.h" #include "wxContour_ListViewPanel.h" -#include "wxContour_ActionCommnadsID.h" +#include "wxContour_ActionCommandsID.h" #include "PerformingOperation.h" #include "ContourThing.h" diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx index d4c4979..f000243 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx @@ -13,7 +13,7 @@ //------------------------------------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------------------------------------ -#include "wxContour_ActionCommnadsID.h" +#include "wxContour_ActionCommandsID.h" #include "wx/toolbar.h" #include "wx/log.h" @@ -35,89 +35,89 @@ :wxPanel( parent, id)//, pos, size, style, name) { //SetToolBitmapSize(wxSize(16,16)); - std::string as = (char)wxContour_ActionCommnadsID::CREATE_TOOL +""; + std::string as = (char)wxContour_ActionCommandsID::CREATE_TOOL +""; _createContour_Button = new wxButton( this, -1, _T("+ New Contour"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _createContour_Button->SetToolTip(_T("CTRL-N")); Connect( _createContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::DELETE_TOOL +""; + as = (char)wxContour_ActionCommandsID::DELETE_TOOL +""; _delete_Button = new wxButton( this, -1, _T("+ Delete"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _delete_Button->SetToolTip(_T("BACK SPACE or DELETE key")); Connect( _delete_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); /* - _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::HIDE_TOOL ); + _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::HIDE_TOOL ); Connect( _hideContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SHOW_TOOL ); + _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SHOW_TOOL ); Connect( _show_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); */ - as = (char)wxContour_ActionCommnadsID::COPY_TOOL +""; + as = (char)wxContour_ActionCommandsID::COPY_TOOL +""; _copy_Button = new wxButton( this, -1, _T("Copy"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _copy_Button->SetToolTip(_T("CTRL-C")); Connect( _copy_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::PASTE_TOOL +""; + as = (char)wxContour_ActionCommandsID::PASTE_TOOL +""; _paste_Button = new wxButton( this, -1, _T("Paste"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _paste_Button->SetToolTip(_T("CTRL-V")); Connect( _paste_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::CHANGE_TOOL +""; + as = (char)wxContour_ActionCommandsID::CHANGE_TOOL +""; _change_Button = new wxButton( this, -1, _T(" <--> "), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _change_Button->SetToolTip(_T("CTRL-K")); Connect( _change_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::SAVE_TOOL +""; + as = (char)wxContour_ActionCommandsID::SAVE_TOOL +""; _save_Button = new wxButton( this, -1, _T("Save"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _save_Button->SetToolTip(_T("CTRL-S")); Connect( _save_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::OPEN_TOOL +""; + as = (char)wxContour_ActionCommandsID::OPEN_TOOL +""; _open_Button = new wxButton( this, -1, _T("Open"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _open_Button->SetToolTip(_T("CTRL-O")); Connect( _open_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::SPREAD_TOOL +""; + as = (char)wxContour_ActionCommandsID::SPREAD_TOOL +""; _spread_Button = new wxButton( this, -1, _T("+ Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _spread_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _spread_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL +""; + as = (char)wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL +""; _automatiqueSegmentation_Button = new wxButton( this, -1, _T("+ Segmentation"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _automatiqueSegmentation_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _automatiqueSegmentation_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL +""; + as = (char)wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL +""; _informationContour_Button = new wxButton( this, -1, _T("+ Information"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _informationContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - as = (char)wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL +""; + as = (char)wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL +""; _interfaceConfiguration_Button = new wxButton( this, -1, _T("+ Configuration"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _interfaceConfiguration_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); //Test button Methods A-B-C in Juan Carlos Prieto 22-09-08 - as = (char)wxContour_ActionCommnadsID::TEST_TOOL +""; + as = (char)wxContour_ActionCommandsID::TEST_TOOL +""; _interfaceTest_Button = new wxButton( this, -1, _T("+ Test"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _interfaceTest_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); /* - _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SPREAD_TOOL ); + _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SPREAD_TOOL ); Connect( _spread_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SELECT_TOOL ); + _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SELECT_TOOL ); Connect( _select_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::EDIT_TOOL ); + _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::EDIT_TOOL ); Connect( _edit_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::UNDO_TOOL ); + _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::UNDO_TOOL ); Connect( _undo_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::REDO_TOOL ); + _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::REDO_TOOL ); Connect( _redo_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); */ wxFlexGridSizer * panelSizer = new wxFlexGridSizer(9); diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index dbebb4e..f8b9c9f 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx @@ -13,7 +13,7 @@ //------------------------------------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------------------------------------ -#include "wxContour_ActionCommnadsID.h" +#include "wxContour_ActionCommandsID.h" //------------------------------------------------------------------------------------------------------------ // Generated events declaration and definition @@ -674,27 +674,27 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c' { - toolCommand = &(wxContour_ActionCommnadsID::COPY_TOOL); + toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL); } else if( _lastKeyCode == 22 && ctrlKey ) //'V' || 'v' { - toolCommand = &(wxContour_ActionCommnadsID::PASTE_TOOL); + toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL); } else if( _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete { - toolCommand = &(wxContour_ActionCommnadsID::DELETE_KEY); + toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY); } else if( _lastKeyCode == 14 && ctrlKey ) //'N' || 'n' { - toolCommand = &(wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY); + toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY); } else if( _lastKeyCode == 15 && ctrlKey ) //'O' || 'o' { - toolCommand = &(wxContour_ActionCommnadsID::OPEN_TOOL); + toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL); } else if( _lastKeyCode == 19 && ctrlKey ) //'S' || 's' { - toolCommand = &(wxContour_ActionCommnadsID::SAVE_KEY); + toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY); } if ( toolCommand!=NULL ) -- 2.45.1