[Wxdevcenter-cvs] StdPlugin/src BitmapCtrl.cpp,1.13,1.14 BitmapDocView.cpp,1.19,1.20 SimpleTextDocView.cpp,1.7,1.8 StdPlugin.cpp,1.3,1.4 OrganigramPanel.cpp,1.1,NONE

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

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

Modified Files:
	BitmapCtrl.cpp BitmapDocView.cpp SimpleTextDocView.cpp 
	StdPlugin.cpp 
Removed Files:
	OrganigramPanel.cpp 
Log Message:
Utilisation de namespaces et suppression des reliquats du doc/vue d'organigrammes.

Index: SimpleTextDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimpleTextDocView.cpp	16 Feb 2005 17:45:56 -0000	1.7
--- SimpleTextDocView.cpp	4 Mar 2005 16:35:16 -0000	1.8
***************
*** 37,40 ****
--- 37,42 ----
  
  using namespace wxDevCenter;
+ using namespace StdPlugin::Text;
+ 
  
  
***************
*** 43,52 ****
  
  
- 
  //////////////////////////////////////////////////////////////////////
  //	LanguageProperty
  //////////////////////////////////////////////////////////////////////
  
! LanguageProperty g_LangagePropertyArray[WXDC_NB_LEX];
  
  LanguageProperty::LanguageProperty()
--- 45,53 ----
  
  
  //////////////////////////////////////////////////////////////////////
  //	LanguageProperty
  //////////////////////////////////////////////////////////////////////
  
! LanguageProperty StdPlugin::Text::g_LangagePropertyArray[WXDC_NB_LEX];
  
  LanguageProperty::LanguageProperty()
***************
*** 151,155 ****
  
  /** Fonction de lecture des préférences.*/
