[Wxdevcenter-cvs] StdPlugin/src/Bitmap BitmapDocView.cpp,1.2,1.3 BitmapProp.cpp,1.1,1.2

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

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

Modified Files:
	BitmapDocView.cpp BitmapProp.cpp 
Log Message:
Override wxArtProvider::GetBitmap/GetIcon to return a valid icon whatever the wxArtProvider found.

Index: BitmapProp.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Bitmap/BitmapProp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BitmapProp.cpp	25 Aug 2005 20:36:08 -0000	1.1
--- BitmapProp.cpp	14 Sep 2005 20:01:43 -0000	1.2
***************
*** 8,14 ****
  #include <wxDevCenter/StdPlugin.h>
  #include <wxDevCenter/StdPlugin/Bitmap/BitmapProp.h>
  
  #include <wx/bmpbuttn.h>
- #include <wx/artprov.h>
  #include <wx/confbase.h>
  
--- 8,14 ----
  #include <wxDevCenter/StdPlugin.h>
  #include <wxDevCenter/StdPlugin/Bitmap/BitmapProp.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/bmpbuttn.h>
  #include <wx/confbase.h>
  
***************
*** 172,177 ****
  	m_pResUnitChoice  = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL);
  
! 	wxBitmapButton *pBmp1 = new wxBitmapButton(this, ID_LANDSCAPE, wxArtProvider::GetIcon(wxT("StdPlugin.Bitmap/landscape"),  wxART_BUTTON, wxSize(16, 16))),
! 				   *pBmp2 = new wxBitmapButton(this, ID_PORTRAIT, wxArtProvider::GetIcon(wxT("StdPlugin.Bitmap/portrait"),  wxART_BUTTON, wxSize(16, 16)));
  
  	// Mise en page
--- 172,177 ----
  	m_pResUnitChoice  = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL);
  
! 	wxBitmapButton *pBmp1 = new wxBitmapButton(this, ID_LANDSCAPE, ArtProvider::GetIcon(wxT("StdPlugin.Bitmap/landscape"),  wxART_BUTTON, wxSize(16, 16))),
! 				   *pBmp2 = new wxBitmapButton(this, ID_PORTRAIT, ArtProvider::GetIcon(wxT("StdPlugin.Bitmap/portrait"),  wxART_BUTTON, wxSize(16, 16)));
  
  	// Mise en page

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Bitmap/BitmapDocView.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BitmapDocView.cpp	14 Sep 2005 15:36:25 -0000	1.2
--- BitmapDocView.cpp	14 Sep 2005 20:01:43 -0000	1.3
***************
*** 11,19 ****
  #include <wxDevCenter/FileSystem.h>
  #include <wxDevCenter/DocView.h>
  
  #include <wx/dcmemory.h>
  #include <wx/toolbar.h>
  #include <wx/clipbrd.h>
- #include <wx/artprov.h>
  
  
--- 11,19 ----
  #include <wxDevCenter/FileSystem.h>
  #include <wxDevCenter/DocView.h>
+ #include <wxDevCenter/ArtProvider.h>
  
  #include <wx/dcmemory.h>
  #include <wx/toolbar.h>
  #include <wx/clipbrd.h>
  
  
