[rkward-cvs] rkward/rkward rkeditormanager.cpp,1.11,1.12

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17201/rkward

Modified Files:
	rkeditormanager.cpp 
Log Message:
Fix problem with RKEditorDataFrame-GUI sometimes not being removed when editor window is closed (I hope)

Index: rkeditormanager.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkeditormanager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rkeditormanager.cpp	19 Oct 2005 22:39:32 -0000	1.11
--- rkeditormanager.cpp	20 Oct 2005 18:42:37 -0000	1.12
***************
*** 19,22 ****
--- 19,23 ----
  #include "dataeditor/rkeditor.h"
  #include "dataeditor/rkeditordataframe.h"
+ #include "dataeditor/rkeditordataframepart.h"
  #include "core/robject.h"
  #include "core/rcontainerobject.h"
***************
*** 157,170 ****
  	RK_TRACE (APP);
  
! 	RKEditorDataFrame *ed = new RKEditorDataFrame (0);
! 	(RKGlobals::rkApp()->m_manager)->addPart (ed->getPart (), false);
! 	ed->setIcon (SmallIcon ("spreadsheet"));
! 	RKGlobals::rkApp ()->addWindow (ed);
! 	ed->activate ();		// it seems, sometimes we need to call this explicitely
! 	editors.append (ed);
! 	connect (ed, SIGNAL (destroyed (QObject*)), this, SLOT (editorDestroyed (QObject*)));
! 	RKGlobals::rkApp ()->activateGUI (ed->getPart ());		// it seems, sometimes we need to call this explicitely
  
! 	return ed;
  }
  
--- 158,170 ----
  	RK_TRACE (APP);
  
! 	RKEditorDataFramePart *part = new RKEditorDataFramePart (0);
! 	(RKGlobals::rkApp()->m_manager)->addPart (part, false);
! 	part->getEditor ()->setIcon (SmallIcon ("spreadsheet"));
! 	RKGlobals::rkApp ()->addWindow (part->getEditor ());
! 	part->getEditor ()->setFocus ();		// somehow we need to call this explicitely
! 	editors.append (part->getEditor ());
! 	connect (part->getEditor (), SIGNAL (destroyed (QObject*)), this, SLOT (editorDestroyed (QObject*)));
  
! 	return part->getEditor ();
  }