X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUITextEditor.cxx;h=d94d6bdc26d3ee872e70331127a6655d97d412c3;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=f970ec74f0241c584d61a00a19730804d99b2400;hpb=975161a89341e867c53da1dedd15e2f97cbd4586;p=bbtk.git diff --git a/kernel/src/bbtkWxGUITextEditor.cxx b/kernel/src/bbtkWxGUITextEditor.cxx index f970ec7..d94d6bd 100644 --- a/kernel/src/bbtkWxGUITextEditor.cxx +++ b/kernel/src/bbtkWxGUITextEditor.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUITextEditor.cxx,v $ Language: C++ - Date: $Date: 2009/04/15 15:45:49 $ - Version: $Revision: 1.19 $ + Date: $Date: 2009/12/04 10:48:34 $ + Version: $Revision: 1.21 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -170,14 +170,14 @@ namespace bbtk // | 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); @@ -189,6 +189,8 @@ namespace bbtk //================================================================ WxGUITextEditorPage::~WxGUITextEditorPage() { + delete mwxInputTextAttr; + delete mFixedFont; } //================================================================ @@ -758,7 +760,8 @@ namespace bbtk 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);