X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfEditMenu.cxx;h=9f94b67ec7d5d6d74d2bd6549f970fd825b3f1c5;hb=5757258860acae97fa0f3449ef1354c87052d213;hp=75aec01935ae46aa78a5cd3ae624565baf91672f;hpb=3f578b2680f3dd02c75cf41f717423ac53869ae3;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx index 75aec01..9f94b67 100644 --- a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx @@ -5,7 +5,7 @@ interfEditMenu::interfEditMenu(wxWindow * parent, int sizex, int sizey,wxEvtHand : interfMenuBar(parent, sizex, sizey) { this->datadir = datdir; - eventHandler = evtHandler; +// eventHandler = evtHandler; initButtons(this); } @@ -16,11 +16,11 @@ void interfEditMenu::initButtons(wxEvtHandler* evtHandler) { path.push_back(datadir + "/copy.png"); nom.push_back("Copy the selected contour"); - funct.push_back((wxObjectEventFunction) &interfMenuBar:: onActionButtonPressed); + funct.push_back((wxObjectEventFunction) &interfEditMenu:: onCopy); path.push_back(datadir + "/paste.png"); nom.push_back("Paste the copied contour"); - funct.push_back((wxObjectEventFunction) &interfMenuBar:: onActionButtonPressed); + funct.push_back((wxObjectEventFunction) &interfEditMenu:: onPaste); path.push_back(datadir + "/undo.png"); nom.push_back("Undo"); @@ -33,20 +33,26 @@ void interfEditMenu::initButtons(wxEvtHandler* evtHandler) { this->addButtons(path, nom); this->setVectorFunction(funct); - this->setButtonName(0, wxContour_ActionCommandsID::COPY_TOOL); - this->setButtonName(1, wxContour_ActionCommandsID::PASTE_TOOL); + this->setButtonName(0, 'C'); + this->setButtonName(1, 'P'); this->setButtonName(2, '-'); this->setButtonName(3, '-'); this->connectEvents(evtHandler); } +void interfEditMenu::onCopy(wxCommandEvent& event){ + interfMainPanel::getInstance()->onCopy(); +} +void interfEditMenu::onPaste(wxCommandEvent& event){ + interfMainPanel::getInstance()->onPaste(); +} void interfEditMenu::onUndo(wxCommandEvent& event){ - ((wxContourEventHandler*)this->eventHandler)->onUNDO(); + interfMainPanel::getInstance()->onUndo(); } void interfEditMenu::onRedo(wxCommandEvent& event){ - ((wxContourEventHandler*)this->eventHandler)->onREDO(); + interfMainPanel::getInstance()->onRedo(); } interfEditMenu::~interfEditMenu()