*** empty log message ***

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

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 60a8d17c929c0bc164365d0ddceb4f41dd52d1fc..14f0f5acb86fe89480b5eede639feea735b3cfc3 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -12,6 +12,7 @@
 */
 
 interfMainPanel* interfMainPanel::interfmainpanel=NULL;
+wxFrame* interfMainPanel::_newframe=NULL;
 
 interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir)
 : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
@@ -124,29 +125,31 @@ interfMainPanel::~interfMainPanel(void)
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler){       
 
-       wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
+       _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
        
                                                                                                                                                                                
        if(interfmainpanel == NULL){
-               interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler, datadir);
+               interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler, datadir);
        }
 
-       newframe->Show(TRUE);
+       _newframe->Show(TRUE);
        return interfmainpanel;
 }
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler){    
 
-       wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
+       _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
 
        if(interfmainpanel == NULL){
-               interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler);
+               interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler);
        }
 
-       newframe->Show(TRUE);
+       _newframe->Show(TRUE);
        return interfmainpanel;
 }
-
+bool interfMainPanel::Show(bool show){
+       return _newframe->Show(show);
+}
 interfMainPanel* interfMainPanel::getInstance()
 {      
 
@@ -155,7 +158,8 @@ interfMainPanel* interfMainPanel::getInstance()
 
 void interfMainPanel :: resetInstance()
 {
-       delete interfmainpanel;
+       //delete interfmainpanel;
+       delete _newframe;
        interfmainpanel = NULL;
 }
 
@@ -752,3 +756,4 @@ void interfMainPanel::onThresholdPressed()
        }       
        showPanel(thresholdPanel);
 }
+