! void LoadPreferences()
  {
      int      iLang, NumStyle, NumKeyword;
--- 152,156 ----
  
  /** Fonction de lecture des préférences.*/
! void StdPlugin::Text::LoadPreferences()
  {
      int      iLang, NumStyle, NumKeyword;
***************
*** 202,206 ****
  
  /** Fonction de sauvegarde des préférences.*/
! void SavePreferences()
  {
      int      iLang, NumStyle, NumKeyword;
--- 203,207 ----
  
  /** Fonction de sauvegarde des préférences.*/
! void StdPlugin::Text::SavePreferences()
  {
      int      iLang, NumStyle, NumKeyword;
***************
*** 256,260 ****
  
  
! void QueryPreferences()
  {
      SimpleTextPrefDialog Dialog;
--- 257,261 ----
  
  
! void StdPlugin::Text::QueryPreferences()
  {
      SimpleTextPrefDialog Dialog;
***************
*** 270,274 ****
  }
  
! void RefreshPreferences()
  {
      unsigned int n, nb=wxGetApp().GetDocManager().GetViewCount();
--- 271,275 ----
  }
  
! void StdPlugin::Text::RefreshPreferences()
  {
      unsigned int n, nb=wxGetApp().GetDocManager().GetViewCount();

Index: BitmapCtrl.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** BitmapCtrl.cpp	25 Feb 2005 10:43:41 -0000	1.13
--- BitmapCtrl.cpp	4 Mar 2005 16:35:16 -0000	1.14
***************
*** 30,33 ****
--- 30,37 ----
  #include <wx/dcbuffer.h>
  
+ using namespace wxDevCenter;
+ using namespace StdPlugin::Bitmap;
+ 
+ 
  #define BMP_ANCHOR_INFLATE_WIDTH    3
  

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** BitmapDocView.cpp	25 Feb 2005 15:43:28 -0000	1.19
--- BitmapDocView.cpp	4 Mar 2005 16:35:16 -0000	1.20
***************
*** 16,20 ****
--- 16,22 ----
  #include <wx/clipbrd.h>
  
+ 
  using namespace wxDevCenter;
+ using namespace StdPlugin::Bitmap;
  
  //////////////////////////////////////////////////////////////////////

Index: StdPlugin.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/StdPlugin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StdPlugin.cpp	19 Dec 2004 17:01:29 -0000	1.3
--- StdPlugin.cpp	4 Mar 2005 16:35:17 -0000	1.4
***************
*** 24,34 ****
  
  #include <wxDevCenter/StdPlugin.h>
  
  
  /** Définition du plugin.*/
! StdPlugin STD_DLL_PLUGIN g_Plugin;
  
  
- #include <wxDevCenter/StdPlugin/BitmapDocView.h>
  /** Définition du type de document 'Image Bitmap'.*/
  wxDevCenter::DocType BitmapType(WXDC_DOCTYPE_IMAGE_NAME, CLASSINFO(BitmapDocument), WXDC_DOCTYPE_IMAGE_DESCRIPT, wxT("bmp;gif;png;tiff;jpg;jpeg"),
--- 24,37 ----
  
  #include <wxDevCenter/StdPlugin.h>
+ #include <wxDevCenter/StdPlugin/BitmapDocView.h>
+ #include <wxDevCenter/StdPlugin/SimpleTextDocView.h>
  
+ using namespace StdPlugin::Bitmap;
+ using namespace StdPlugin::Text;
  
  /** Définition du plugin.*/
! StdPlugin::StdPlugin STD_DLL_PLUGIN g_Plugin;
  
  
  /** Définition du type de document 'Image Bitmap'.*/
  wxDevCenter::DocType BitmapType(WXDC_DOCTYPE_IMAGE_NAME, CLASSINFO(BitmapDocument), WXDC_DOCTYPE_IMAGE_DESCRIPT, wxT("bmp;gif;png;tiff;jpg;jpeg"),
***************
*** 36,40 ****
  
  
- #include <wxDevCenter/StdPlugin/SimpleTextDocView.h>
  /** Définition du type de document 'Texte simple'.*/
  wxDevCenter::DocType TxtType(WXDC_DOCTYPE_TEXT_NAME, CLASSINFO(SimpleTextDocument), WXDC_DOCTYPE_TEXT_DESCRIPT, wxT("txt;log"),
--- 39,42 ----
***************
*** 55,74 ****
  #include <wx/statbmp.h>
  
! StdPlugin::StdPlugin():
      wxDevCenter::Plugin(STD_PLUGIN_NAME, STD_PLUGIN_DESCRIPT)
  {
  }
  
! wxPanel* StdPlugin::CreateAboutPanel(wxWindow* pParent, wxWindowID id)
  {
      return new StdPluginAbout(pParent, id);
  }
  
! void StdPlugin::InitPlugin()
  {
      LoadPreferences();
  }
  
! void StdPlugin::FinalPlugin()
  {
      SavePreferences();
--- 57,76 ----
  #include <wx/statbmp.h>
  
! StdPlugin::StdPlugin::StdPlugin():
      wxDevCenter::Plugin(STD_PLUGIN_NAME, STD_PLUGIN_DESCRIPT)
  {
  }
  
! wxPanel* StdPlugin::StdPlugin::CreateAboutPanel(wxWindow* pParent, wxWindowID id)
  {
      return new StdPluginAbout(pParent, id);
  }
  
! void StdPlugin::StdPlugin::InitPlugin()
  {
      LoadPreferences();
  }
  
! void StdPlugin::StdPlugin::FinalPlugin()
  {
      SavePreferences();
***************
*** 77,81 ****
  
  
! StdPluginAbout::StdPluginAbout(wxWindow* parent, wxWindowID id):
      wxPanel(parent, id)
  {
--- 79,83 ----
  
  
! StdPlugin::StdPluginAbout::StdPluginAbout(wxWindow* parent, wxWindowID id):
      wxPanel(parent, id)
  {

--- OrganigramPanel.cpp DELETED ---