*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasIRMView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 34a855893586dbad0cd61c78dd56ff94ed61f6b0..f0d135c07ad67331b497bc839146ef74e9f64251 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasIRMView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/10 17:42:29 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2009/06/16 13:25:58 $
+  Version:   $Revision: 1.11 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -43,9 +43,9 @@ wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path)
 
        std::string iconsdir = path;
        iconsdir+="/data/Icons";
-       wxToolBar* toolbar = new ToolBar(this,iconsdir);
+       this->_toolb = new ToolBar(this,iconsdir);
        wxAuiPaneInfo paneinfo;
-       wxauimanager->AddPane(toolbar,paneinfo.ToolbarPane().Top());
+       wxauimanager->AddPane(_toolb,paneinfo.ToolbarPane().Top());
 
        wxauimanager->Update();
        createFileChooser();
@@ -54,6 +54,7 @@ wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path)
 }
 wxMaracasIRMView::~wxMaracasIRMView( ){
 
+       delete _toolb;
 
 }
 
@@ -227,7 +228,7 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
        //iconfil+= "/OpenImage.png";
        //wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
        wxBitmap bitmap0(OpenImage_xpm);
-       this->AddTool(0, wxString(_T("test")),bitmap0);
+       this->AddTool(1, wxString(_T("test")),bitmap0);
 
        /*iconfil+= "/Open.png";
        wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
@@ -240,27 +241,28 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
 
        this->Realize();
 
-       this->SetEventHandler(&evthand);
+       _evthand = new ToolBarEventHandler();
+       this->SetEventHandler(_evthand);
 
 }
 
 ToolBar::~ToolBar(void){
 }
 
-ToolBar::ToolBarEventHandler::ToolBarEventHandler()
+ToolBarEventHandler::ToolBarEventHandler()
 : wxEvtHandler(){
 }
-ToolBar::ToolBarEventHandler::~ToolBarEventHandler(){
+ToolBarEventHandler::~ToolBarEventHandler(){
 }
 
-void ToolBar::ToolBarEventHandler::onLoadImageFile(wxCommandEvent& event){
+void ToolBarEventHandler::onLoadImageFile(wxCommandEvent& event){
        wxMaracasIRMView::getInstance()->onLoadImageFile();
 }
 
 
 
-BEGIN_EVENT_TABLE(ToolBar::ToolBarEventHandler, wxEvtHandler)
-       EVT_MENU(0, ToolBar::ToolBarEventHandler::onLoadImageFile)
+BEGIN_EVENT_TABLE(ToolBarEventHandler, wxEvtHandler)
+       EVT_MENU(1, ToolBarEventHandler::onLoadImageFile)
 END_EVENT_TABLE()