[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.20,1.21 SimpleTextDocView.cpp,1.9,1.10

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29039/src

Modified Files:
	BitmapDocView.cpp SimpleTextDocView.cpp 
Log Message:
Merge de la branche "manager_virtualization".

Index: SimpleTextDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SimpleTextDocView.cpp	7 Mar 2005 15:23:54 -0000	1.9
--- SimpleTextDocView.cpp	16 Mar 2005 14:26:35 -0000	1.10
***************
*** 278,282 ****
      for(n=0; n<nb; n++)
      {
!         pView = wxGetApp().GetDocManager().GetView(n);
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {
--- 278,282 ----
      for(n=0; n<nb; n++)
      {
!         pView = &(wxGetApp().GetDocManager().GetView(n));
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {
***************
*** 575,579 ****
      for(int i=0; i<(int)m_ViewArray.GetCount(); i++)
      {
!         pView = m_ViewArray[i];
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {
--- 575,579 ----
      for(int i=0; i<(int)m_ViewArray.GetCount(); i++)
      {
!         pView = &(m_ViewArray[i]);
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {
***************
*** 601,605 ****
  bool SimpleTextDocument::CanCloseDocument()
  {
!     SimpleTextView *pView = (SimpleTextView*)m_ViewArray[0];
      if(pView!=NULL)
      {
--- 601,605 ----
  bool SimpleTextDocument::CanCloseDocument()
  {
!     SimpleTextView *pView = (SimpleTextView*)&(m_ViewArray[0]);
      if(pView!=NULL)
      {

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BitmapDocView.cpp	4 Mar 2005 16:35:16 -0000	1.20
--- BitmapDocView.cpp	16 Mar 2005 14:26:35 -0000	1.21
***************
*** 10,14 ****
  
  #include <wxDevCenter/FileSystem.h>
! #include <wxDevCenter/DocManager.h>
  
  #include <wx/dcmemory.h>
--- 10,14 ----
  
  #include <wxDevCenter/FileSystem.h>
! #include <wxDevCenter/DocView.h>
  
  #include <wx/dcmemory.h>