Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Emilien K. <cur...@us...> - 2005-02-28 15:26:37
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6865/src Modified Files: Application.cpp FileTools.cpp Log Message: Linux bugfix/warningfix Index: FileTools.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileTools.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileTools.cpp 25 Feb 2005 20:42:25 -0000 1.4 --- FileTools.cpp 28 Feb 2005 15:26:23 -0000 1.5 *************** *** 126,130 **** int i; i = Find(":"); ! return (i>0)? Mid(i+1) : *this; } --- 126,130 ---- int i; i = Find(":"); ! return (i>0)? Mid(i+1) : wxString(*this); } Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Application.cpp 25 Feb 2005 20:58:04 -0000 1.12 --- Application.cpp 28 Feb 2005 15:26:23 -0000 1.13 *************** *** 291,295 **** pView->OnInitialUpdate(); ! wxLogStatus(WXDC_DOCUMENT_STATUS_LOADED, strPath); return true; } --- 291,295 ---- pView->OnInitialUpdate(); ! wxLogStatus(WXDC_DOCUMENT_STATUS_LOADED, strPath.GetData()); return true; } *************** *** 349,353 **** if(!pDoc->OnSaveDocument(path)) return false; ! wxLogStatus(WXDC_DOCUMENT_STATUS_SAVED, path); return true; } --- 349,353 ---- if(!pDoc->OnSaveDocument(path)) return false; ! wxLogStatus(WXDC_DOCUMENT_STATUS_SAVED, path.GetData()); return true; } *************** *** 410,414 **** for(unsigned int n=0; n<arFiles.GetCount(); n++) { ! wxLogDebug("Load icon : %s", arFiles[n]); IB.AddIcon(arFiles[n], wxBITMAP_TYPE_ANY); } --- 410,414 ---- for(unsigned int n=0; n<arFiles.GetCount(); n++) { ! wxLogDebug("Load icon : %s", arFiles[n].GetData()); IB.AddIcon(arFiles[n], wxBITMAP_TYPE_ANY); } |
|
From: Emilien K. <cur...@us...> - 2005-02-28 15:26:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6865/include/wxDevCenter Modified Files: DocManager.h Log Message: Linux bugfix/warningfix Index: DocManager.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocManager.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DocManager.h 23 Feb 2005 15:08:50 -0000 1.7 --- DocManager.h 28 Feb 2005 15:26:23 -0000 1.8 *************** *** 160,164 **** /** @name Ajout de données. ! * @{ /** Ajout d'un type de vue au type de document. * @param name Nom du type de vue. --- 160,164 ---- /** @name Ajout de données. ! * @{ */ /** Ajout d'un type de vue au type de document. * @param name Nom du type de vue. *************** *** 342,346 **** * @return Identifiant de patron (-1 si erreur). */ ! int DocTemplateIDFromIndex(unsigned int nIndex)const{return (nIndex<m_DocTemplateArray.GetCount())?(m_DocTemplateArray[nIndex]->m_nID):-1;} /** Indice de patron dans le tableau de référencement depuis l'index. * @param nID Identifiant de patron. --- 342,346 ---- * @return Identifiant de patron (-1 si erreur). */ ! int DocTemplateIDFromIndex(unsigned int nIndex)const{return (nIndex<m_DocTemplateArray.GetCount())?((int)m_DocTemplateArray[nIndex]->m_nID):-1;} /** Indice de patron dans le tableau de référencement depuis l'index. * @param nID Identifiant de patron. |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:58:17
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9183/src Modified Files: Application.cpp FileSystemCtrl.cpp MainFrame.cpp Log Message: Suppression des arguments DocManager pour les controles de systèmes de fichiers car a pu besoin (ca passe par le système de fichiers). Index: FileSystemCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemCtrl.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileSystemCtrl.cpp 15 Jan 2005 14:05:17 -0000 1.5 --- FileSystemCtrl.cpp 25 Feb 2005 20:58:04 -0000 1.6 *************** *** 81,93 **** FileSystemTreeCtrl::FileSystemTreeCtrl(wxWindow* parent, wxWindowID id, wxDevCenter::FileSystem *pFileSystem, - wxDevCenter::DocManager *pDocManager, const wxPoint& pos, const wxSize& size, long style): wxTreeCtrl(parent, id, pos, size, style), m_pFileSystem(pFileSystem), - m_pDocManager(pDocManager), m_nMode(WXDC_FSTC_MODE_NORMAL), m_strRootPath() { ! SetImageList(m_pDocManager->GetImageList(WXDC_SETUP_TREE_ICON_SIZE)); } --- 81,91 ---- FileSystemTreeCtrl::FileSystemTreeCtrl(wxWindow* parent, wxWindowID id, wxDevCenter::FileSystem *pFileSystem, const wxPoint& pos, const wxSize& size, long style): wxTreeCtrl(parent, id, pos, size, style), m_pFileSystem(pFileSystem), m_nMode(WXDC_FSTC_MODE_NORMAL), m_strRootPath() { ! SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_TREE_ICON_SIZE)); } *************** *** 101,106 **** void FileSystemTreeCtrl::SetFileSystem(wxDevCenter::FileSystem *pFileSystem) { - m_pFileSystem = pFileSystem; DeleteAllItems(); } --- 99,105 ---- void FileSystemTreeCtrl::SetFileSystem(wxDevCenter::FileSystem *pFileSystem) { DeleteAllItems(); + m_pFileSystem = pFileSystem; + SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_TREE_ICON_SIZE)); } *************** *** 191,204 **** long FileSystemTreeCtrl::CalcItemType(FilePath path) { ! long type; ! if(path.IsEmpty()) ! return -1; ! if(m_pFileSystem->IsDirectory(path)) ! type = m_pFileSystem->GetDirectorySystemType(path); ! else ! type = m_pDocManager->GetDocTemplateID(path.GetFileExt()); ! if(type==-1) ! type = WXDC_DOCMANAGER_TYPE_UNKNOW; ! return type; } --- 190,194 ---- long FileSystemTreeCtrl::CalcItemType(FilePath path) { ! return m_pFileSystem->GetFileType(path); } *************** *** 286,299 **** // Constructeur. ! FileSystemListCtrl::FileSystemListCtrl(wxWindow* parent, wxWindowID id, FileSystem *pFileSystem, DocManager *pDocManager, const wxPoint& pos, const wxSize& size, long style): wxListCtrl(parent, id, pos, size, style), m_pFileSystem(pFileSystem), - m_pDocManager(pDocManager), m_nMode(WXDC_FSTC_MODE_NORMAL), m_strPath(), m_strWild("*.*") { ! SetImageList(m_pDocManager->GetImageList(WXDC_SETUP_LIST_BIG_ICON_SIZE), wxIMAGE_LIST_NORMAL); ! SetImageList(m_pDocManager->GetImageList(WXDC_SETUP_LIST_LITTLE_ICON_SIZE), wxIMAGE_LIST_SMALL); OpenRoot(); } --- 276,288 ---- // Constructeur. ! FileSystemListCtrl::FileSystemListCtrl(wxWindow* parent, wxWindowID id, FileSystem *pFileSystem, const wxPoint& pos, const wxSize& size, long style): wxListCtrl(parent, id, pos, size, style), m_pFileSystem(pFileSystem), m_nMode(WXDC_FSTC_MODE_NORMAL), m_strPath(), m_strWild("*.*") { ! SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_LIST_BIG_ICON_SIZE), wxIMAGE_LIST_NORMAL); ! SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_LIST_LITTLE_ICON_SIZE), wxIMAGE_LIST_SMALL); OpenRoot(); } *************** *** 307,312 **** void FileSystemListCtrl::SetFileSystem(FileSystem *pFileSystem) { - m_pFileSystem = pFileSystem; DeleteAllItems(); } --- 296,303 ---- void FileSystemListCtrl::SetFileSystem(FileSystem *pFileSystem) { DeleteAllItems(); + m_pFileSystem = pFileSystem; + SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_LIST_BIG_ICON_SIZE), wxIMAGE_LIST_NORMAL); + SetImageList(m_pFileSystem->GetImageList(WXDC_SETUP_LIST_LITTLE_ICON_SIZE), wxIMAGE_LIST_SMALL); } *************** *** 386,401 **** long FileSystemListCtrl::CalcItemType(FilePath path) { ! long type; ! if(path.IsEmpty()) ! return -1; ! if(m_pFileSystem->IsDirectory(path)) ! type = m_pFileSystem->GetDirectorySystemType(path); ! else ! { ! type = m_pDocManager->GetDocTemplateID(path.GetFileExt()); ! if(type==-1) ! type = WXDC_DOCMANAGER_TYPE_UNKNOW; ! } ! return type; } --- 377,381 ---- long FileSystemListCtrl::CalcItemType(FilePath path) { ! return m_pFileSystem->GetFileType(path); } *************** *** 468,474 **** // Constructeur. ! FileSystemPanel::FileSystemPanel(wxWindow* parent, wxWindowID id, DocManager* pDocManager, FileSystem* pFileSystem, wxString strWild): wxPanel(parent, id), - m_pDocManager(pDocManager), m_pFileSystem(pFileSystem), m_pSplitter(NULL), --- 448,453 ---- // Constructeur. ! FileSystemPanel::FileSystemPanel(wxWindow* parent, wxWindowID id, FileSystem* pFileSystem, wxString strWild): wxPanel(parent, id), m_pFileSystem(pFileSystem), m_pSplitter(NULL), *************** *** 478,483 **** m_pSplitter = new wxSplitterWindow(this, -1); ! m_pTree = new FileSystemTreeCtrl(m_pSplitter, ID_TREE, m_pFileSystem, m_pDocManager); ! m_pList = new FileSystemListCtrl(m_pSplitter, ID_LIST, m_pFileSystem, m_pDocManager); m_pSplitter->SplitVertically(m_pTree, m_pList, 128); --- 457,462 ---- m_pSplitter = new wxSplitterWindow(this, -1); ! m_pTree = new FileSystemTreeCtrl(m_pSplitter, ID_TREE, m_pFileSystem); ! m_pList = new FileSystemListCtrl(m_pSplitter, ID_LIST, m_pFileSystem); m_pSplitter->SplitVertically(m_pTree, m_pList, 128); *************** *** 596,602 **** // Constructeur classique des FileDialog. ! FileSystemDialog::FileSystemDialog(wxWindow* parent, wxWindowID id, DocManager* pDocManager, const wxString& message, const wxString& defaultDir, const wxString& defaultFile, const wxString& wildcard, long style, const wxPoint& pos): ! wxDialog(parent, id, message, pos, wxSize(600,400), style), ! m_pDocManager(pDocManager) { wxSizer *pGlobalSizer = new wxBoxSizer(wxVERTICAL); --- 575,580 ---- // Constructeur classique des FileDialog. ! FileSystemDialog::FileSystemDialog(wxWindow* parent, wxWindowID id, const wxString& message, const wxString& defaultDir, const wxString& defaultFile, const wxString& wildcard, long style, const wxPoint& pos): ! wxDialog(parent, id, message, pos, wxSize(600,400), style) { wxSizer *pGlobalSizer = new wxBoxSizer(wxVERTICAL); *************** *** 695,699 **** void FileSystemDialog::AttachFileSystem(FileSystem *pFileSystem, wxString strTitle, wxBitmap& bmp) { ! FileSystemPanel *pPanel = new FileSystemPanel(m_pListbook, -1, m_pDocManager, pFileSystem); m_pImageList->Add(bmp); m_pListbook->AddPage(pPanel, strTitle, true, m_pImageList->GetImageCount()-1); --- 673,677 ---- void FileSystemDialog::AttachFileSystem(FileSystem *pFileSystem, wxString strTitle, wxBitmap& bmp) { ! FileSystemPanel *pPanel = new FileSystemPanel(m_pListbook, -1, pFileSystem); m_pImageList->Add(bmp); m_pListbook->AddPage(pPanel, strTitle, true, m_pImageList->GetImageCount()-1); Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Application.cpp 23 Feb 2005 14:11:45 -0000 1.11 --- Application.cpp 25 Feb 2005 20:58:04 -0000 1.12 *************** *** 298,302 **** bool Application::OpenDocument() { ! FileSystemDialog FD(NULL, -1, &m_DocManager, WXDC_DOCUMENT_REQUEST_OPEN, WXDC_SYSTEM_DEFAULT_PATH); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_DocManager.GetAllWildcard()); --- 298,302 ---- bool Application::OpenDocument() { ! FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_OPEN, WXDC_SYSTEM_DEFAULT_PATH); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_DocManager.GetAllWildcard()); *************** *** 332,336 **** if(path.IsEmpty() || bForceChooseName) // Sélection du fichier. { ! FileSystemDialog FD(NULL, -1, &m_DocManager, WXDC_DOCUMENT_REQUEST_SAVE, WXDC_SYSTEM_DEFAULT_PATH, path); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); --- 332,336 ---- if(path.IsEmpty() || bForceChooseName) // Sélection du fichier. { ! FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_SAVE, WXDC_SYSTEM_DEFAULT_PATH, path); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MainFrame.cpp 22 Feb 2005 16:24:05 -0000 1.5 --- MainFrame.cpp 25 Feb 2005 20:58:04 -0000 1.6 *************** *** 162,167 **** m_pMDIFrame = new MDIFrame(this, this, -1); ! m_pStdFileSystemTree = new FileSystemTreeCtrl(this, -1, ! wxGetApp().GetStandardFileSystem(), &wxGetApp().GetDocManager()); m_pStdFileSystemTree->OpenRoot(); --- 162,166 ---- m_pMDIFrame = new MDIFrame(this, this, -1); ! m_pStdFileSystemTree = new FileSystemTreeCtrl(this, -1, wxGetApp().GetStandardFileSystem()); m_pStdFileSystemTree->OpenRoot(); |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:58:17
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9183/include/wxDevCenter Modified Files: FileSystemCtrl.h Log Message: Suppression des arguments DocManager pour les controles de systèmes de fichiers car a pu besoin (ca passe par le système de fichiers). Index: FileSystemCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemCtrl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileSystemCtrl.h 15 Jan 2005 14:43:35 -0000 1.5 --- FileSystemCtrl.h 25 Feb 2005 20:58:02 -0000 1.6 *************** *** 87,92 **** /** Système de fichier attaché au controle.*/ FileSystem *m_pFileSystem; - /** Gestionnaire de documents attaché au controle.*/ - DocManager *m_pDocManager; /** Mode d'ouverture du controle.*/ unsigned int m_nMode; --- 87,90 ---- *************** *** 135,139 **** * @param id Identifiant de filiation. * @param pFileSystem Système de fichier. - * @param pDocManager Gestionnaire de fichier. * @param pos Position. * @param size Taille. --- 133,136 ---- *************** *** 142,146 **** FileSystemTreeCtrl(wxWindow* parent, wxWindowID id, FileSystem *pFileSystem, - DocManager *pDocManager = NULL, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS|wxTR_ROW_LINES|wxTR_FULL_ROW_HIGHLIGHT|wxTR_ROW_LINES|wxTR_SINGLE ); --- 139,142 ---- *************** *** 184,189 **** /** Système de fichier attaché au controle.*/ FileSystem *m_pFileSystem; - /** Gestionnaire de documents attaché au controle.*/ - DocManager *m_pDocManager; /** Mode d'ouverture du controle.*/ unsigned int m_nMode; --- 180,183 ---- *************** *** 198,202 **** * @param id Identifiant de filliation. * @param pFileSystem Système de fichier à parcourir. - * @param pDocManager Gestionnaire de document pour l'affichage des icones. * @param pos Position de la liste. * @param size Taille de la liste. --- 192,195 ---- *************** *** 205,209 **** FileSystemListCtrl(wxWindow* parent, wxWindowID id, FileSystem *pFileSystem, - DocManager *pDocManager = NULL, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON|wxLC_ALIGN_TOP|wxLC_AUTOARRANGE); --- 198,201 ---- *************** *** 270,275 **** protected: DECLARE_EVENT_TABLE() - /** Gestionnaire de documents.*/ - DocManager* m_pDocManager; /** Système de fichier.*/ FileSystem* m_pFileSystem; --- 262,265 ---- *************** *** 286,294 **** * @param parent Adresse de la fenetre parent. * @param id Identifiant de filiation. - * @param pDocManager Gestionnaire de document. * @param pFileSystem SYsteme de fichiers à attacher. * @param strWild Filtrage de listage des fichiers. */ ! FileSystemPanel(wxWindow* parent, wxWindowID id, DocManager* pDocManager, FileSystem* pFileSystem, wxString strWild="*.*"); /** Destructeur.*/ ~FileSystemPanel(); --- 276,283 ---- * @param parent Adresse de la fenetre parent. * @param id Identifiant de filiation. * @param pFileSystem SYsteme de fichiers à attacher. * @param strWild Filtrage de listage des fichiers. */ ! FileSystemPanel(wxWindow* parent, wxWindowID id, FileSystem* pFileSystem, wxString strWild="*.*"); /** Destructeur.*/ ~FileSystemPanel(); *************** *** 345,351 **** DECLARE_EVENT_TABLE() - /** Gestionnaire de documents attaché au controle.*/ - DocManager *m_pDocManager; - /** ListBook.*/ wxListbook* m_pListbook; --- 334,337 ---- *************** *** 385,389 **** * @param parent Fenêtre parente, peut être nulle. * @param id Identifiant de filliation. - * @param pDocManager Gestionnaire de document pour l'associations des fichiers aux icones correspondantes. * @param message Message à afficher en titre de la boite. * @param defaultDir Répertoire affiché par défaut. --- 371,374 ---- *************** *** 393,397 **** * @param pos Position de la boite de dialogue (centrée sur l'écran par défaut). */ ! FileSystemDialog(wxWindow* parent, wxWindowID id, DocManager* pDocManager, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "AllFiles|*.*", long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER, const wxPoint& pos = wxDefaultPosition); /** Destructeur.*/ ~FileSystemDialog(); --- 378,382 ---- * @param pos Position de la boite de dialogue (centrée sur l'écran par défaut). */ ! FileSystemDialog(wxWindow* parent, wxWindowID id, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "AllFiles|*.*", long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER, const wxPoint& pos = wxDefaultPosition); /** Destructeur.*/ ~FileSystemDialog(); |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:46:03
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6060/src Modified Files: FileSystemStandard.cpp Log Message: Transfert de la gestion des icones des types de fichier/dossier par les FileSystem. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FileSystemStandard.cpp 26 Jan 2005 16:11:43 -0000 1.11 --- FileSystemStandard.cpp 25 Feb 2005 20:45:55 -0000 1.12 *************** *** 52,55 **** --- 52,75 ---- } + wxImageList* FileSystemStandardBase::GetImageList(int width) + { + return wxGetApp().GetDocManager().GetImageList(width); + } + + int FileSystemStandardBase::GetFileType(const FilePath& strPath) + { + long type; + if(strPath.IsEmpty()) + return -1; + if(IsDirectory(strPath)) + type = GetDirectorySystemType(strPath); + else + { + type = wxGetApp().GetDocManager().GetDocTemplateID(strPath.GetFileExt()); + if(type==-1) + type = WXDC_DOCMANAGER_TYPE_UNKNOW; + } + return type; + } |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:46:03
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6060/include/wxDevCenter Modified Files: FileSystem.h FileSystemStandard.h Log Message: Transfert de la gestion des icones des types de fichier/dossier par les FileSystem. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileSystemStandard.h 26 Jan 2005 16:11:27 -0000 1.7 --- FileSystemStandard.h 25 Feb 2005 20:45:55 -0000 1.8 *************** *** 46,49 **** --- 46,52 ---- bool RemoveDirectory(FilePath strDir); bool RemoveFile(FilePath strFilePath); + + virtual wxImageList* GetImageList(int width); + virtual int GetFileType(const FilePath& strPath); }; Index: FileSystem.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystem.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystem.h 3 Jan 2005 14:56:15 -0000 1.2 --- FileSystem.h 25 Feb 2005 20:45:55 -0000 1.3 *************** *** 124,127 **** --- 124,129 ---- { public: + /** @name Enumération du contenu. + * @{ */ /** Retourne le nom du protocole. * @return Nom du protocole en minuscule sans ':'.*/ *************** *** 145,149 **** --- 147,154 ---- * @return Chemin du dernier fichier/répertoire.*/ virtual FilePath GetCurrentFilePath()=0; + /** @} */ + /** @name Manipulation des répertoires. + * @{ */ /** Test si le chemin spécifié pointe vers un répertoire. * @param strPath Chemin à tester. *************** *** 158,162 **** --- 163,170 ---- * @return Le chemin du parent ou vide si pas de parent.*/ virtual FilePath GetParentDirectory(FilePath strPath); + /** @} */ + /** @name Accès et manipulations des fichiers et des répertoires. + * @{ */ /** Crée un répertoire. * @param strDir Chemin du répertoire. *************** *** 171,175 **** * @return Vrai si succès.*/ virtual bool RemoveFile(FilePath strFilePath)=0; - /** Crée une archive sur un fichier. * @param strPath Chemin du fichier. --- 179,182 ---- *************** *** 177,181 **** --- 184,202 ---- */ virtual Archive* GetFileArchive(FilePath strPath, unsigned int nMode)=0; + /** @} */ + /** @name Manipulation des types de fichiers. + * @{ */ + /** Retourne une éventuelle liste d'icones. + * @param width Taille des icones de la liste d'images. + * @return Liste d'icones associée au système de fichiers.*/ + virtual wxImageList* GetImageList(int WXUNUSED(width)){return NULL;} + /** Retourne l'index du type de fichier. + * L'index correspond à l'image de la liste d'images. + * @param strPath Chemin complet du fichier. + * @return Index (-1 si non répertorié). + */ + virtual int GetFileType(const FilePath& WXUNUSED(strPath)){return -1;} + /** @} */ /** Teste si un fichier correspond à un wildcard. |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:43:04
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5043/src Modified Files: FileTools.cpp Log Message: Constage des fonctions d'extraction de FilePath. Index: FileTools.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileTools.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileTools.cpp 12 Jan 2005 17:28:58 -0000 1.3 --- FileTools.cpp 25 Feb 2005 20:42:25 -0000 1.4 *************** *** 70,74 **** // Retourne le nom du fichier "titre.ext" ! wxString FilePath::GetFileName() { register int i, j; --- 70,74 ---- // Retourne le nom du fichier "titre.ext" ! wxString FilePath::GetFileName()const { register int i, j; *************** *** 80,84 **** // Retourne le titre du fichier ! wxString FilePath::GetFileTitle() { register int i, j; --- 80,84 ---- // Retourne le titre du fichier ! wxString FilePath::GetFileTitle()const { register int i, j; *************** *** 91,95 **** // Retourne l'extension du fichier ! wxString FilePath::GetFileExt() { register int i, j; --- 91,95 ---- // Retourne l'extension du fichier ! wxString FilePath::GetFileExt()const { register int i, j; *************** *** 102,106 **** // Retourne le chemin du fichier (sans slash ou back-slash terminal) ! wxString FilePath::GetFileDir() { register int i, j; --- 102,106 ---- // Retourne le chemin du fichier (sans slash ou back-slash terminal) ! wxString FilePath::GetFileDir()const { register int i, j; *************** *** 114,118 **** // Retourne le protocole du fichier (sans le ":") ! wxString FilePath::GetFileProtocol() { int i; --- 114,118 ---- // Retourne le protocole du fichier (sans le ":") ! wxString FilePath::GetFileProtocol()const { int i; *************** *** 122,126 **** // Retourne le chemin et le nom du fichier sans le protocole (dir\titre.ext) ! wxString FilePath::GetFilePath() { int i; --- 122,126 ---- // Retourne le chemin et le nom du fichier sans le protocole (dir\titre.ext) ! wxString FilePath::GetFilePath()const { int i; *************** *** 130,134 **** // Retourne le carctère de séparation des dossiers. ! wxChar FilePath::GetSeparator() { if(Find('\\')!=-1) --- 130,134 ---- // Retourne le carctère de séparation des dossiers. ! wxChar FilePath::GetSeparator()const { if(Find('\\')!=-1) |
|
From: Emilien K. <cur...@us...> - 2005-02-25 20:42:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5043/include/wxDevCenter Modified Files: FileTools.h Log Message: Constage des fonctions d'extraction de FilePath. Index: FileTools.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileTools.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileTools.h 12 Jan 2005 17:28:47 -0000 1.3 --- FileTools.h 25 Feb 2005 20:42:24 -0000 1.4 *************** *** 51,68 **** /** Retourne le nom du fichier "titre.ext".*/ ! wxString GetFileName(); /** Retourne le titre du fichier.*/ ! wxString GetFileTitle(); /** Retourne l'extension du fichier.*/ ! wxString GetFileExt(); /** Retourne le chemin du fichier. * Retourne le chemin sans slash ou back-slash terminal et sans protocol.*/ ! wxString GetFileDir(); /** Retourne le protocole du fichier (sans le ":").*/ ! wxString GetFileProtocol(); /** Retourne le chemin et le nom du fichier sans le protocole (dir\titre.ext).*/ ! wxString GetFilePath(); /** Retourne le carctère de séparation des dossiers.*/ ! wxChar GetSeparator(); /** Retire le protocole du chemin du fichier.*/ --- 51,68 ---- /** Retourne le nom du fichier "titre.ext".*/ ! wxString GetFileName()const; /** Retourne le titre du fichier.*/ ! wxString GetFileTitle()const; /** Retourne l'extension du fichier.*/ ! wxString GetFileExt()const; /** Retourne le chemin du fichier. * Retourne le chemin sans slash ou back-slash terminal et sans protocol.*/ ! wxString GetFileDir()const; /** Retourne le protocole du fichier (sans le ":").*/ ! wxString GetFileProtocol()const; /** Retourne le chemin et le nom du fichier sans le protocole (dir\titre.ext).*/ ! wxString GetFilePath()const; /** Retourne le carctère de séparation des dossiers.*/ ! wxChar GetSeparator()const; /** Retire le protocole du chemin du fichier.*/ |
Update of /cvsroot/wxdevcenter/StdPlugin/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14175/conf/Text Added Files: .conf ADA.conf APDL.conf ASM.conf ASP.conf AU3.conf AVE.conf BAAM.conf BASH.conf Batch.conf Bullant.conf CLW no case.conf CLW.conf CPP no case.conf CPP.conf CSS.conf Config.conf Diff.conf ERLANG.conf ESCRIPT.conf Eiffel.conf EiffelKW.conf Error list.conf F77.conf FORTH.conf Fortran.conf GUI2CLI.conf HTML.conf KIX.conf LOT.conf LOUT.conf LUA.conf LaTeX.conf Lisp.conf MATLab.conf METAPOST.conf MMIXAL.conf MS-SQL.conf Makefile.conf NN Cron Table.conf NSIS.conf Octave.conf PHP.conf POV.conf PS.conf Pascal.conf Perl.conf Power Basic.conf Properties.conf Python.conf Ruby.conf SPECMAN.conf SQL.conf Scriptol.conf TCL.conf TeX.conf Text.conf Verilog.conf Visual Basic Script.conf Visual Basic.conf XCode.conf XML.conf YAML.conf Log Message: --- NEW FILE: FORTH.conf --- name=FORTH --- NEW FILE: TCL.conf --- name=TCL --- NEW FILE: TeX.conf --- name=TeX --- NEW FILE: MS-SQL.conf --- name=MS-SQL --- NEW FILE: Properties.conf --- name=Properties --- NEW FILE: CSS.conf --- name=CSS Stylesheet --- NEW FILE: AU3.conf --- name=AU3 --- NEW FILE: SQL.conf --- name=SQL --- NEW FILE: XML.conf --- name=XML --- NEW FILE: NSIS.conf --- name=NSIS --- NEW FILE: Pascal.conf --- name=Pascal --- NEW FILE: ASM.conf --- name=ASM --- NEW FILE: CLW.conf --- name=CLW --- NEW FILE: Lisp.conf --- name=Lisp --- NEW FILE: EiffelKW.conf --- name=EiffelKW --- NEW FILE: Ruby.conf --- name=Ruby --- NEW FILE: LaTeX.conf --- name=LaTeX --- NEW FILE: MATLab.conf --- name=MATLab --- NEW FILE: APDL.conf --- name=APDL --- NEW FILE: BAAM.conf --- name=BAAM --- NEW FILE: ERLANG.conf --- name=ERLANG --- NEW FILE: Diff.conf --- name=Diff --- NEW FILE: CLW no case.conf --- name=CLW no case --- NEW FILE: Visual Basic.conf --- name=Visual Basic --- NEW FILE: ASP.conf --- name=ASP --- NEW FILE: BASH.conf --- name=BASH --- NEW FILE: Eiffel.conf --- name=Eiffel --- NEW FILE: METAPOST.conf --- name=METAPOST --- NEW FILE: SPECMAN.conf --- name=SPECMAN --- NEW FILE: F77.conf --- name=F77 --- NEW FILE: Makefile.conf --- name=Makefile --- NEW FILE: LUA.conf --- folds=7 name=LUA [keywords00] keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while keyname=LUA language keywords [keywords01] keywords=_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring print tonumber tostring type unpack _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype rawget rawset require sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall rawegal rawget rawset require setfenv setmetatable xpcall string table math coroutine io os debug keyname=LUA debug keywords [keywords02] keywords=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 max min mod rad random randomseed sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan string.byte string.char string.dump string.find string.len string.lower string.rep string.sub string.upper string.format string.gfind string.gsub table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan keyname=Mathematics keywords [keywords03] keywords=openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname read write clock date difftime execute exit getenv setlocale time coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname keyname=IO keywords [keywords04] keywords= keyname= [keywords05] keywords= keyname= [keywords06] keywords= keyname= [keywords07] keywords= keyname= [keywords08] keywords= keyname= [style00] used=1 style-label=Default fore=BLACK [style01] used=1 style-label=Comment fore=FOREST GREEN [style02] used=1 style-label=Line comment fore=FOREST GREEN [style03] used=1 style-label=Doc comment fore=FOREST GREEN [style04] used=1 style-label=Number fore=VIOLET [style06] used=1 style-label=Word fore=BLUE [style07] used=1 style-label=String fore=VIOLET [style08] used=1 style-label=Character fore=VIOLET [style09] used=1 style-label=Literal string fore=VIOLET [style10] used=1 style-label=Preprocessor fore=BLUE [style11] used=1 style-label=Operator fore=BLACK [style12] used=1 style-label=Identifier fore=BLACK [style13] used=1 style-label=End of line not closed string fore=VIOLET --- NEW FILE: CPP no case.conf --- name=C++ no case --- NEW FILE: Verilog.conf --- name=Verilog --- NEW FILE: Visual Basic Script.conf --- name=Visual Basic Script --- NEW FILE: Fortran.conf --- name=Fortran --- NEW FILE: Power Basic.conf --- name=Power Basic --- NEW FILE: Perl.conf --- name=Perl --- NEW FILE: YAML.conf --- name=YAML --- NEW FILE: Batch.conf --- name=Batch --- NEW FILE: ESCRIPT.conf --- name=ESCRIPT --- NEW FILE: Python.conf --- name=Python --- NEW FILE: NN Cron Table.conf --- name=NN Cron Table --- NEW FILE: Bullant.conf --- name=Bullant --- NEW FILE: .conf --- name= --- NEW FILE: AVE.conf --- name=AVE --- NEW FILE: Error list.conf --- name=Error list --- NEW FILE: PHP.conf --- name=PHP --- NEW FILE: HTML.conf --- name=HTML --- NEW FILE: GUI2CLI.conf --- name=GUI2CLI --- NEW FILE: Octave.conf --- name=Octave --- NEW FILE: POV.conf --- name=POV --- NEW FILE: CPP.conf --- folds=7 name=C/C++ - Java [keywords00] keywords=asm auto bool break case catch char class const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new operator private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while keyname=C/C++ standard keywords [keywords01] keywords= keyname= [keywords02] keywords= keyname=User custom keywords [keywords03] keywords=a addindex addtogroup anchor arg attention author b brief bug c class code date def defgroup deprecated dontinclude e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li line link mainpage name namespace nosubgrouping note overload p page par param post pre ref relates remarks return retval sa section see showinitializer since skip skipline struct subsection test throw todo typedef union until var verbatim verbinclude version warning weakgroup $ @ & < > # { } keyname=Doxygen documentation markers [keywords04] keywords= keyname= [keywords05] keywords= keyname= [keywords06] keywords= keyname= [keywords07] keywords= keyname= [keywords08] keywords= keyname= [style00] used=1 style-label=Default [style01] used=1 style-label=Comment fore=FOREST GREEN [style02] used=1 style-label=Line comment fore=FOREST GREEN [style03] used=1 style-label=Doc comment fore=FOREST GREEN [style04] used=1 style-label=Number fore=VIOLET [style05] used=0 style-label=C/C++ key-word fore=BLUE [style06] used=1 style-label=String font-style=I fore=VIOLET [style07] used=1 style-label=Character font-style=I fore=VIOLET [style08] used=1 style-label=UUID fore=BLUE [style09] used=1 style-label=Preprocessor font-style=B fore=BLUE [style10] used=1 style-label=Operator [style11] used=1 style-label=Custom identifier [style12] used=1 style-label=End of line not closed string fore=VIOLET [style13] used=0 style-label=Not used [style14] used=1 style-label=Regular expression fore=BLUE [style15] used=1 style-label=Comment line doc fore=GREEN [style16] used=1 style-label=C/C++ additionnal key-word fore=BLUE [style17] used=1 style-label=Doxygen document fore=FIREBRICK [style18] used=1 style-label=Doxygen document error fore=RED [style19] used=1 style-label=Global class fore=BLUE --- NEW FILE: LOUT.conf --- name=LOUT --- NEW FILE: ADA.conf --- name=ADA --- NEW FILE: Scriptol.conf --- name=Scriptol --- NEW FILE: LOT.conf --- name=LOT --- NEW FILE: KIX.conf --- name=KIX --- NEW FILE: Config.conf --- name=Config --- NEW FILE: PS.conf --- name=PS --- NEW FILE: XCode.conf --- name=XCode --- NEW FILE: Text.conf --- name=Text --- NEW FILE: MMIXAL.conf --- name=MMIXAL |
Update of /cvsroot/wxdevcenter/wxDevCenter/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13698/conf/Text Removed Files: .conf ADA.conf APDL.conf ASM.conf ASP.conf AU3.conf AVE.conf BAAM.conf BASH.conf Batch.conf Bullant.conf CLW no case.conf CLW.conf CPP no case.conf CPP.conf CSS.conf Config.conf Diff.conf ERLANG.conf ESCRIPT.conf Eiffel.conf EiffelKW.conf Error list.conf F77.conf FORTH.conf Fortran.conf GUI2CLI.conf HTML.conf KIX.conf LOT.conf LOUT.conf LUA.conf LaTeX.conf Lisp.conf MATLab.conf METAPOST.conf MMIXAL.conf MS-SQL.conf Makefile.conf NN Cron Table.conf NSIS.conf Octave.conf PHP.conf POV.conf PS.conf Pascal.conf Perl.conf Power Basic.conf Properties.conf Python.conf Ruby.conf SPECMAN.conf SQL.conf Scriptol.conf TCL.conf TeX.conf Text.conf Verilog.conf Visual Basic Script.conf Visual Basic.conf XCode.conf XML.conf YAML.conf Log Message: --- FORTH.conf DELETED --- --- TCL.conf DELETED --- --- TeX.conf DELETED --- --- MS-SQL.conf DELETED --- --- Properties.conf DELETED --- --- CSS.conf DELETED --- --- AU3.conf DELETED --- --- SQL.conf DELETED --- --- XML.conf DELETED --- --- NSIS.conf DELETED --- --- Pascal.conf DELETED --- --- ASM.conf DELETED --- --- CLW.conf DELETED --- --- Lisp.conf DELETED --- --- EiffelKW.conf DELETED --- --- Ruby.conf DELETED --- --- LaTeX.conf DELETED --- --- MATLab.conf DELETED --- --- APDL.conf DELETED --- --- BAAM.conf DELETED --- --- ERLANG.conf DELETED --- --- Diff.conf DELETED --- --- CLW no case.conf DELETED --- --- Visual Basic.conf DELETED --- --- ASP.conf DELETED --- --- BASH.conf DELETED --- --- Eiffel.conf DELETED --- --- METAPOST.conf DELETED --- --- SPECMAN.conf DELETED --- --- F77.conf DELETED --- --- Makefile.conf DELETED --- --- LUA.conf DELETED --- --- CPP no case.conf DELETED --- --- Verilog.conf DELETED --- --- Visual Basic Script.conf DELETED --- --- Fortran.conf DELETED --- --- Power Basic.conf DELETED --- --- Perl.conf DELETED --- --- YAML.conf DELETED --- --- Batch.conf DELETED --- --- ESCRIPT.conf DELETED --- --- Python.conf DELETED --- --- NN Cron Table.conf DELETED --- --- Bullant.conf DELETED --- --- .conf DELETED --- --- AVE.conf DELETED --- --- Error list.conf DELETED --- --- PHP.conf DELETED --- --- HTML.conf DELETED --- --- GUI2CLI.conf DELETED --- --- Octave.conf DELETED --- --- POV.conf DELETED --- --- CPP.conf DELETED --- --- LOUT.conf DELETED --- --- ADA.conf DELETED --- --- Scriptol.conf DELETED --- --- LOT.conf DELETED --- --- KIX.conf DELETED --- --- Config.conf DELETED --- --- PS.conf DELETED --- --- XCode.conf DELETED --- --- Text.conf DELETED --- --- MMIXAL.conf DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-02-25 17:29:48
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10792 Modified Files: Tag: v0_2_x wxDevCenter.nsi Log Message: v0_2_0-rc1 Index: wxDevCenter.nsi =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.nsi,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** wxDevCenter.nsi 25 Feb 2005 14:32:46 -0000 1.5 --- wxDevCenter.nsi 25 Feb 2005 17:29:36 -0000 1.5.2.1 *************** *** 3,7 **** ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.1.3 (beta)" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" --- 3,7 ---- ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.2.0-rc1" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" |
Update of /cvsroot/wxdevcenter/StdPlugin/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8869/conf/Text Added Files: Tag: v0_2_x .conf ADA.conf APDL.conf ASM.conf ASP.conf AU3.conf AVE.conf BAAM.conf BASH.conf Batch.conf Bullant.conf CLW no case.conf CLW.conf CPP no case.conf CPP.conf CSS.conf Config.conf Diff.conf ERLANG.conf ESCRIPT.conf Eiffel.conf EiffelKW.conf Error list.conf F77.conf FORTH.conf Fortran.conf GUI2CLI.conf HTML.conf KIX.conf LOT.conf LOUT.conf LUA.conf LaTeX.conf Lisp.conf MATLab.conf METAPOST.conf MMIXAL.conf MS-SQL.conf Makefile.conf NN Cron Table.conf NSIS.conf Octave.conf PHP.conf POV.conf PS.conf Pascal.conf Perl.conf Power Basic.conf Properties.conf Python.conf Ruby.conf SPECMAN.conf SQL.conf Scriptol.conf TCL.conf TeX.conf Text.conf Verilog.conf Visual Basic Script.conf Visual Basic.conf XCode.conf XML.conf YAML.conf Log Message: --- NEW FILE: FORTH.conf --- name=FORTH --- NEW FILE: TCL.conf --- name=TCL --- NEW FILE: TeX.conf --- name=TeX --- NEW FILE: MS-SQL.conf --- name=MS-SQL --- NEW FILE: Properties.conf --- name=Properties --- NEW FILE: CSS.conf --- name=CSS Stylesheet --- NEW FILE: AU3.conf --- name=AU3 --- NEW FILE: SQL.conf --- name=SQL --- NEW FILE: XML.conf --- name=XML --- NEW FILE: NSIS.conf --- name=NSIS --- NEW FILE: Pascal.conf --- name=Pascal --- NEW FILE: ASM.conf --- name=ASM --- NEW FILE: CLW.conf --- name=CLW --- NEW FILE: Lisp.conf --- name=Lisp --- NEW FILE: EiffelKW.conf --- name=EiffelKW --- NEW FILE: Ruby.conf --- name=Ruby --- NEW FILE: LaTeX.conf --- name=LaTeX --- NEW FILE: MATLab.conf --- name=MATLab --- NEW FILE: APDL.conf --- name=APDL --- NEW FILE: BAAM.conf --- name=BAAM --- NEW FILE: ERLANG.conf --- name=ERLANG --- NEW FILE: Diff.conf --- name=Diff --- NEW FILE: CLW no case.conf --- name=CLW no case --- NEW FILE: Visual Basic.conf --- name=Visual Basic --- NEW FILE: ASP.conf --- name=ASP --- NEW FILE: BASH.conf --- name=BASH --- NEW FILE: Eiffel.conf --- name=Eiffel --- NEW FILE: METAPOST.conf --- name=METAPOST --- NEW FILE: SPECMAN.conf --- name=SPECMAN --- NEW FILE: F77.conf --- name=F77 --- NEW FILE: Makefile.conf --- name=Makefile --- NEW FILE: LUA.conf --- folds=7 name=LUA [keywords00] keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while keyname=LUA language keywords [keywords01] keywords=_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring print tonumber tostring type unpack _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype rawget rawset require sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall rawegal rawget rawset require setfenv setmetatable xpcall string table math coroutine io os debug keyname=LUA debug keywords [keywords02] keywords=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 max min mod rad random randomseed sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan string.byte string.char string.dump string.find string.len string.lower string.rep string.sub string.upper string.format string.gfind string.gsub table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan keyname=Mathematics keywords [keywords03] keywords=openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname read write clock date difftime execute exit getenv setlocale time coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname keyname=IO keywords [keywords04] keywords= keyname= [keywords05] keywords= keyname= [keywords06] keywords= keyname= [keywords07] keywords= keyname= [keywords08] keywords= keyname= [style00] used=1 style-label=Default fore=BLACK [style01] used=1 style-label=Comment fore=FOREST GREEN [style02] used=1 style-label=Line comment fore=FOREST GREEN [style03] used=1 style-label=Doc comment fore=FOREST GREEN [style04] used=1 style-label=Number fore=VIOLET [style06] used=1 style-label=Word fore=BLUE [style07] used=1 style-label=String fore=VIOLET [style08] used=1 style-label=Character fore=VIOLET [style09] used=1 style-label=Literal string fore=VIOLET [style10] used=1 style-label=Preprocessor fore=BLUE [style11] used=1 style-label=Operator fore=BLACK [style12] used=1 style-label=Identifier fore=BLACK [style13] used=1 style-label=End of line not closed string fore=VIOLET --- NEW FILE: CPP no case.conf --- name=C++ no case --- NEW FILE: Verilog.conf --- name=Verilog --- NEW FILE: Visual Basic Script.conf --- name=Visual Basic Script --- NEW FILE: Fortran.conf --- name=Fortran --- NEW FILE: Power Basic.conf --- name=Power Basic --- NEW FILE: Perl.conf --- name=Perl --- NEW FILE: YAML.conf --- name=YAML --- NEW FILE: Batch.conf --- name=Batch --- NEW FILE: ESCRIPT.conf --- name=ESCRIPT --- NEW FILE: Python.conf --- name=Python --- NEW FILE: NN Cron Table.conf --- name=NN Cron Table --- NEW FILE: Bullant.conf --- name=Bullant --- NEW FILE: .conf --- name= --- NEW FILE: AVE.conf --- name=AVE --- NEW FILE: Error list.conf --- name=Error list --- NEW FILE: PHP.conf --- name=PHP --- NEW FILE: HTML.conf --- name=HTML --- NEW FILE: GUI2CLI.conf --- name=GUI2CLI --- NEW FILE: Octave.conf --- name=Octave --- NEW FILE: POV.conf --- name=POV --- NEW FILE: CPP.conf --- folds=7 name=C/C++ - Java [keywords00] keywords=asm auto bool break case catch char class const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new operator private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while keyname=C/C++ standard keywords [keywords01] keywords= keyname= [keywords02] keywords= keyname=User custom keywords [keywords03] keywords=a addindex addtogroup anchor arg attention author b brief bug c class code date def defgroup deprecated dontinclude e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li line link mainpage name namespace nosubgrouping note overload p page par param post pre ref relates remarks return retval sa section see showinitializer since skip skipline struct subsection test throw todo typedef union until var verbatim verbinclude version warning weakgroup $ @ & < > # { } keyname=Doxygen documentation markers [keywords04] keywords= keyname= [keywords05] keywords= keyname= [keywords06] keywords= keyname= [keywords07] keywords= keyname= [keywords08] keywords= keyname= [style00] used=1 style-label=Default [style01] used=1 style-label=Comment fore=FOREST GREEN [style02] used=1 style-label=Line comment fore=FOREST GREEN [style03] used=1 style-label=Doc comment fore=FOREST GREEN [style04] used=1 style-label=Number fore=VIOLET [style05] used=0 style-label=C/C++ key-word fore=BLUE [style06] used=1 style-label=String font-style=I fore=VIOLET [style07] used=1 style-label=Character font-style=I fore=VIOLET [style08] used=1 style-label=UUID fore=BLUE [style09] used=1 style-label=Preprocessor font-style=B fore=BLUE [style10] used=1 style-label=Operator [style11] used=1 style-label=Custom identifier [style12] used=1 style-label=End of line not closed string fore=VIOLET [style13] used=0 style-label=Not used [style14] used=1 style-label=Regular expression fore=BLUE [style15] used=1 style-label=Comment line doc fore=GREEN [style16] used=1 style-label=C/C++ additionnal key-word fore=BLUE [style17] used=1 style-label=Doxygen document fore=FIREBRICK [style18] used=1 style-label=Doxygen document error fore=RED [style19] used=1 style-label=Global class fore=BLUE --- NEW FILE: LOUT.conf --- name=LOUT --- NEW FILE: ADA.conf --- name=ADA --- NEW FILE: Scriptol.conf --- name=Scriptol --- NEW FILE: LOT.conf --- name=LOT --- NEW FILE: KIX.conf --- name=KIX --- NEW FILE: Config.conf --- name=Config --- NEW FILE: PS.conf --- name=PS --- NEW FILE: XCode.conf --- name=XCode --- NEW FILE: Text.conf --- name=Text --- NEW FILE: MMIXAL.conf --- name=MMIXAL |
Update of /cvsroot/wxdevcenter/wxDevCenter/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7904/conf/Text Removed Files: Tag: v0_2_x .conf ADA.conf APDL.conf ASM.conf ASP.conf AU3.conf AVE.conf BAAM.conf BASH.conf Batch.conf Bullant.conf CLW no case.conf CLW.conf CPP no case.conf CPP.conf CSS.conf Config.conf Diff.conf ERLANG.conf ESCRIPT.conf Eiffel.conf EiffelKW.conf Error list.conf F77.conf FORTH.conf Fortran.conf GUI2CLI.conf HTML.conf KIX.conf LOT.conf LOUT.conf LUA.conf LaTeX.conf Lisp.conf MATLab.conf METAPOST.conf MMIXAL.conf MS-SQL.conf Makefile.conf NN Cron Table.conf NSIS.conf Octave.conf PHP.conf POV.conf PS.conf Pascal.conf Perl.conf Power Basic.conf Properties.conf Python.conf Ruby.conf SPECMAN.conf SQL.conf Scriptol.conf TCL.conf TeX.conf Text.conf Verilog.conf Visual Basic Script.conf Visual Basic.conf XCode.conf XML.conf YAML.conf Log Message: --- FORTH.conf DELETED --- --- TCL.conf DELETED --- --- TeX.conf DELETED --- --- MS-SQL.conf DELETED --- --- Properties.conf DELETED --- --- CSS.conf DELETED --- --- AU3.conf DELETED --- --- SQL.conf DELETED --- --- XML.conf DELETED --- --- NSIS.conf DELETED --- --- Pascal.conf DELETED --- --- ASM.conf DELETED --- --- CLW.conf DELETED --- --- Lisp.conf DELETED --- --- EiffelKW.conf DELETED --- --- Ruby.conf DELETED --- --- LaTeX.conf DELETED --- --- MATLab.conf DELETED --- --- APDL.conf DELETED --- --- BAAM.conf DELETED --- --- ERLANG.conf DELETED --- --- Diff.conf DELETED --- --- CLW no case.conf DELETED --- --- Visual Basic.conf DELETED --- --- ASP.conf DELETED --- --- BASH.conf DELETED --- --- Eiffel.conf DELETED --- --- METAPOST.conf DELETED --- --- SPECMAN.conf DELETED --- --- F77.conf DELETED --- --- Makefile.conf DELETED --- --- LUA.conf DELETED --- --- CPP no case.conf DELETED --- --- Verilog.conf DELETED --- --- Visual Basic Script.conf DELETED --- --- Fortran.conf DELETED --- --- Power Basic.conf DELETED --- --- Perl.conf DELETED --- --- YAML.conf DELETED --- --- Batch.conf DELETED --- --- ESCRIPT.conf DELETED --- --- Python.conf DELETED --- --- NN Cron Table.conf DELETED --- --- Bullant.conf DELETED --- --- .conf DELETED --- --- AVE.conf DELETED --- --- Error list.conf DELETED --- --- PHP.conf DELETED --- --- HTML.conf DELETED --- --- GUI2CLI.conf DELETED --- --- Octave.conf DELETED --- --- POV.conf DELETED --- --- CPP.conf DELETED --- --- LOUT.conf DELETED --- --- ADA.conf DELETED --- --- Scriptol.conf DELETED --- --- LOT.conf DELETED --- --- KIX.conf DELETED --- --- Config.conf DELETED --- --- PS.conf DELETED --- --- XCode.conf DELETED --- --- Text.conf DELETED --- --- MMIXAL.conf DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-02-25 17:17:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6967/src Modified Files: Config.cpp Log Message: Flush des sous configs à la destruction de la config Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Config.cpp 23 Feb 2005 14:43:41 -0000 1.7 --- Config.cpp 25 Feb 2005 17:16:56 -0000 1.8 *************** *** 42,45 **** --- 42,46 ---- Config::~Config(void) { + CloseSubConfig(); } |
|
From: Emilien K. <cur...@us...> - 2005-02-25 15:43:41
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13791/include/wxDevCenter/StdPlugin Modified Files: BitmapDocView.h language.h Log Message: Redimensionnement de la bitmap. Index: BitmapDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapDocView.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BitmapDocView.h 23 Feb 2005 09:16:46 -0000 1.13 --- BitmapDocView.h 25 Feb 2005 15:43:21 -0000 1.14 *************** *** 99,102 **** --- 99,107 ---- * @param pot Position où appliquer le bitmap.*/ void DrawBitmap(const wxBitmap& bmp, wxPoint pos); + + /** Redimmensionne la bitmap. + * @param size Nouvelle taille. + * @param br Pinceau de remplissage.*/ + void ResizeBitmap(wxSize size, wxBrush br); /** @} */ *************** *** 210,214 **** BVD_SELCUT = 11, BVD_SELCOPY = 12, ! BVD_SELPASTE = 13 }; /** Fonction de tracé courante.*/ --- 215,220 ---- BVD_SELCUT = 11, BVD_SELCOPY = 12, ! BVD_SELPASTE = 13, ! BVD_SIZEALL = 14 }; /** Fonction de tracé courante.*/ Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/language.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** language.h 16 Feb 2005 15:10:02 -0000 1.12 --- language.h 25 Feb 2005 15:43:28 -0000 1.13 *************** *** 292,295 **** --- 292,296 ---- #define WXDC_BITMAP_MENU_TOOLS_SELALL wxT("Select all bitmap\tCtrl+A") #define WXDC_BITMAP_MENU_TOOLS_SELMOVE wxT("Move selection") + #define WXDC_BITMAP_MENU_TOOLS_SIZEALL wxT("Size all bitmap") #define WXDC_BITMAP_MENU_EDIT wxT("Edit") *************** *** 336,339 **** --- 337,342 ---- #define WXDC_BITMAP_TOOL_SELPASTE wxT("Paste") #define WXDC_BITMAP_TOOLHELP_SELPASTE wxT("Paste") + #define WXDC_BITMAP_TOOL_SIZEALL wxT("Size all") + #define WXDC_BITMAP_TOOLHELP_SIZEALL wxT("Size all bitmap") |
|
From: Emilien K. <cur...@us...> - 2005-02-25 15:43:40
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13791/src Modified Files: BitmapDocView.cpp Log Message: Redimensionnement de la bitmap. Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** BitmapDocView.cpp 23 Feb 2005 09:16:46 -0000 1.18 --- BitmapDocView.cpp 25 Feb 2005 15:43:28 -0000 1.19 *************** *** 198,201 **** --- 198,219 ---- } + // Redimmensionne la bitmap. + void BitmapDocument::ResizeBitmap(wxSize size, wxBrush br) + { + wxBitmap bmpNew(size.x, size.y); + { + wxMemoryDC dc; + dc.SelectObject(bmpNew); + dc.SetBackground(br); + dc.SetBrush(br); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.Clear(); + dc.DrawRectangle(0, 0, size.x, size.y); + dc.DrawBitmap(m_Bmp, 0, 0, false); + } + m_Bmp = bmpNew; + SetModifiedFlag(true); + UpdateAllViews(NULL, BmpDocUpdateAll, 0); + } // Revoie le type de bitmap depuis l'extension d'un fichier. *************** *** 247,254 **** #define ID_TOOL_SELCOPY (IDM_VIEW_MIN + 212) #define ID_TOOL_SELPASTE (IDM_VIEW_MIN + 213) ! #define ID_TOOL_FIRST ID_TOOL_NONE ! #define ID_TOOL_LAST ID_TOOL_SELPASTE #define ID_PEN_SIZE (IDM_VIEW_MIN + 250) --- 265,272 ---- #define ID_TOOL_SELCOPY (IDM_VIEW_MIN + 212) #define ID_TOOL_SELPASTE (IDM_VIEW_MIN + 213) ! #define ID_TOOL_SIZEALL (IDM_VIEW_MIN + 214) #define ID_TOOL_FIRST ID_TOOL_NONE ! #define ID_TOOL_LAST ID_TOOL_SIZEALL #define ID_PEN_SIZE (IDM_VIEW_MIN + 250) *************** *** 340,343 **** --- 358,363 ---- pMenu->AppendCheckItem(ID_TOOL_SELECTION , WXDC_BITMAP_MENU_TOOLS_SELECTION); pMenu->AppendCheckItem(ID_TOOL_SELMOVE , WXDC_BITMAP_MENU_TOOLS_SELMOVE); + pMenu->AppendSeparator(); + pMenu->AppendCheckItem(ID_TOOL_SIZEALL , WXDC_BITMAP_MENU_TOOLS_SIZEALL); m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_TOOLS); *************** *** 375,379 **** pToolSizer->Add(CreateToolBar(), 0, wxGROW); ! pToolSizer->SetItemMinSize((size_t)1, 172, 72); pToolSizer->Add(CreatePenBar(), 0, wxGROW); --- 395,399 ---- pToolSizer->Add(CreateToolBar(), 0, wxGROW); ! pToolSizer->SetItemMinSize((size_t)1, 172, 82); pToolSizer->Add(CreatePenBar(), 0, wxGROW); *************** *** 512,515 **** --- 532,538 ---- pTB->AddTool(ID_TOOL_RRECT, WXDC_BITMAP_TOOL_RRECT, bmp, WXDC_BITMAP_TOOLHELP_RRECT, wxITEM_CHECK); + bmp = wxGetApp().LoadAppBitmap(wxT("bmp/sizeall.png"), wxBITMAP_TYPE_PNG); + pTB->AddTool(ID_TOOL_SIZEALL, WXDC_BITMAP_TOOL_SIZEALL, bmp, WXDC_BITMAP_TOOLHELP_SIZEALL, wxITEM_CHECK); + pTB->AddSeparator(); *************** *** 530,534 **** pTB->Realize(); ! pTB->SetRows(3); return pTB; --- 553,557 ---- pTB->Realize(); ! pTB->SetRows(2); return pTB; *************** *** 754,759 **** void BitmapView::OnLeftMove(wxExtendedMouseEvent& event) { ! wxPoint pt = m_pBitmapCtrl->ClientToBitmap(event.GetToPos()); SetStatusText(wxString::Format("(%d,%d)", pt.x, pt.y)); } --- 777,793 ---- void BitmapView::OnLeftMove(wxExtendedMouseEvent& event) { ! wxPoint pt = m_pBitmapCtrl->ClientToBitmap(event.GetFromPos()); SetStatusText(wxString::Format("(%d,%d)", pt.x, pt.y)); + + switch(m_BVD) + { + case BVD_SIZEALL: + if(m_pBitmapCtrl->HitTest(event.GetFromPos())==BitmapCtrl::BMP_HTF_ANCHOR_SW) + SetCursor(wxCursor(wxCURSOR_SIZENWSE)); + else + SetCursor(*wxSTANDARD_CURSOR); + break; + } + } *************** *** 776,779 **** --- 810,814 ---- case BVD_ELLIPSE: case BVD_SELECTION: + case BVD_SIZEALL: SetStatusText(wxString::Format("(%d,%d) -> (%d,%d) : (%d,%d)",m_pt.x, m_pt.y, pt.x, pt.y, pt.x-m_pt.x, pt.y-m_pt.y)); break; *************** *** 927,930 **** --- 962,970 ---- m_pBitmapCtrl->CaptureMouse(); break; + case BVD_SIZEALL: + m_pt = wxPoint(GetDocument()->GetBitmap().GetWidth(), GetDocument()->GetBitmap().GetHeight()); + if(m_pBitmapCtrl->HitTest(event.GetFromPos())!=BitmapCtrl::BMP_HTF_ANCHOR_SW) + ChangeTool(BVD_NONE); + break; } *************** *** 972,975 **** --- 1012,1019 ---- case BVD_SELMOVE: break; + case BVD_SIZEALL: + r = wxRect(wxPoint(0,0), m_pBitmapCtrl->ClientToBitmap(event.GetToPos())); + GetDocument()->ResizeBitmap(r.GetSize(), m_Brush); + break; } if(m_pBitmapCtrl->HasCapture()) *************** *** 1086,1089 **** --- 1130,1138 ---- PasteBuffer(); break; + case BVD_SIZEALL: + m_pBitmapCtrl->SetWindowStyle(m_pBitmapCtrl->GetWindowStyle()&(~BMP_SHOW_ANCHOR)); + m_pBitmapCtrl->Refresh(); + SetCursor(*wxSTANDARD_CURSOR); + break; } *************** *** 1107,1110 **** --- 1156,1163 ---- RemoveSelection(); break; + case BVD_SIZEALL: + m_pBitmapCtrl->SetWindowStyle(m_pBitmapCtrl->GetWindowStyle()|BMP_SHOW_ANCHOR); + m_pBitmapCtrl->Refresh(); + break; } } |
|
From: Emilien K. <cur...@us...> - 2005-02-25 14:33:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25401 Modified Files: wxDevCenter.nsi Log Message: Icone "Sizeall" Index: wxDevCenter.nsi =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxDevCenter.nsi 25 Feb 2005 10:45:14 -0000 1.4 --- wxDevCenter.nsi 25 Feb 2005 14:32:46 -0000 1.5 *************** *** 141,144 **** --- 141,145 ---- File "..\StdPlugin\data\img\bmp\selpaste.png" File "..\StdPlugin\data\img\bmp\selremove.png" + File "..\StdPlugin\data\img\bmp\sizeall.png" File "..\StdPlugin\data\img\bmp\SHORT_DASH.PNG" File "..\StdPlugin\data\img\bmp\SOLID.PNG" *************** *** 276,279 **** --- 277,281 ---- Delete "$INSTDIR\data\img\bmp\selpaste.png" Delete "$INSTDIR\data\img\bmp\selremove.png" + Delete "$INSTDIR\data\img\bmp\sizeall.png" Delete "$INSTDIR\data\img\bmp\SHORT_DASH.PNG" Delete "$INSTDIR\data\img\bmp\SOLID.PNG" |
|
From: Emilien K. <cur...@us...> - 2005-02-25 14:31:24
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25036 Modified Files: StdPlugin.bkl Log Message: Icone "sizeall" Index: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/StdPlugin.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StdPlugin.bkl 23 Feb 2005 09:17:18 -0000 1.2 --- StdPlugin.bkl 25 Feb 2005 14:31:15 -0000 1.3 *************** *** 77,80 **** --- 77,81 ---- img/bmp/selpaste.png img/bmp/selremove.png + img/bmp/sizeall.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG |
|
From: Emilien K. <cur...@us...> - 2005-02-25 11:03:03
|
Update of /cvsroot/wxdevcenter/StdPlugin/data/img/bmp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1874/data/img/bmp Added Files: sizeall.png Log Message: Icone "sizeall" --- NEW FILE: sizeall.png --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-02-25 10:45:28
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30623 Modified Files: wxDevCenter.nsi Log Message: Ajout des fichiers de confs et des dll wx254. Index: wxDevCenter.nsi =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.nsi,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxDevCenter.nsi 11 Feb 2005 21:11:55 -0000 1.3 --- wxDevCenter.nsi 25 Feb 2005 10:45:14 -0000 1.4 *************** *** 3,7 **** ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.1.2 (beta)" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" --- 3,7 ---- ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.1.3 (beta)" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" *************** *** 63,74 **** SetOverwrite ifnewer File "bin\wxDevCenter.exe" ! File "bin\wxbase253_xml_vc_.dll" ! File "bin\wxbase253_vc_.dll" ! File "bin\wxbase253_net_vc_.dll" ! File "bin\wxmsw253_xrc_vc_.dll" ! File "bin\wxmsw253_stc_vc_.dll" ! File "bin\wxmsw253_html_vc_.dll" ! File "bin\wxmsw253_core_vc_.dll" ! File "bin\wxmsw253_adv_vc_.dll" File "bin\msvcr70.dll" SetOutPath "$INSTDIR\lib" --- 63,75 ---- SetOverwrite ifnewer File "bin\wxDevCenter.exe" ! File "bin\wxbase254_xml_vc_.dll" ! File "bin\wxbase254_vc_.dll" ! File "bin\wxbase254_net_vc_.dll" ! File "bin\wxmsw254_xrc_vc_.dll" ! File "bin\wxmsw254_stc_vc_.dll" ! File "bin\wxmsw254_fl_vc_.dll" ! File "bin\wxmsw254_html_vc_.dll" ! File "bin\wxmsw254_core_vc_.dll" ! File "bin\wxmsw254_adv_vc_.dll" File "bin\msvcr70.dll" SetOutPath "$INSTDIR\lib" *************** *** 144,147 **** --- 145,217 ---- File "..\StdPlugin\data\img\bmp\spray.png" File "..\StdPlugin\data\img\bmp\TRANSPARENT.PNG" + SetOutPath "$INSTDIR\conf" + SetOverwrite ifnewer + File "..\StdPlugin\conf\Text.conf" + SetOutPath "$INSTDIR\conf\Text" + SetOverwrite ifnewer + File "..\StdPlugin\conf\Text\.conf" + File "..\StdPlugin\conf\Text\ADA.conf" + File "..\StdPlugin\conf\Text\APDL.conf" + File "..\StdPlugin\conf\Text\ASM.conf" + File "..\StdPlugin\conf\Text\ASP.conf" + File "..\StdPlugin\conf\Text\AU3.conf" + File "..\StdPlugin\conf\Text\AVE.conf" + File "..\StdPlugin\conf\Text\BAAM.conf" + File "..\StdPlugin\conf\Text\BASH.conf" + File "..\StdPlugin\conf\Text\Batch.conf" + File "..\StdPlugin\conf\Text\Bullant.conf" + File "..\StdPlugin\conf\Text\CLW no case.conf" + File "..\StdPlugin\conf\Text\CLW.conf" + File "..\StdPlugin\conf\Text\Config.conf" + File "..\StdPlugin\conf\Text\CPP no case.conf" + File "..\StdPlugin\conf\Text\CPP.conf" + File "..\StdPlugin\conf\Text\CSS.conf" + File "..\StdPlugin\conf\Text\Diff.conf" + File "..\StdPlugin\conf\Text\Eiffel.conf" + File "..\StdPlugin\conf\Text\EiffelKW.conf" + File "..\StdPlugin\conf\Text\ERLANG.conf" + File "..\StdPlugin\conf\Text\Error list.conf" + File "..\StdPlugin\conf\Text\ESCRIPT.conf" + File "..\StdPlugin\conf\Text\F77.conf" + File "..\StdPlugin\conf\Text\FORTH.conf" + File "..\StdPlugin\conf\Text\Fortran.conf" + File "..\StdPlugin\conf\Text\GUI2CLI.conf" + File "..\StdPlugin\conf\Text\HTML.conf" + File "..\StdPlugin\conf\Text\KIX.conf" + File "..\StdPlugin\conf\Text\LaTeX.conf" + File "..\StdPlugin\conf\Text\Lisp.conf" + File "..\StdPlugin\conf\Text\LOT.conf" + File "..\StdPlugin\conf\Text\LOUT.conf" + File "..\StdPlugin\conf\Text\LUA.conf" + File "..\StdPlugin\conf\Text\Makefile.conf" + File "..\StdPlugin\conf\Text\MATLab.conf" + File "..\StdPlugin\conf\Text\METAPOST.conf" + File "..\StdPlugin\conf\Text\MMIXAL.conf" + File "..\StdPlugin\conf\Text\MS-SQL.conf" + File "..\StdPlugin\conf\Text\NN Cron Table.conf" + File "..\StdPlugin\conf\Text\NSIS.conf" + File "..\StdPlugin\conf\Text\Octave.conf" + File "..\StdPlugin\conf\Text\Pascal.conf" + File "..\StdPlugin\conf\Text\Perl.conf" + File "..\StdPlugin\conf\Text\PHP.conf" + File "..\StdPlugin\conf\Text\POV.conf" + File "..\StdPlugin\conf\Text\Power Basic.conf" + File "..\StdPlugin\conf\Text\Properties.conf" + File "..\StdPlugin\conf\Text\PS.conf" + File "..\StdPlugin\conf\Text\Python.conf" + File "..\StdPlugin\conf\Text\Ruby.conf" + File "..\StdPlugin\conf\Text\Scriptol.conf" + File "..\StdPlugin\conf\Text\SPECMAN.conf" + File "..\StdPlugin\conf\Text\SQL.conf" + File "..\StdPlugin\conf\Text\TCL.conf" + File "..\StdPlugin\conf\Text\TeX.conf" + File "..\StdPlugin\conf\Text\Text.conf" + File "..\StdPlugin\conf\Text\Verilog.conf" + File "..\StdPlugin\conf\Text\Visual Basic Script.conf" + File "..\StdPlugin\conf\Text\Visual Basic.conf" + File "..\StdPlugin\conf\Text\XCode.conf" + File "..\StdPlugin\conf\Text\XML.conf" + File "..\StdPlugin\conf\Text\YAML.conf" + ; Shortcuts !insertmacro MUI_STARTMENU_WRITE_BEGIN Application *************** *** 241,248 **** --- 311,384 ---- Delete "$INSTDIR\plugins\StdPlugin.dll" + Delete "$INSTDIR\conf\Text.conf" + Delete "$INSTDIR\conf\Text\.conf" + Delete "$INSTDIR\conf\Text\ADA.conf" + Delete "$INSTDIR\conf\Text\APDL.conf" + Delete "$INSTDIR\conf\Text\ASM.conf" + Delete "$INSTDIR\conf\Text\ASP.conf" + Delete "$INSTDIR\conf\Text\AU3.conf" + Delete "$INSTDIR\conf\Text\AVE.conf" + Delete "$INSTDIR\conf\Text\BAAM.conf" + Delete "$INSTDIR\conf\Text\BASH.conf" + Delete "$INSTDIR\conf\Text\Batch.conf" + Delete "$INSTDIR\conf\Text\Bullant.conf" + Delete "$INSTDIR\conf\Text\CLW no case.conf" + Delete "$INSTDIR\conf\Text\CLW.conf" + Delete "$INSTDIR\conf\Text\Config.conf" + Delete "$INSTDIR\conf\Text\CPP no case.conf" + Delete "$INSTDIR\conf\Text\CPP.conf" + Delete "$INSTDIR\conf\Text\CSS.conf" + Delete "$INSTDIR\conf\Text\Diff.conf" + Delete "$INSTDIR\conf\Text\Eiffel.conf" + Delete "$INSTDIR\conf\Text\EiffelKW.conf" + Delete "$INSTDIR\conf\Text\ERLANG.conf" + Delete "$INSTDIR\conf\Text\Error list.conf" + Delete "$INSTDIR\conf\Text\ESCRIPT.conf" + Delete "$INSTDIR\conf\Text\F77.conf" + Delete "$INSTDIR\conf\Text\FORTH.conf" + Delete "$INSTDIR\conf\Text\Fortran.conf" + Delete "$INSTDIR\conf\Text\GUI2CLI.conf" + Delete "$INSTDIR\conf\Text\HTML.conf" + Delete "$INSTDIR\conf\Text\KIX.conf" + Delete "$INSTDIR\conf\Text\LaTeX.conf" + Delete "$INSTDIR\conf\Text\Lisp.conf" + Delete "$INSTDIR\conf\Text\LOT.conf" + Delete "$INSTDIR\conf\Text\LOUT.conf" + Delete "$INSTDIR\conf\Text\LUA.conf" + Delete "$INSTDIR\conf\Text\Makefile.conf" + Delete "$INSTDIR\conf\Text\MATLab.conf" + Delete "$INSTDIR\conf\Text\METAPOST.conf" + Delete "$INSTDIR\conf\Text\MMIXAL.conf" + Delete "$INSTDIR\conf\Text\MS-SQL.conf" + Delete "$INSTDIR\conf\Text\NN Cron Table.conf" + Delete "$INSTDIR\conf\Text\NSIS.conf" + Delete "$INSTDIR\conf\Text\Octave.conf" + Delete "$INSTDIR\conf\Text\Pascal.conf" + Delete "$INSTDIR\conf\Text\Perl.conf" + Delete "$INSTDIR\conf\Text\PHP.conf" + Delete "$INSTDIR\conf\Text\POV.conf" + Delete "$INSTDIR\conf\Text\Power Basic.conf" + Delete "$INSTDIR\conf\Text\Properties.conf" + Delete "$INSTDIR\conf\Text\PS.conf" + Delete "$INSTDIR\conf\Text\Python.conf" + Delete "$INSTDIR\conf\Text\Ruby.conf" + Delete "$INSTDIR\conf\Text\Scriptol.conf" + Delete "$INSTDIR\conf\Text\SPECMAN.conf" + Delete "$INSTDIR\conf\Text\SQL.conf" + Delete "$INSTDIR\conf\Text\TCL.conf" + Delete "$INSTDIR\conf\Text\TeX.conf" + Delete "$INSTDIR\conf\Text\Text.conf" + Delete "$INSTDIR\conf\Text\Verilog.conf" + Delete "$INSTDIR\conf\Text\Visual Basic Script.conf" + Delete "$INSTDIR\conf\Text\Visual Basic.conf" + Delete "$INSTDIR\conf\Text\XCode.conf" + Delete "$INSTDIR\conf\Text\XML.conf" + Delete "$INSTDIR\conf\Text\YAML.conf" + Delete "$INSTDIR\wxmsw253_adv_vc_.dll" Delete "$INSTDIR\wxmsw253_core_vc_.dll" Delete "$INSTDIR\wxmsw253_html_vc_.dll" Delete "$INSTDIR\wxmsw253_stc_vc_.dll" + Delete "$INSTDIR\wxmsw253_fl_vc_.dll" Delete "$INSTDIR\wxmsw253_xrc_vc_.dll" Delete "$INSTDIR\wxbase253_net_vc_.dll" *************** *** 265,268 **** --- 401,405 ---- RMDir "$INSTDIR\data\icons" RMDir "$INSTDIR\data" + RMDir "$INSTDIR\data\conf" RMDir "$INSTDIR" |
|
From: Emilien K. <cur...@us...> - 2005-02-25 10:44:10
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30370/include/wxDevCenter/StdPlugin Modified Files: BitmapCtrl.h Log Message: Ajout des ancres de dimension Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BitmapCtrl.h 24 Feb 2005 17:26:48 -0000 1.7 --- BitmapCtrl.h 25 Feb 2005 10:43:41 -0000 1.8 *************** *** 34,37 **** --- 34,39 ---- #include <wxDevCenter/StdPlugin/extmouse.h> + /** Style à appliquer aux BitmapCtrl pour afficher les ancres de dimensionnement.*/ + #define BMP_SHOW_ANCHOR 0x100 /** Controle d'affichage de bitmap. *************** *** 67,71 **** public: ! /** Constructeur standard des controles.*/ BitmapCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); /** Destructeur.*/ --- 69,75 ---- public: ! /** Constructeur standard des controles. ! * ! */ BitmapCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); /** Destructeur.*/ *************** *** 137,140 **** --- 141,165 ---- wxRect BitmapToClient(wxRect r)const{return wxRect(BitmapToClient(r.GetPosition()), BitmapToClient(r.GetSize()));} + /** Flags de test de position.*/ + enum HitTestFlag + { + BMP_HTF_NONE = 0x0, + BMP_HTF_BITMAP = 0x1, + BMP_HTF_ANCHOR_NW = 0x10, + BMP_HTF_ANCHOR_N = 0x20, + BMP_HTF_ANCHOR_NE = 0x40, + BMP_HTF_ANCHOR_SW = 0x80, + BMP_HTF_ANCHOR_S = 0x100, + BMP_HTF_ANCHOR_SE = 0x200, + BMP_HTF_ANCHOR_E = 0x400, + BMP_HTF_ANCHOR_W = 0x800 + }; + + /** Teste une position sur la zone client. + * Les ancres ne sont testés que si elles sont affichées. + * @param pos Position en coordonnées clientes + * @return Flag indicant sur quoi la position pointe. + */ + HitTestFlag HitTest(wxPoint pos)const; protected: /** Retourne le coefficient de scalling (wxDC) depuis le zoom m_iZoom.*/ |
|
From: Emilien K. <cur...@us...> - 2005-02-25 10:44:10
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30370/src Modified Files: BitmapCtrl.cpp Log Message: Ajout des ancres de dimension Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** BitmapCtrl.cpp 24 Feb 2005 17:26:48 -0000 1.12 --- BitmapCtrl.cpp 25 Feb 2005 10:43:41 -0000 1.13 *************** *** 30,33 **** --- 30,34 ---- #include <wx/dcbuffer.h> + #define BMP_ANCHOR_INFLATE_WIDTH 3 BEGIN_EVENT_TABLE(BitmapCtrl, wxControl) *************** *** 91,94 **** --- 92,136 ---- RegIter++; } + + if((GetWindowStyleFlag()&BMP_SHOW_ANCHOR)!=0) + { + wxRect r; + dc.SetPen(*wxBLACK_PEN); + dc.SetBrush(*wxGREY_BRUSH); + // Bottom-left + r = wxRect(rb.GetLeft(), rb.GetBottom(), 1,1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + // Middle-left + r = wxRect(rb.GetLeft(), rb.GetTop() + rb.GetHeight()/2, 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + // Top-left + r = wxRect(rb.GetLeft(), rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + + // Bottom-right + r = wxRect(rb.GetRight(), rb.GetBottom(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + // Middle-right + r = wxRect(rb.GetRight(), rb.GetTop() + rb.GetHeight()/2, 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + // Top-right + r = wxRect(rb.GetRight(), rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + + // Top-Middle + r = wxRect(rb.GetLeft() + rb.GetWidth()/2, rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + // Bottom-Middle + r = wxRect(rb.GetLeft() + rb.GetWidth()/2, rb.GetBottom(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + dc.DrawRectangle(r); + } dc.EndDrawing(); } *************** *** 244,247 **** --- 286,346 ---- } + // Teste une position sur la zone client. + BitmapCtrl::HitTestFlag BitmapCtrl::HitTest(wxPoint pos)const + { + pos = ClientToBitmap(pos); + + wxRect rb(0, 0, m_Bmp.GetWidth(), m_Bmp.GetHeight()); + wxRect r; + + if((GetWindowStyleFlag()&BMP_SHOW_ANCHOR)!=0) + { + // Bottom-left + r = wxRect(rb.GetLeft(), rb.GetBottom(), 1,1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_SE; + // Middle-left + r = wxRect(rb.GetLeft(), rb.GetTop() + rb.GetHeight()/2, 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_E; + // Top-left + r = wxRect(rb.GetLeft(), rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_NE; + // Bottom-right + r = wxRect(rb.GetRight(), rb.GetBottom(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_SW; + // Middle-right + r = wxRect(rb.GetRight(), rb.GetTop() + rb.GetHeight()/2, 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_W; + // Top-right + r = wxRect(rb.GetRight(), rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_NW; + // Top-Middle + r = wxRect(rb.GetLeft() + rb.GetWidth()/2, rb.GetTop(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_N; + // Bottom-Middle + r = wxRect(rb.GetLeft() + rb.GetWidth()/2, rb.GetBottom(), 1, 1); + r.Inflate(BMP_ANCHOR_INFLATE_WIDTH); + if(r.Inside(pos)) + return BMP_HTF_ANCHOR_S; + } + if(rb.Inside(pos)) + return BMP_HTF_BITMAP; + else + return BMP_HTF_NONE; + } + // Interception des évènements de la souris. |
|
From: Emilien K. <cur...@us...> - 2005-02-24 17:27:20
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/include/wxDevCenter/StdPlugin Modified Files: BitmapCtrl.h Log Message: Dessine un cadre autour de la bitmap dans le BitmapCtrl si la zone cliente est plus grande que la bitmap. Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BitmapCtrl.h 8 Jan 2005 17:49:13 -0000 1.6 --- BitmapCtrl.h 24 Feb 2005 17:26:48 -0000 1.7 *************** *** 66,73 **** wxPoint m_ptOrigin; - /** Position à retenir de la souris. - * Utilisée pour un glissement. - */ - wxPoint m_ptMouse; public: /** Constructeur standard des controles.*/ --- 66,69 ---- *************** *** 84,94 **** void SetBitmap(const wxBitmap& Bmp); - - /** Dessine l'image dans le contexte de périphérique spécifié. - * Dessine l'image correctement scrollée et zoomée. - * @param pDC Contexte de périphérique sur lequel déssiner. - */ - virtual void OnDraw(wxDC* pDC); - /** Fixe le niveau de zoom. * @param iZoom Nouveau niveau de zoom. --- 80,83 ---- *************** *** 137,140 **** --- 126,132 ---- */ wxPoint ClientToBitmap(wxPoint ptClient)const; + wxSize ClientToBitmap(wxSize szClient)const{register wxPoint pt(ClientToBitmap(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} + wxRect ClientToBitmap(wxRect r)const{return wxRect(ClientToBitmap(r.GetPosition()), ClientToBitmap(r.GetSize()));} + /** Calcul les coordonnées dans la zone cliente à partir des coordonnées bitmap. * @param ptBitmap Point en coordonnées bitmap. *************** *** 142,145 **** --- 134,139 ---- */ wxPoint BitmapToClient(wxPoint ptBitmap)const; + wxSize BitmapToClient(wxSize szClient)const{register wxPoint pt(BitmapToClient(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} + wxRect BitmapToClient(wxRect r)const{return wxRect(BitmapToClient(r.GetPosition()), BitmapToClient(r.GetSize()));} protected: |
|
From: Emilien K. <cur...@us...> - 2005-02-24 17:27:15
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23362/src Modified Files: BitmapCtrl.cpp Log Message: Dessine un cadre autour de la bitmap dans le BitmapCtrl si la zone cliente est plus grande que la bitmap. Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** BitmapCtrl.cpp 23 Feb 2005 09:16:46 -0000 1.11 --- BitmapCtrl.cpp 24 Feb 2005 17:26:48 -0000 1.12 *************** *** 47,52 **** m_iZoom(0), m_bExtraScroll(false), ! m_ptOrigin(0,0), ! m_ptMouse(-1, -1) { SetScrollPos(wxHORIZONTAL, 0); --- 47,51 ---- m_iZoom(0), m_bExtraScroll(false), ! m_ptOrigin(0,0) { SetScrollPos(wxHORIZONTAL, 0); *************** *** 67,99 **** } - // Interception de l'évènement peinture de la zone cliente. void BitmapCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxPaintDC dc(this); - double dScale = ZoomToScale(); - wxBrush br(GetBackgroundColour()); - dc.SetBackground(br); - dc.BeginDrawing(); ! dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin(-GetScrollPos(wxHORIZONTAL)*dScale, -GetScrollPos(wxVERTICAL)*dScale); ! OnDraw(&dc); dc.EndDrawing(); } - // Dessine l'image dans le contexte de périphérique spécifié. - void BitmapCtrl::OnDraw(wxDC* pDC) - { - - pDC->DrawBitmap(m_Bmp, 0, 0); - - } - - // Interception de l'évènement d'effacement du fond de la zone cliente. void BitmapCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) --- 66,97 ---- } // Interception de l'évènement peinture de la zone cliente. void BitmapCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { double dScale = ZoomToScale(); wxBrush br(GetBackgroundColour()); ! wxPaintDC dc(this); ! dc.SetBrush(br); ! dc.SetPen(*wxTRANSPARENT_PEN); ! dc.BeginDrawing(); ! dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin((m_ptOrigin.x-GetScrollPos(wxHORIZONTAL))*dScale, (m_ptOrigin.y-GetScrollPos(wxVERTICAL))*dScale); ! dc.DrawBitmap(m_Bmp, 0, 0); + wxRect rb(0, 0, m_Bmp.GetWidth(), m_Bmp.GetHeight()); + wxRegion region(ClientToBitmap(wxRect(0, 0, GetClientSize().x, GetClientSize().y))); + region.Subtract(rb); + wxRegionIterator RegIter(region); + while(RegIter) + { + wxRect r = RegIter.GetRect(); + dc.DrawRectangle(r); + RegIter++; + } dc.EndDrawing(); } // Interception de l'évènement d'effacement du fond de la zone cliente. void BitmapCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) |
|
From: Emilien K. <cur...@us...> - 2005-02-24 09:43:21
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26920 Modified Files: wxDevCenter.bkl Log Message: Using of fl :) Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxDevCenter.bkl 16 Feb 2005 23:12:40 -0000 1.4 --- wxDevCenter.bkl 24 Feb 2005 09:43:12 -0000 1.5 *************** *** 58,62 **** <precomp-headers-header>wxDevCenter.h</precomp-headers-header> <sys-lib>$(wxlib_net)</sys-lib> ! <sys-lib>$(wxlib_stc)</sys-lib> <install-to>$(BINDIR)</install-to> --- 58,62 ---- <precomp-headers-header>wxDevCenter.h</precomp-headers-header> <sys-lib>$(wxlib_net)</sys-lib> ! <sys-lib>$(wxlib_fl)</sys-lib> <install-to>$(BINDIR)</install-to> |
