[Wxdevcenter-cvs] wxDevCenter/src MainFrame.cpp,1.21,1.22 Application.cpp,1.33,1.34 DocManager.cpp,1.12,1.13 ArtProvider.cpp,1.1,1.2 FileSystemStandard.cpp,1.17,1.18 Command.cpp,1.2,1.3 AboutBox.cpp,1.4,1.5 FileSystemCtrl.cpp,1.11,1.12

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

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

Modified Files:
	MainFrame.cpp Application.cpp DocManager.cpp ArtProvider.cpp 
	FileSystemStandard.cpp Command.cpp AboutBox.cpp 
	FileSystemCtrl.cpp 
Log Message:
Override wxArtProvider::GetBitmap/GetIcon to return a valid icon whatever the wxArtProvider found.

Index: ArtProvider.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/ArtProvider.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArtProvider.cpp	13 Aug 2005 14:07:37 -0000	1.1
--- ArtProvider.cpp	14 Sep 2005 20:01:53 -0000	1.2
***************
*** 55,63 ****
      }
  
!     wxBitmap EmptyBitmap(16, 16, 24);
      wxIcon EmptyIcon;
      EmptyIcon.CopyFromBitmap(EmptyBitmap);
      IB.AddIcon(EmptyIcon);
! 
      for(unsigned int n=0; n<arFiles.GetCount(); n++)
      	IB.AddIcon(arFiles[n], wxBITMAP_TYPE_ANY);
--- 55,63 ----
      }
  
! /*    wxBitmap EmptyBitmap(16, 16, 24);
      wxIcon EmptyIcon;
      EmptyIcon.CopyFromBitmap(EmptyBitmap);
      IB.AddIcon(EmptyIcon);
! */
      for(unsigned int n=0; n<arFiles.GetCount(); n++)
      	IB.AddIcon(arFiles[n], wxBITMAP_TYPE_ANY);
***************
*** 65,66 ****
--- 65,93 ----
      return IB.GetIcon(size);
  }
+ 
+ wxBitmap ArtProvider::GetBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
+ {
+ 	wxBitmap bmp = wxArtProvider::GetBitmap(id, client, size);
+ 	if(bmp.Ok())
+ 	{
+ 		return bmp;
+ 	}
+ 	else
+ 	{
+ 		return wxArtProvider::GetBitmap( wxART_MISSING_IMAGE, client, size);
+ 	}
+ }
+ 
+ wxIcon ArtProvider::GetIcon(const wxArtID& id, const wxArtClient& client, const wxSize& size)
+ {
+ 	wxIcon ico = wxArtProvider::GetIcon(id, client, size);
+ 	if(ico.Ok())
+ 	{
+ 		return ico;
+ 	}
+ 	else
+ 	{
+ 		return wxArtProvider::GetIcon( wxART_MISSING_IMAGE, client, size);
+ 	}
+ }
+ 

Index: AboutBox.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/AboutBox.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AboutBox.cpp	24 Aug 2005 15:57:00 -0000	1.4
--- AboutBox.cpp	14 Sep 2005 20:01:53 -0000	1.5
***************
*** 25,33 ****
  #include <wxDevCenter/AboutBox.h>
  #include <wxDevCenter/Plugin.h>
  
  #include <wx/statbmp.h>
  #include <wx/stattext.h>
  #include <wx/notebook.h>
- #include <wx/artprov.h>
  
  
--- 25,33 ----
  #include <wxDevCenter/AboutBox.h>
  #include <wxDevCenter/Plugin.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/statbmp.h>
  #include <wx/stattext.h>
  #include <wx/notebook.h>
  
  
***************
*** 88,93 ****
  {
  	SetBackgroundColour(*wxWHITE);
! 	m_WXDCLogo = wxArtProvider::GetBitmap(wxT("wxDevCenter"), wxART_OTHER, wxSize(64, 64));
!     m_WXLogo = wxArtProvider::GetBitmap(wxT("wxWidgets"), wxART_OTHER, wxSize(116, 49));
  }
  
--- 88,93 ----
  {
  	SetBackgroundColour(*wxWHITE);
! 	m_WXDCLogo = ArtProvider::GetBitmap(wxT("wxDevCenter"), wxART_OTHER, wxSize(64, 64));
!     m_WXLogo = ArtProvider::GetBitmap(wxT("wxWidgets"), wxART_OTHER, wxSize(116, 49));
  }
  

Index: FileSystemStandard.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FileSystemStandard.cpp	17 Aug 2005 16:33:17 -0000	1.17
--- FileSystemStandard.cpp	14 Sep 2005 20:01:53 -0000	1.18
***************
*** 26,32 ****
  #include <wxDevCenter/FileSystemStandard.h>
  
  #include <wx/utils.h>
  #include <wx/wfstream.h>
