-/*=========================================================================
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ # pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ # This software is governed by the CeCILL-B license under French law and
+ # abiding by the rules of distribution of free software. You can use,
+ # modify and/ or redistribute the software under the terms of the CeCILL-B
+ # license as circulated by CEA, CNRS and INRIA at the following URL
+ # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ # or in the file LICENSE.txt.
+ #
+ # As a counterpart to the access to the source code and rights to copy,
+ # modify and redistribute granted by the license, users are provided only
+ # with a limited warranty and the software's author, the holder of the
+ # economic rights, and the successive licensors have only limited
+ # liability.
+ #
+ # The fact that you are presently reading this means that you have had
+ # knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
Program: bbtk
Module: $RCSfile: bbtkWxGUITextEditor.cxx,v $
Language: C++
- Date: $Date: 2009/04/15 15:45:49 $
- Version: $Revision: 1.19 $
+ Date: $Date: 2012/11/16 08:49:01 $
+ Version: $Revision: 1.22 $
=========================================================================*/
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-* This software is governed by the CeCILL-B license under French law and
-* abiding by the rules of distribution of free software. You can use,
-* modify and/ or redistribute the software under the terms of the CeCILL-B
-* license as circulated by CEA, CNRS and INRIA at the following URL
-* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-* or in the file LICENSE.txt.
-*
-* As a counterpart to the access to the source code and rights to copy,
-* modify and redistribute granted by the license, users are provided only
-* with a limited warranty and the software's author, the holder of the
-* economic rights, and the successive licensors have only limited
-* liability.
-*
-* The fact that you are presently reading this means that you have had
-* knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */
+
/**
// | wxTAB_TRAVERSAL
);
*/
- wxFont* FixedFont = new wxFont(10,
+ mFixedFont = new wxFont(10,
wxFONTFAMILY_MODERN,
wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL,
false);
mwxInputTextAttr = new wxTextAttr;
- mwxInputTextAttr->SetFont(*FixedFont);
+ mwxInputTextAttr->SetFont(*mFixedFont);
sizer->Add(mwxInputText,1,wxGROW);
SetSizer(sizer);
//================================================================
WxGUITextEditorPage::~WxGUITextEditorPage()
{
+ delete mwxInputTextAttr;
+ delete mFixedFont;
}
//================================================================
// std::cout << "-------------- SAVE ---------------"<<std::endl;
if (mAskFilename)
{
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog* fd = new wxFileDialog(this,_T("Save file"),_T(""),
_T(""),std2wx(filter),
wxSAVE | wxOVERWRITE_PROMPT );
+#else
+ wxFileDialog* fd = new wxFileDialog(this,_T("Save file"),_T(""),
+ _T(""),std2wx(filter),
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+#endif
+
int result_fd = fd->ShowModal();
// This line is need it by windows // EED
{
// std::cout << "-------------- OPEN ---------------"<<std::endl;
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog* fd = new wxFileDialog(this,_T("Open file"),_T(""),
_T(""),std2wx(mFileNameFilter),
wxOPEN | wxFILE_MUST_EXIST );
+#else
+ wxFileDialog* fd = new wxFileDialog(this,_T("Open file"),_T(""),
+ _T(""),std2wx(mFileNameFilter),
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST );
+#endif
int result_fd = fd->ShowModal();
// This line is need it by windows //EED
SetSizer(sizer);
// parent window of all bbtk windows will be a child of this
- Wx::SetTopWindowParent(this);
+ // Wx::SetTopWindowParent(this);
+ Wx::SetTopWindow(this);
// Add the method OnWxSignal as a Wx::Signal observer
//bbtkAddWxSignalObserver(WxGUITextEditorWindow::OnWxSignal);