Version with out wxEventHandler

[creaContours.git] / lib / Interface_Icons_NDimensions / interfDeleteMenu.cxx

diff --git a/lib/Interface_Icons_NDimensions/interfDeleteMenu.cxx b/lib/Interface_Icons_NDimensions/interfDeleteMenu.cxx
index bc4b1c715a7f4daa3bf2a39c155ab775c80a9432..ca70799067efde82f0c9ef9a137942ba097fe7c2 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfDeleteMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfDeleteMenu.cxx
@@ -4,7 +4,7 @@ interfDeleteMenu::interfDeleteMenu(wxWindow * parent, int sizex, int sizey,wxEvt
        : interfMenuBar(parent, sizex, sizey)
 {
        this->datadir = datdir;
-       initButtons(evtHandler);
+       initButtons(this);
 }
 
 void interfDeleteMenu::initButtons(wxEvtHandler* evtHandler) {
@@ -14,15 +14,15 @@ void interfDeleteMenu::initButtons(wxEvtHandler* evtHandler) {
 
        path.push_back(datadir + "/DeleteContour.png");
        nom.push_back("Delete the selected contour");
-       funct.push_back(wxCommandEventHandler(wxContourEventHandler::onDeleteContour));
+       funct.push_back((wxObjectEventFunction)&interfDeleteMenu::onDeleteContour);
 
        path.push_back(datadir + "/DeleteAllContourSlide.png");
        nom.push_back("Delete all contours in the current slide");
-       funct.push_back(wxCommandEventHandler(wxContourEventHandler::onDeleteContoursActSlice));
+       funct.push_back((wxObjectEventFunction)&interfDeleteMenu::onDeleteContoursActSlice);
 
        path.push_back(datadir + "/DeleteAll.png");
        nom.push_back("Delete all contours in all slides");
-       funct.push_back(wxCommandEventHandler(wxContourEventHandler::onDeleteAllContours));
+       funct.push_back((wxObjectEventFunction)&interfDeleteMenu::onDeleteAllContours);
 
     this->addButtons(path, nom);
 
@@ -35,3 +35,13 @@ interfDeleteMenu::~interfDeleteMenu()
 {
 }
 
+
+void interfDeleteMenu::onDeleteContour(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onDeleteContour();
+}
+void interfDeleteMenu::onDeleteContoursActSlice(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onDeleteContoursActSlice();
+}
+void interfDeleteMenu::onDeleteAllContours(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onDeleteAllContours();
+}
\ No newline at end of file