- #include <wx/artprov.h>
  
  using namespace wxDevCenter;
--- 26,33 ----
  #include <wxDevCenter/FileSystemStandard.h>
  
+ #include <wxDevCenter/ArtProvider.h>
+ 
  #include <wx/utils.h>
  #include <wx/wfstream.h>
  
  using namespace wxDevCenter;
***************
*** 76,94 ****
      wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount());
  
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(none), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(unknow), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(dir), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(docs), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(computer), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(floppy), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(harddrive), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(cd-dvd), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(ramdisk), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(remote), wxART_FRAME_ICON, wxSize(width, width)));
  
      for(unsigned long l=0; l<Application::GetApp().GetDocManager().GetDocTemplateCount(); l++)
!         pIL->Add(wxArtProvider::GetIcon(Application::GetApp().GetDocManager().GetDocTemplate(l).GetViewTemplate(0).strIcons, wxART_FRAME_ICON, wxSize(width, width)));
  
      return pIL;
--- 77,95 ----
      wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount());
  
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(none), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(unknow), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(dir), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(docs), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(computer), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(floppy), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(harddrive), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(cd-dvd), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(ramdisk), wxART_FRAME_ICON, wxSize(width, width)));
!     pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(remote), wxART_FRAME_ICON, wxSize(width, width)));
  
      for(unsigned long l=0; l<Application::GetApp().GetDocManager().GetDocTemplateCount(); l++)
!         pIL->Add(ArtProvider::GetIcon(Application::GetApp().GetDocManager().GetDocTemplate(l).GetViewTemplate(0).strIcons, wxART_FRAME_ICON, wxSize(width, width)));
  
      return pIL;

Index: FileSystemCtrl.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemCtrl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FileSystemCtrl.cpp	17 Aug 2005 15:01:06 -0000	1.11
--- FileSystemCtrl.cpp	14 Sep 2005 20:01:53 -0000	1.12
***************
*** 26,29 ****
--- 26,30 ----
  
  #include <wxDevCenter/FileSystem.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/toolbar.h>
***************
*** 31,35 ****
  #include <wx/splitter.h>
  #include <wx/tokenzr.h>
- #include <wx/artprov.h>
  
  using namespace wxDevCenter;
--- 32,35 ----
***************
*** 300,304 ****
  {
      FileSystemPanel *pPanel = new FileSystemPanel(m_pBook, -1, pFileSystem);
!     m_pImageList->Add(wxArtProvider::GetBitmap(pFileSystem->GetIconName(),  wxART_OTHER, wxSize(48, 48)));
      m_pBook->AddPage(pPanel, pFileSystem->GetFileSystemName(), true, m_pImageList->GetImageCount()-1);
  }
--- 300,304 ----
  {
      FileSystemPanel *pPanel = new FileSystemPanel(m_pBook, -1, pFileSystem);
!     m_pImageList->Add(ArtProvider::GetBitmap(pFileSystem->GetIconName(),  wxART_OTHER, wxSize(48, 48)));
      m_pBook->AddPage(pPanel, pFileSystem->GetFileSystemName(), true, m_pImageList->GetImageCount()-1);
  }

Index: DocManager.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DocManager.cpp	13 Aug 2005 14:07:37 -0000	1.12
--- DocManager.cpp	14 Sep 2005 20:01:53 -0000	1.13
***************
*** 26,32 ****
  #include <wxDevCenter/MainFrame.h>
  #include <wxDevCenter/MDIFrame.h>
  
  #include <wx/arrimpl.cpp>
- #include <wx/artprov.h>
  
  using namespace wxDevCenter;
--- 26,32 ----
  #include <wxDevCenter/MainFrame.h>
  #include <wxDevCenter/MDIFrame.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/arrimpl.cpp>
  
  using namespace wxDevCenter;
***************
*** 409,413 ****
  
      for(unsigned int n=0; n<GetDocTemplateCount(); n++)
!         pIL->Add(wxArtProvider::GetIcon(GetDocTemplate(n).GetViewTemplate(0).strIcons,  wxART_OTHER, wxSize(iSize, iSize)));
      return pIL;
  }
--- 409,413 ----
  
      for(unsigned int n=0; n<GetDocTemplateCount(); n++)
!         pIL->Add(ArtProvider::GetIcon(GetDocTemplate(n).GetViewTemplate(0).strIcons,  wxART_OTHER, wxSize(iSize, iSize)));
      return pIL;
  }

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MainFrame.cpp	14 Sep 2005 15:40:03 -0000	1.21
--- MainFrame.cpp	14 Sep 2005 20:01:53 -0000	1.22
***************
*** 33,39 ****
  #include <wxDevCenter/Command.h>
  #include <wxDevCenter/Layout.h>
  
