|
From: Emilien K. <cur...@us...> - 2005-03-16 09:08:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18062/src Modified Files: Tag: manager-virtualization DocManager.cpp FileSystemStandard.cpp Log Message: Fix dans l'énumération des wildcards. Fix la numérotation des types de documents pour l'affichage des icones dans les StdFS. Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** DocManager.cpp 15 Mar 2005 21:27:32 -0000 1.7.2.1 --- DocManager.cpp 16 Mar 2005 09:08:21 -0000 1.7.2.2 *************** *** 445,449 **** for(m=0; m<GetDocTemplateCount(); m++) { ! for(n=0; n<GetDocTemplate(n).GetExtensionCount(); n++) { strWild += wxT("*.") + GetDocTemplate(m).GetExtension(n) + wxT(";"); --- 445,449 ---- for(m=0; m<GetDocTemplateCount(); m++) { ! for(n=0; n<GetDocTemplate(m).GetExtensionCount(); n++) { strWild += wxT("*.") + GetDocTemplate(m).GetExtension(n) + wxT(";"); Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** FileSystemStandard.cpp 15 Mar 2005 21:27:32 -0000 1.13.2.1 --- FileSystemStandard.cpp 16 Mar 2005 09:08:21 -0000 1.13.2.2 *************** *** 61,67 **** else { ! type = WXDC_FS_DIRTYPE_NB + wxGetApp().GetDocManager().GetDocTemplateFromExt(strPath.GetFileExt()); ! if(type==-1) ! type = WXDC_DOCMANAGER_TYPE_UNKNOW; } return type; --- 61,69 ---- else { ! type = wxGetApp().GetDocManager().GetDocTemplateFromExt(strPath.GetFileExt()); ! if(type!=-1) ! type += WXDC_STDFS_FILETYPES; ! else ! type = WXDC_STDFS_UNKNOW; } return type; *************** *** 70,74 **** wxImageList* FileSystemStandardBase::GetImageList(int width) { ! wxImageList* pIL = new wxImageList(width, width, true, WXDC_FS_DIRTYPE_NB + wxGetApp().GetDocManager().GetDocTemplateCount()); wxIconBundle IB; --- 72,76 ---- wxImageList* FileSystemStandardBase::GetImageList(int width) { ! wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + wxGetApp().GetDocManager().GetDocTemplateCount()); wxIconBundle IB; |