[Wxdevcenter-cvs] wxDevCenter/src/msw FileSystemStandard.cpp,1.1,1.2

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

Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29232/src/msw

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

Index: FileSystemStandard.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/FileSystemStandard.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileSystemStandard.cpp	26 Jan 2005 16:11:46 -0000	1.1
--- FileSystemStandard.cpp	16 Mar 2005 14:27:37 -0000	1.2
***************
*** 236,248 ****
  {
      if(strPath.IsEmpty())
!         return WXDC_FS_DIRTYPE_MOUNT;
      else if(strPath==(GetProtocoleName() + wxT(":")))
!         return WXDC_FS_DIRTYPE_MOUNT;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameDesktop))
!         return WXDC_FS_DIRTYPE_DESKTOP;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameMyDocs))
!         return WXDC_FS_DIRTYPE_DOC;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameComputer))
!         return WXDC_FS_DIRTYPE_MOUNT;
      else if(strPath.Matches(GetProtocoleName() + wxT(":") + m_strNameComputer + wxT("??:")))
      {
--- 236,248 ----
  {
      if(strPath.IsEmpty())
!         return WXDC_STDFS_DIRTYPE_MOUNT;
      else if(strPath==(GetProtocoleName() + wxT(":")))
!         return WXDC_STDFS_DIRTYPE_MOUNT;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameDesktop))
!         return WXDC_STDFS_DIRTYPE_DESKTOP;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameMyDocs))
!         return WXDC_STDFS_DIRTYPE_DOC;
      else if(strPath==(GetProtocoleName() + wxT(":") + m_strNameComputer))
!         return WXDC_STDFS_DIRTYPE_MOUNT;
      else if(strPath.Matches(GetProtocoleName() + wxT(":") + m_strNameComputer + wxT("??:")))
      {
***************
*** 253,271 ****
          {
          case DRIVE_REMOVABLE:
!             return WXDC_FS_DIRTYPE_FLOPPY;
          case DRIVE_FIXED:
!             return WXDC_FS_DIRTYPE_HARDDRIVE;
          case DRIVE_REMOTE:
!             return WXDC_FS_DIRTYPE_REMOTE;
          case DRIVE_CDROM:
!             return WXDC_FS_DIRTYPE_CDROM;
          case DRIVE_RAMDISK:
!             return WXDC_FS_DIRTYPE_RAMDISK;
          default:
!             return WXDC_DOCMANAGER_TYPE_UNKNOW;
          }
      }
      else
!         return wxDir::Exists(LogicalToPhysical(strPath))?WXDC_FS_DIRTYPE_NORMAL:-1;
  }
  
--- 253,271 ----
          {
          case DRIVE_REMOVABLE:
!             return WXDC_STDFS_DIRTYPE_FLOPPY;
          case DRIVE_FIXED:
!             return WXDC_STDFS_DIRTYPE_HARDDRIVE;
          case DRIVE_REMOTE:
!             return WXDC_STDFS_DIRTYPE_REMOTE;
          case DRIVE_CDROM:
!             return WXDC_STDFS_DIRTYPE_CDROM;
          case DRIVE_RAMDISK:
!             return WXDC_STDFS_DIRTYPE_RAMDISK;
          default:
!             return WXDC_STDFS_UNKNOW;
          }
      }
      else
!         return wxDir::Exists(LogicalToPhysical(strPath))?WXDC_STDFS_FILETYPES:-1;
  }