[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.26,1.27

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	BitmapDocView.cpp 
Log Message:
Unify icons and bitmap location.

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** BitmapDocView.cpp	17 Aug 2005 16:34:55 -0000	1.26
--- BitmapDocView.cpp	23 Aug 2005 15:44:30 -0000	1.27
***************
*** 15,18 ****
--- 15,19 ----
  #include <wx/toolbar.h>
  #include <wx/clipbrd.h>
+ #include <wx/artprov.h>
  
  
***************
*** 873,879 ****
  void BitmapDocument::OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
  {
!     wxTheClipboard->Open();
!     event.Enable(wxTheClipboard->IsSupported( wxDF_BITMAP ));
!     wxTheClipboard->Close();
  }
  
--- 874,887 ----
  void BitmapDocument::OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
  {
! 	if(!wxTheClipboard->IsOpened())
! 	{
! 	    if(wxTheClipboard->Open())
! 	    {
! 		    event.Enable(wxTheClipboard->IsSupported( wxDF_BITMAP ));
! 		    wxTheClipboard->Close();
! 		    return;
! 	    }
! 	}
! 	event.Enable(false);    
  }
  
***************
*** 1009,1046 ****
  
      wxBitmap bmp;
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/handdraw.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_HANDDRAW, WXDC_BITMAP_TOOL_HANDDRAW, bmp, WXDC_BITMAP_TOOLHELP_HANDDRAW, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/spray.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_SPRAY, WXDC_BITMAP_TOOL_SPRAY, bmp, WXDC_BITMAP_TOOLHELP_SPRAY, wxITEM_CHECK);
      
      pTB->AddSeparator();
  
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/line.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_LINE, WXDC_BITMAP_TOOL_LINE, bmp, WXDC_BITMAP_TOOLHELP_LINE, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/rect.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_RECT, WXDC_BITMAP_TOOL_RECT, bmp, WXDC_BITMAP_TOOLHELP_RECT, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/ellipse.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_ELLIPSE, WXDC_BITMAP_TOOL_ELLIPSE, bmp, WXDC_BITMAP_TOOLHELP_ELLIPSE, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/rrect.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_RRECT, WXDC_BITMAP_TOOL_RRECT, bmp, WXDC_BITMAP_TOOLHELP_RRECT, wxITEM_CHECK);
  
!     bmp = Application::GetApp().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();
  
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selection.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_SELECTION, WXDC_BITMAP_TOOL_SELECTION, bmp, WXDC_BITMAP_TOOLHELP_SELECTION, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selall.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_SELALL, WXDC_BITMAP_TOOL_SELALL, bmp, WXDC_BITMAP_TOOLHELP_SELALL, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selmove.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_SELMOVE, WXDC_BITMAP_TOOL_SELMOVE, bmp, WXDC_BITMAP_TOOL_SELMOVE, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selremove.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_TOOL_SELREMOVE, WXDC_BITMAP_TOOL_SELREMOVE, bmp, WXDC_BITMAP_TOOLHELP_SELREMOVE, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selcut.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_CUT, WXDC_BITMAP_TOOL_SELCUT, bmp, WXDC_BITMAP_TOOLHELP_SELCUT, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selcopy.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_COPY, WXDC_BITMAP_TOOL_SELCOPY, bmp, WXDC_BITMAP_TOOLHELP_SELCOPY, wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap(wxT("bmp/selpaste.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_PASTE, WXDC_BITMAP_TOOL_SELPASTE, bmp, WXDC_BITMAP_TOOLHELP_SELPASTE, wxITEM_CHECK);
  
--- 1017,1054 ----
  
      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);
  
***************
*** 1140,1155 ****
      pTB->SetToolBitmapSize(wxSize(96, 15));
      wxBitmap bmp;
!     bmp = Application::GetApp().LoadAppBitmap("bmp/SOLID.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_SOLID, "Solid", bmp, "Solid pen", wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap("bmp/TRANSPARENT.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_TRANSPARENT, "Transparent", bmp, "Transparent pen", wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap("bmp/DOT.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_DOT, "Dot", bmp, "Dot pen", wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap("bmp/LONG_DASH.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_LONG_DASH, "Long dash", bmp, "Long dash pen", wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap("bmp/SHORT_DASH.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_SHORT_DASH, "Short dash", bmp, "Short dash pen", wxITEM_CHECK);
!     bmp = Application::GetApp().LoadAppBitmap("bmp/DOT_DASH.PNG", wxBITMAP_TYPE_PNG);
!     pTB->AddTool(ID_PEN_DOT_DASH, "Dot...dash", bmp, "Dot...dash pen", wxITEM_CHECK);
      pTB->Realize();
      pGlobalSizer->Add(pTB, 1, wxGROW);
--- 1148,1163 ----
      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();
      pGlobalSizer->Add(pTB, 1, wxGROW);