X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxGUITextEditor.cxx;h=b6cb137344c2b460eaddc79d18236532608c6be3;hb=9ebbefccfab8978b357669af56a08d661386df9a;hp=b1f95b4af9449dbd116d9402c1d25b2baccdd0d0;hpb=f993478d7df1d9688c4ab93c617688c84cf2d424;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUITextEditor.cxx b/kernel/src/bbtkWxGUITextEditor.cxx
index b1f95b4..b6cb137 100644
--- a/kernel/src/bbtkWxGUITextEditor.cxx
+++ b/kernel/src/bbtkWxGUITextEditor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUITextEditor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/14 12:32:26 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2008/09/10 07:25:23 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,20 +38,20 @@
 #include "bbtkConfigurationFile.h"
 #include "bbtkUtilities.h"
 
-#include "icons/cc_new.xpm"
-#include "icons/cc_open.xpm"
-#include "icons/cc_stop.xpm"
-#include "icons/cc_save.xpm"
-#include "icons/cc_save_as.xpm"
-#include "icons/cc_run.xpm"
-#include "icons/cc_exit.xpm"
+//#include "icons/cc_new.xpm"
+//#include "icons/cc_open.xpm"
+//#include "icons/cc_stop.xpm"
+//#include "icons/cc_save.xpm"
+//#include "icons/cc_save_as.xpm"
+//#include "icons/cc_run.xpm"
+//#include "icons/cc_exit.xpm"
 
 #include "../data/icons/wxart_new.xpm"
 #include "../data/icons/wxart_fileopen.xpm"
 #include "../data/icons/wxart_filesave.xpm"
 #include "../data/icons/wxart_filesaveas.xpm"
-#include "../data/icons/wxart_exefile.xpm"
-#include "../data/icons/wxart_delete.xpm"
+//#include "../data/icons/wxart_exefile.xpm"
+//#include "../data/icons/wxart_delete.xpm"
 #include "../data/icons/wxart_down.xpm"
 #include "../data/icons/wxart_eldel.xpm"
 
@@ -189,8 +189,11 @@ namespace bbtk
 	wxFileDialog* fd = new wxFileDialog(this,_T("Save file"),_T(""),
 					    _T(""),std2wx(filter),
 					    wxSAVE | wxOVERWRITE_PROMPT );
-	fd->ShowModal();
+	int result_fd = fd->ShowModal();
     
+	// This line is need it by windows // EED
+	fd->SetReturnCode( result_fd );
+
 	if (fd->GetReturnCode()==wxID_OK)
 	  {
 	    mName = wx2std(fd->GetPath());
@@ -432,8 +435,11 @@ namespace bbtk
     wxFileDialog* fd = new wxFileDialog(this,_T("Open file"),_T(""),
 					_T(""),std2wx(mFileNameFilter),
 					wxOPEN | wxFILE_MUST_EXIST );
-    fd->ShowModal();
-    
+    int result_fd = fd->ShowModal();
+
+	// This line is need it by windows //EED
+	fd->SetReturnCode( result_fd );
+
     if (fd->GetReturnCode()==wxID_OK)
       {
 	std::string filename = wx2std(fd->GetPath());
@@ -483,7 +489,7 @@ namespace bbtk
       } 
     mwxNotebook->DeletePage(mwxNotebook->GetSelection());
     FocusOnCurrentPage();
-    return false;
+    return true;
   }
   //================================================================  
 
@@ -662,8 +668,8 @@ namespace bbtk
     
     SetSizer(sizer);
 
-    // Creates the parent window of all bbtk windows as a child of this
-    Wx::CreateTopWindow(this);
+    // parent window of all bbtk windows will be a child of this
+    Wx::SetTopWindowParent(this);
     // Add the method OnWxSignal as a Wx::Signal observer 
     //bbtkAddWxSignalObserver(WxGUITextEditorWindow::OnWxSignal);