- 
- #include <wx/artprov.h>
  #include <wx/dataobj.h>
  #include <wx/dnd.h>
--- 33,38 ----
  #include <wxDevCenter/Command.h>
  #include <wxDevCenter/Layout.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/dataobj.h>
  #include <wx/dnd.h>
***************
*** 114,118 ****
  
      //  Chargement de l'icone de l'application.
!     m_Icon = wxArtProvider::GetIcon(wxART_MAKE_ART_ID(wxDevCenter), wxART_FRAME_ICON, wxSize(16, 16));
      SetIcon(m_Icon);
  
--- 113,117 ----
  
      //  Chargement de l'icone de l'application.
!     m_Icon = ArtProvider::GetIcon(wxART_MAKE_ART_ID(wxDevCenter), wxART_FRAME_ICON, wxSize(16, 16));
      SetIcon(m_Icon);
  
***************
*** 337,344 ****
          wxString strIconName = pNewView->GetViewTemplate()->strIcons;
          wxIconBundle IB;
!         IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(16, 16)));
!         IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(32, 32)));
!         IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(48, 48)));
!         IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(64, 64)));
          SetIcons(IB);
  		wxString strName;        
--- 336,343 ----
          wxString strIconName = pNewView->GetViewTemplate()->strIcons;
          wxIconBundle IB;
!         IB.AddIcon(ArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(16, 16)));
!         IB.AddIcon(ArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(32, 32)));
!         IB.AddIcon(ArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(48, 48)));
!         IB.AddIcon(ArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(64, 64)));
          SetIcons(IB);
  		wxString strName;        

Index: Application.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Application.cpp	14 Sep 2005 14:19:11 -0000	1.33
--- Application.cpp	14 Sep 2005 20:01:53 -0000	1.34
***************
*** 494,503 ****
  	// Groupe "Fichier"
  	pCmdGroup = new CommandGroup(WXDC_MENU_FILES);
! 	pCmdGroup->AppendCommand(IDM_FILE_NEW, WXDC_MENU_FILE_NEW);
!     pCmdGroup->AppendCommand(IDM_FILE_OPEN, WXDC_MENU_FILE_OPEN);
      pCmdGroup->AppendCommand(IDM_FILE_CLOSE, WXDC_MENU_FILE_CLOSE);
      pCmdGroup->AppendCommand(IDM_FILE_CLOSEALL, WXDC_MENU_FILE_CLOSEALL);
!     pCmdGroup->AppendCommand(IDM_FILE_SAVE, WXDC_MENU_FILE_SAVE);
!     pCmdGroup->AppendCommand(IDM_FILE_SAVEAS, WXDC_MENU_FILE_SAVEAS);
  	pCmdGroup->AppendSeparator();
  	pCmdGroup->AppendCommand(IDM_PROJECT_NEW, WXDC_MENU_PROJECT_NEW);
--- 494,503 ----
  	// Groupe "Fichier"
  	pCmdGroup = new CommandGroup(WXDC_MENU_FILES);
! 	pCmdGroup->AppendCommand(IDM_FILE_NEW, WXDC_MENU_FILE_NEW, wxT(""), wxART_NEW);
!     pCmdGroup->AppendCommand(IDM_FILE_OPEN, WXDC_MENU_FILE_OPEN, wxT(""), wxART_FILE_OPEN);
      pCmdGroup->AppendCommand(IDM_FILE_CLOSE, WXDC_MENU_FILE_CLOSE);
      pCmdGroup->AppendCommand(IDM_FILE_CLOSEALL, WXDC_MENU_FILE_CLOSEALL);
!     pCmdGroup->AppendCommand(IDM_FILE_SAVE, WXDC_MENU_FILE_SAVE, wxT(""), wxART_FILE_SAVE);
!     pCmdGroup->AppendCommand(IDM_FILE_SAVEAS, WXDC_MENU_FILE_SAVEAS, wxT(""), wxART_FILE_SAVE_AS);
  	pCmdGroup->AppendSeparator();
  	pCmdGroup->AppendCommand(IDM_PROJECT_NEW, WXDC_MENU_PROJECT_NEW);
***************
*** 505,513 ****
  	pCmdGroup->AppendCommand(IDM_PROJECT_CLOSE, WXDC_MENU_PROJECT_CLOSE);
  	pCmdGroup->AppendSeparator();
! 	pCmdGroup->AppendCommand(IDM_FILE_PRINT, WXDC_MENU_FILE_PRINT);	
  	pCmdGroup->AppendCommand(IDM_FILE_PRINTSETUP, WXDC_MENU_FILE_PRINTSETUP);
  	pCmdGroup->AppendCommand(IDM_FILE_PRINTPREVIEW, WXDC_MENU_FILE_PRINTPREVIEW);
  	pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(wxID_EXIT, WXDC_MENU_APP_EXIT);
      CommandManager::GetCommandManager().AddCommandManager(pCmdGroup, NULL, CmdGrpType_Application);
  