***************
*** 1058,1095 ****
  
      wxBitmap bmp;
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/handdraw"));
      pTB->AddTool(ID_TOOL_HANDDRAW, WXDC_BITMAP_TOOL_HANDDRAW, bmp, WXDC_BITMAP_TOOLHELP_HANDDRAW, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/spray"));
      pTB->AddTool(ID_TOOL_SPRAY, WXDC_BITMAP_TOOL_SPRAY, bmp, WXDC_BITMAP_TOOLHELP_SPRAY, wxITEM_CHECK);
      
      pTB->AddSeparator();
  
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/line"));
      pTB->AddTool(ID_TOOL_LINE, WXDC_BITMAP_TOOL_LINE, bmp, WXDC_BITMAP_TOOLHELP_LINE, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/rect"));
      pTB->AddTool(ID_TOOL_RECT, WXDC_BITMAP_TOOL_RECT, bmp, WXDC_BITMAP_TOOLHELP_RECT, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/ellipse"));
      pTB->AddTool(ID_TOOL_ELLIPSE, WXDC_BITMAP_TOOL_ELLIPSE, bmp, WXDC_BITMAP_TOOLHELP_ELLIPSE, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/rrect"));
      pTB->AddTool(ID_TOOL_RRECT, WXDC_BITMAP_TOOL_RRECT, bmp, WXDC_BITMAP_TOOLHELP_RRECT, wxITEM_CHECK);
  
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/sizeall"));
      pTB->AddTool(ID_TOOL_SIZEALL, WXDC_BITMAP_TOOL_SIZEALL, bmp, WXDC_BITMAP_TOOLHELP_SIZEALL, wxITEM_CHECK);
  
      pTB->AddSeparator();
  
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selection"));
      pTB->AddTool(ID_TOOL_SELECTION, WXDC_BITMAP_TOOL_SELECTION, bmp, WXDC_BITMAP_TOOLHELP_SELECTION, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selall"));
      pTB->AddTool(ID_TOOL_SELALL, WXDC_BITMAP_TOOL_SELALL, bmp, WXDC_BITMAP_TOOLHELP_SELALL, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selmove"));
      pTB->AddTool(ID_TOOL_SELMOVE, WXDC_BITMAP_TOOL_SELMOVE, bmp, WXDC_BITMAP_TOOL_SELMOVE, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selremove"));
      pTB->AddTool(ID_TOOL_SELREMOVE, WXDC_BITMAP_TOOL_SELREMOVE, bmp, WXDC_BITMAP_TOOLHELP_SELREMOVE, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selcut"));
      pTB->AddTool(wxID_CUT, WXDC_BITMAP_TOOL_SELCUT, bmp, WXDC_BITMAP_TOOLHELP_SELCUT, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selcopy"));
      pTB->AddTool(wxID_COPY, WXDC_BITMAP_TOOL_SELCOPY, bmp, WXDC_BITMAP_TOOLHELP_SELCOPY, wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selpaste"));
      pTB->AddTool(wxID_PASTE, WXDC_BITMAP_TOOL_SELPASTE, bmp, WXDC_BITMAP_TOOLHELP_SELPASTE, wxITEM_CHECK);
  
--- 1058,1095 ----
  
      wxBitmap bmp;
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/handdraw"));
      pTB->AddTool(ID_TOOL_HANDDRAW, WXDC_BITMAP_TOOL_HANDDRAW, bmp, WXDC_BITMAP_TOOLHELP_HANDDRAW, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/spray"));
      pTB->AddTool(ID_TOOL_SPRAY, WXDC_BITMAP_TOOL_SPRAY, bmp, WXDC_BITMAP_TOOLHELP_SPRAY, wxITEM_CHECK);
      
      pTB->AddSeparator();
  
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/line"));
      pTB->AddTool(ID_TOOL_LINE, WXDC_BITMAP_TOOL_LINE, bmp, WXDC_BITMAP_TOOLHELP_LINE, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/rect"));
      pTB->AddTool(ID_TOOL_RECT, WXDC_BITMAP_TOOL_RECT, bmp, WXDC_BITMAP_TOOLHELP_RECT, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/ellipse"));
      pTB->AddTool(ID_TOOL_ELLIPSE, WXDC_BITMAP_TOOL_ELLIPSE, bmp, WXDC_BITMAP_TOOLHELP_ELLIPSE, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/rrect"));
      pTB->AddTool(ID_TOOL_RRECT, WXDC_BITMAP_TOOL_RRECT, bmp, WXDC_BITMAP_TOOLHELP_RRECT, wxITEM_CHECK);
  
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/sizeall"));
      pTB->AddTool(ID_TOOL_SIZEALL, WXDC_BITMAP_TOOL_SIZEALL, bmp, WXDC_BITMAP_TOOLHELP_SIZEALL, wxITEM_CHECK);
  
      pTB->AddSeparator();
  
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selection"));
      pTB->AddTool(ID_TOOL_SELECTION, WXDC_BITMAP_TOOL_SELECTION, bmp, WXDC_BITMAP_TOOLHELP_SELECTION, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selall"));
      pTB->AddTool(ID_TOOL_SELALL, WXDC_BITMAP_TOOL_SELALL, bmp, WXDC_BITMAP_TOOLHELP_SELALL, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selmove"));
      pTB->AddTool(ID_TOOL_SELMOVE, WXDC_BITMAP_TOOL_SELMOVE, bmp, WXDC_BITMAP_TOOL_SELMOVE, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selremove"));
      pTB->AddTool(ID_TOOL_SELREMOVE, WXDC_BITMAP_TOOL_SELREMOVE, bmp, WXDC_BITMAP_TOOLHELP_SELREMOVE, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selcut"));
      pTB->AddTool(wxID_CUT, WXDC_BITMAP_TOOL_SELCUT, bmp, WXDC_BITMAP_TOOLHELP_SELCUT, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selcopy"));
      pTB->AddTool(wxID_COPY, WXDC_BITMAP_TOOL_SELCOPY, bmp, WXDC_BITMAP_TOOLHELP_SELCOPY, wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/selpaste"));
      pTB->AddTool(wxID_PASTE, WXDC_BITMAP_TOOL_SELPASTE, bmp, WXDC_BITMAP_TOOLHELP_SELPASTE, wxITEM_CHECK);
  
***************
*** 1189,1203 ****
      pTB->SetToolBitmapSize(wxSize(96, 15));
      wxBitmap bmp;
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/solid"));
      pTB->AddTool(ID_PEN_SOLID, wxT("Solid"), bmp, wxT("Solid pen"), wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/transparent"));
      pTB->AddTool(ID_PEN_TRANSPARENT, wxT("Transparent"), bmp, wxT("Transparent pen"), wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/dot"));
      pTB->AddTool(ID_PEN_DOT, wxT("Dot"), bmp, wxT("Dot pen"), wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/long_dash"));
      pTB->AddTool(ID_PEN_LONG_DASH, wxT("Long dash"), bmp, wxT("Long dash pen"), wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/short_dash"));
      pTB->AddTool(ID_PEN_SHORT_DASH, wxT("Short dash"), bmp, wxT("Short dash pen"), wxITEM_CHECK);
!     bmp = wxArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/dot_dash"));
      pTB->AddTool(ID_PEN_DOT_DASH, wxT("Dot...dash"), bmp, wxT("Dot...dash pen"), wxITEM_CHECK);
      pTB->Realize();
--- 1189,1203 ----
      pTB->SetToolBitmapSize(wxSize(96, 15));
      wxBitmap bmp;
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/solid"));
      pTB->AddTool(ID_PEN_SOLID, wxT("Solid"), bmp, wxT("Solid pen"), wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/transparent"));
      pTB->AddTool(ID_PEN_TRANSPARENT, wxT("Transparent"), bmp, wxT("Transparent pen"), wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/dot"));
      pTB->AddTool(ID_PEN_DOT, wxT("Dot"), bmp, wxT("Dot pen"), wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/long_dash"));
      pTB->AddTool(ID_PEN_LONG_DASH, wxT("Long dash"), bmp, wxT("Long dash pen"), wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/short_dash"));
      pTB->AddTool(ID_PEN_SHORT_DASH, wxT("Short dash"), bmp, wxT("Short dash pen"), wxITEM_CHECK);
!     bmp = ArtProvider::GetBitmap(wxT("StdPlugin.Bitmap/dot_dash"));
      pTB->AddTool(ID_PEN_DOT_DASH, wxT("Dot...dash"), bmp, wxT("Dot...dash pen"), wxITEM_CHECK);
      pTB->Realize();