[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.24,1.25 SimpleTextDocView.cpp,1.11,1.12 StdPlugin.cpp,1.5,NONE

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

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

Modified Files:
	BitmapDocView.cpp SimpleTextDocView.cpp 
Removed Files:
	StdPlugin.cpp 
Log Message:
Transition to the new feature/plugin system based on the Element class.

Index: SimpleTextDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SimpleTextDocView.cpp	25 Apr 2005 15:40:14 -0000	1.11
--- SimpleTextDocView.cpp	14 May 2005 12:45:33 -0000	1.12
***************
*** 175,179 ****
      LanguageProperty::LangagePropertyStyle* pCurStyle;
  
!     wxConfigBase& GlobalConfig = wxGetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT];
      GlobalConfig.SetPath(wxT("/"));
  
--- 175,179 ----
      LanguageProperty::LangagePropertyStyle* pCurStyle;
  
!     wxConfigBase& GlobalConfig = Application::GetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT];
      GlobalConfig.SetPath(wxT("/"));
  
***************
*** 185,189 ****
          strRoot.Empty();
          strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName;
!         wxConfigBase& Config = wxGetApp().GetConfig()[strRoot];
  
          Config.SetPath(wxT("/"));
--- 185,189 ----
          strRoot.Empty();
          strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName;
!         wxConfigBase& Config = Application::GetApp().GetConfig()[strRoot];
  
          Config.SetPath(wxT("/"));
***************
*** 226,230 ****
      LanguageProperty::LangagePropertyStyle* pCurStyle;
  
!     wxConfigBase& GlobalConfig = wxGetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT];
      GlobalConfig.SetPath(wxT("/"));
  
--- 226,230 ----
      LanguageProperty::LangagePropertyStyle* pCurStyle;
  
!     wxConfigBase& GlobalConfig = Application::GetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT];
      GlobalConfig.SetPath(wxT("/"));
  
***************
*** 236,240 ****
          strRoot.Empty();
          strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName;
!         wxConfigBase& Config = wxGetApp().GetConfig()[strRoot];
  
          Config.SetPath(wxT("/"));
--- 236,240 ----
          strRoot.Empty();
          strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName;
!         wxConfigBase& Config = Application::GetApp().GetConfig()[strRoot];
  
          Config.SetPath(wxT("/"));
***************
*** 289,298 ****
  void StdPlugin::Text::RefreshPreferences()
  {
!     unsigned int n, nb=wxGetApp().GetDocManager().GetViewCount();
      View *pView;
      SimpleTextView *pTextView;
      for(n=0; n<nb; n++)
      {
!         pView = &(wxGetApp().GetDocManager().GetView(n));
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {
--- 289,298 ----
  void StdPlugin::Text::RefreshPreferences()
  {
!     unsigned int n, nb=Application::GetApp().GetDocManager().GetViewCount();
      View *pView;
      SimpleTextView *pTextView;
      for(n=0; n<nb; n++)
      {
!         pView = &(Application::GetApp().GetDocManager().GetView(n));
          if(pView->IsKindOf(CLASSINFO(SimpleTextView)))
          {

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** BitmapDocView.cpp	25 Apr 2005 15:40:14 -0000	1.24
--- BitmapDocView.cpp	14 May 2005 12:45:32 -0000	1.25
***************
*** 27,30 ****
--- 27,33 ----
  
  
+ /** Définition du patron de workbar des couleurs des bitmaps.*/
+ wxDevCenter::WorkBarType BitmapWorkBarTemplate(CLASSINFO(BitmapWorkBar), wxT("Bitmap colors"), wxT("Bitmap color manipulations"));
+ 
  
  /** Fonction de tracé de ligne dans une bitmap.*/
***************
*** 1004,1041 ****
  
      wxBitmap bmp;
!     bmp = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = 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();
  
!     bmp = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = wxGetApp().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 = wxGetApp().LoadAppBitmap(wxT("bmp/selcut.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_CUT, WXDC_BITMAP_TOOL_SELCUT, bmp, WXDC_BITMAP_TOOLHELP_SELCUT, wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap(wxT("bmp/selcopy.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_COPY, WXDC_BITMAP_TOOL_SELCOPY, bmp, WXDC_BITMAP_TOOLHELP_SELCOPY, wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap(wxT("bmp/selpaste.png"), wxBITMAP_TYPE_PNG);
      pTB->AddTool(wxID_PASTE, WXDC_BITMAP_TOOL_SELPASTE, bmp, WXDC_BITMAP_TOOLHELP_SELPASTE, wxITEM_CHECK);
  
--- 1007,1044 ----
  
      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);
  
***************
*** 1135,1149 ****
      pTB->SetToolBitmapSize(wxSize(96, 15));
      wxBitmap bmp;
!     bmp = wxGetApp().LoadAppBitmap("bmp/SOLID.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_SOLID, "Solid", bmp, "Solid pen", wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap("bmp/TRANSPARENT.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_TRANSPARENT, "Transparent", bmp, "Transparent pen", wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap("bmp/DOT.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_DOT, "Dot", bmp, "Dot pen", wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap("bmp/LONG_DASH.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_LONG_DASH, "Long dash", bmp, "Long dash pen", wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap("bmp/SHORT_DASH.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_SHORT_DASH, "Short dash", bmp, "Short dash pen", wxITEM_CHECK);
!     bmp = wxGetApp().LoadAppBitmap("bmp/DOT_DASH.PNG", wxBITMAP_TYPE_PNG);
      pTB->AddTool(ID_PEN_DOT_DASH, "Dot...dash", bmp, "Dot...dash pen", wxITEM_CHECK);
      pTB->Realize();
--- 1138,1152 ----
      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();

--- StdPlugin.cpp DELETED ---