--- 505,513 ----
  	pCmdGroup->AppendCommand(IDM_PROJECT_CLOSE, WXDC_MENU_PROJECT_CLOSE);
  	pCmdGroup->AppendSeparator();
! 	pCmdGroup->AppendCommand(IDM_FILE_PRINT, WXDC_MENU_FILE_PRINT, wxT(""), wxART_PRINT);	
  	pCmdGroup->AppendCommand(IDM_FILE_PRINTSETUP, WXDC_MENU_FILE_PRINTSETUP);
  	pCmdGroup->AppendCommand(IDM_FILE_PRINTPREVIEW, WXDC_MENU_FILE_PRINTPREVIEW);
  	pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(wxID_EXIT, WXDC_MENU_APP_EXIT, wxT(""), wxART_QUIT);
      CommandManager::GetCommandManager().AddCommandManager(pCmdGroup, NULL, CmdGrpType_Application);
  
***************
*** 521,526 ****
  //    pCmdGroup->AppendCommand(IDM_WINDOW_WORKBAR, WXDC_MENU_WINDOW_WORKBAR, new wxMenu);
      pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(IDM_WINDOW_NEXT, WXDC_MENU_WINDOW_NEXT);
!     pCmdGroup->AppendCommand(IDM_WINDOW_PREV, WXDC_MENU_WINDOW_PREV);
      pCmdGroup->AppendSeparator();
  //    pCmdGroup->AppendCommand(pMenu, WXDC_MENU_WINDOW);
--- 521,526 ----
  //    pCmdGroup->AppendCommand(IDM_WINDOW_WORKBAR, WXDC_MENU_WINDOW_WORKBAR, new wxMenu);
      pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(IDM_WINDOW_NEXT, WXDC_MENU_WINDOW_NEXT, wxT(""), wxART_GO_FORWARD);
!     pCmdGroup->AppendCommand(IDM_WINDOW_PREV, WXDC_MENU_WINDOW_PREV, wxT(""), wxART_GO_BACK);
      pCmdGroup->AppendSeparator();
  //    pCmdGroup->AppendCommand(pMenu, WXDC_MENU_WINDOW);
***************
*** 529,536 ****
      //  Menu Aide
  	pCmdGroup = new CommandGroup(WXDC_MENU_HELP);
!     pCmdGroup->AppendCommand(IDM_HELP_CONTENT, WXDC_MENU_HELP_CONTENT);
!     pCmdGroup->AppendCommand(IDM_HELP_INDEX, WXDC_MENU_HELP_INDEX);
      pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(IDM_HELP_ABOUT, WXDC_MENU_HELP_ABOUT);
  	CommandManager::GetCommandManager().AddCommandManager(pCmdGroup, NULL, CmdGrpType_Help);
  }
--- 529,536 ----
      //  Menu Aide
  	pCmdGroup = new CommandGroup(WXDC_MENU_HELP);
!     pCmdGroup->AppendCommand(IDM_HELP_CONTENT, WXDC_MENU_HELP_CONTENT, wxT(""), wxART_HELP);
!     pCmdGroup->AppendCommand(IDM_HELP_INDEX, WXDC_MENU_HELP_INDEX, wxT(""), wxART_HELP);
      pCmdGroup->AppendSeparator();
!     pCmdGroup->AppendCommand(IDM_HELP_ABOUT, WXDC_MENU_HELP_ABOUT, wxT(""), wxART_HELP);
  	CommandManager::GetCommandManager().AddCommandManager(pCmdGroup, NULL, CmdGrpType_Help);
  }

Index: Command.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Command.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Command.cpp	14 Sep 2005 14:19:11 -0000	1.2
--- Command.cpp	14 Sep 2005 20:01:53 -0000	1.3
***************
*** 26,31 ****
  #include <wxDevCenter/Application.h>
  #include <wxDevCenter/Layout.h>
! 
! #include <wx/artprov.h>
  
  // Utilisation du namespace
--- 26,30 ----
  #include <wxDevCenter/Application.h>
  #include <wxDevCenter/Layout.h>
! #include <wxDevCenter/ArtProvider.h>
  
  // Utilisation du namespace
***************
*** 104,108 ****
  	}
  	if(!GetIconName().IsEmpty())
! 		pMI->SetBitmap(wxArtProvider::GetBitmap(GetIconName()));
  	return pMI;
  }
--- 103,107 ----
  	}
  	if(!GetIconName().IsEmpty())
! 		pMI->SetBitmap(ArtProvider::GetBitmap(GetIconName()));
  	return pMI;
  }