wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin

[Wxdevcenter-cvs] StdPlugin/include/wxDevCenter/StdPlugin BitmapDocView.h,1.20,1.21

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

Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10807/include/wxDevCenter/StdPlugin

Modified Files:
	BitmapDocView.h 
Log Message:
Link creation bitmap size to the "new bitmap" dialog box data.
Fill created bitmap in white.

Index: BitmapDocView.h
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapDocView.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BitmapDocView.h	17 Aug 2005 16:34:55 -0000	1.20
--- BitmapDocView.h	24 Aug 2005 16:27:25 -0000	1.21
***************
*** 3,9 ****
   * @author Cursor
   *
!  * @brief Déclaration du type de documents "Image bitmap".
   * 
!  * Déclaration des classes de
   *  - Document (BitmapDocument)
   *  - Vue (BitmapView)
--- 3,9 ----
   * @author Cursor
   *
!  * @brief D�claration du type de documents "Image bitmap".
   * 
!  * D�claration des classes de
   *  - Document (BitmapDocument)
   *  - Vue (BitmapView)
***************
*** 16,19 ****
--- 16,21 ----
  #define __STDPLUGIN_BITMAPDOCVIEW
  
+ #include <wxDevCenter/StdPlugin/BitmapProp.h>
+ 
  #include <wxDevCenter/DocView.h>
  #include <wxDevCenter/WorkBar.h>
***************
*** 59,63 ****
      wxColourCtrl* m_pColourArray[WXDC_BITMAP_PALETTE_SIZE];
  
!     /** Controle de couleur actuellement sélectionné.*/
      wxColourCtrl* m_pColourSelected;
  
--- 61,65 ----
      wxColourCtrl* m_pColourArray[WXDC_BITMAP_PALETTE_SIZE];
  
!     /** Controle de couleur actuellement s�lectionn�.*/
      wxColourCtrl* m_pColourSelected;
  
***************
*** 68,72 ****
      /** SliderSpin bleu*/
      wxSliderSpinCtrl* m_pBlueSSC;
!     /** Entrée couleur HTML.*/
      wxTextCtrl* m_pHTMLColor;
  
--- 70,74 ----
      /** SliderSpin bleu*/
      wxSliderSpinCtrl* m_pBlueSSC;
!     /** Entr�e couleur HTML.*/
      wxTextCtrl* m_pHTMLColor;
  
***************
*** 100,104 ****
      {
      protected:
!         /** Document attaché.*/
          BitmapDocument* m_pDoc;
      public:
--- 102,106 ----
      {
      protected:
!         /** Document attach�.*/
          BitmapDocument* m_pDoc;
      public:
***************
*** 106,110 ****
      };
  
!     /** Classe de base des actions de démarrage d'un BitmapDocument.
       * N'existe que pour initialiser le document.*/
      class Start : public BitmapAction
--- 108,112 ----
      };
  
!     /** Classe de base des actions de d�marrage d'un BitmapDocument.
       * N'existe que pour initialiser le document.*/
      class Start : public BitmapAction
***************
*** 112,116 ****
      public:
          Start(BitmapDocument* pDoc, bool canUndo = false, const wxString& name = wxEmptyString):BitmapAction(pDoc, canUndo, name){}
!         /** Une action de démarrage ne peut jamais, par définition, être annulée.*/
          bool CanUndo(){return false;}
          /** Undo impossible.*/
--- 114,118 ----
      public:
          Start(BitmapDocument* pDoc, bool canUndo = false, const wxString& name = wxEmptyString):BitmapAction(pDoc, canUndo, name){}
!         /** Une action de d�marrage ne peut jamais, par d�finition, �tre annul�e.*/
          bool CanUndo(){return false;}
          /** Undo impossible.*/
***************
*** 127,135 ****
      };
  
!     /** Classe d'action sur la création d'une image vierge.*/
      class Create : public Start
      {
      public:
          Create(BitmapDocument* pDoc):Start(pDoc, false, WXDC_BITMAP_CMD_CREATE){}
      };
  
--- 129,139 ----
      };
  
!     /** Classe d'action sur la cr�ation d'une image vierge.*/
      class Create : public Start
      {
      public:
          Create(BitmapDocument* pDoc):Start(pDoc, false, WXDC_BITMAP_CMD_CREATE){}
+         /** Do ne faisant rien.*/
+         bool Do();
      };
  
***************
*** 138,142 ****
      {
      protected:
!         /** Buffer de sauvegarde de la zone modifiée.
           * Utile pour annuler les actions.*/
          wxBitmap m_Buffer;
--- 142,146 ----
      {
      protected:
!         /** Buffer de sauvegarde de la zone modifi�e.
           * Utile pour annuler les actions.*/
          wxBitmap m_Buffer;
***************
*** 144,149 ****
          wxPoint m_ptBuffer;
  
!         /** Demande de sauvegarder une partie de l'image passée en paramètre.
!          * @param bmp Source de l'image à sauvegarder.
           * @param r Rectangle de position de sauvegarde.*/
          void SetBuffer(const wxBitmap& bmp, wxRect r);
--- 148,153 ----
          wxPoint m_ptBuffer;
  
!         /** Demande de sauvegarder une partie de l'image pass�e en param�tre.
!          * @param bmp Source de l'image � sauvegarder.
           * @param r Rectangle de position de sauvegarde.*/
          void SetBuffer(const wxBitmap& bmp, wxRect r);
***************
*** 151,155 ****
          /** Constructeur.*/
          Drawing(BitmapDocument* pDoc):BitmapAction(pDoc, true){}
!         /** Une action de dessin peut généralement être annulée.*/
          bool CanUndo(){return true;}
          /** Faire le undo en blittant le buffer d'image.*/
--- 155,159 ----
          /** Constructeur.*/
          Drawing(BitmapDocument* pDoc):BitmapAction(pDoc, true){}
!         /** Une action de dessin peut g�n�ralement �tre annul�e.*/
          bool CanUndo(){return true;}
          /** Faire le undo en blittant le buffer d'image.*/
***************
*** 169,173 ****
          /** Faire l'action.*/
          bool Do();
!         /** Donner un nom à la commande.*/
          wxString GetName();
      };
--- 173,177 ----
          /** Faire l'action.*/
          bool Do();
!         /** Donner un nom � la commande.*/
          wxString GetName();
      };
***************
*** 185,189 ****
          };
      protected:
!         /** Code de tracé.*/
          SimpleDrawingCode m_code;
          /** Crayon de dessin.*/
--- 189,193 ----
          };
      protected:
!         /** Code de trac�.*/
          SimpleDrawingCode m_code;
          /** Crayon de dessin.*/
***************
*** 191,195 ****
          /** Pinceau de dessin.*/
          wxBrush m_brush;
!         /** Rectangle du tracé.*/
          wxRect m_rect;
      public:
--- 195,199 ----
          /** Pinceau de dessin.*/
          wxBrush m_brush;
!         /** Rectangle du trac�.*/
          wxRect m_rect;
      public:
***************
*** 198,206 ****
          /** Faire l'action.*/
          bool Do();
!         /** Donner un nom à la commande.*/
          wxString GetName();
      };
  
!     /** Classe de base des actions de sélection d'une partie de l'image bitmap.*/
      class Selection : public BitmapAction
      {
--- 202,210 ----
          /** Faire l'action.*/
          bool Do();
!         /** Donner un nom � la commande.*/
          wxString GetName();
      };
  
!     /** Classe de base des actions de s�lection d'une partie de l'image bitmap.*/
      class Selection : public BitmapAction
      {
***************
*** 210,224 ****
      };
  
!     /** Classe de base des actions de sélections qui changent le contenu de la sélection.*/
      class ChangeSelection : public Selection
      {
      protected:
!         /** Ancienne sélection.*/
          wxBitmap m_bmpOld;
!         /** Ancienne position de la sélection.*/
          wxPoint  m_posOld;
!         /** Nouvelle sélection.*/
          wxBitmap m_bmpNew;
!         /** Nouvelle position de la sélection.*/
          wxPoint  m_posNew;
      public:
--- 214,228 ----
      };
  
!     /** Classe de base des actions de s�lections qui changent le contenu de la s�lection.*/
      class ChangeSelection : public Selection
      {
      protected:
!         /** Ancienne s�lection.*/
          wxBitmap m_bmpOld;
!         /** Ancienne position de la s�lection.*/
          wxPoint  m_posOld;
!         /** Nouvelle s�lection.*/
          wxBitmap m_bmpNew;
!         /** Nouvelle position de la s�lection.*/
          wxPoint  m_posNew;
      public:
***************
*** 230,234 ****
      };
  
!     /** Classe d'action : Couper vers sélection.*/
      class CutToSelection : public ChangeSelection
      {
--- 234,238 ----
      };
  
!     /** Classe d'action : Couper vers s�lection.*/
      class CutToSelection : public ChangeSelection
      {
***************
*** 243,247 ****
      };
  
!     /** Classe d'action : désélectionner.*/
      class Deselect : public ChangeSelection
      {
--- 247,251 ----
      };
  
!     /** Classe d'action : d�s�lectionner.*/
      class Deselect : public ChangeSelection
      {
***************
*** 251,255 ****
      };
  
!     /** Classe d'action : Déplacer la sélection.*/
      class MoveSelection : public Selection
      {
--- 255,259 ----
      };
  
!     /** Classe d'action : D�placer la s�lection.*/
      class MoveSelection : public Selection
      {
***************
*** 263,267 ****
      };
  
!     /** Classe d'action : Colle une bitmap à l'endroit indiqué.*/
      class PasteSelection : public Drawing
      {
--- 267,271 ----
      };
  
!     /** Classe d'action : Colle une bitmap � l'endroit indiqu�.*/
      class PasteSelection : public Drawing
      {
***************
*** 284,290 ****
      wxBitmap m_Bmp;
  
!     /** Buffer de sélection.*/
      wxBitmap m_bmpSel;
!     /** Position de la sélection.*/
      wxPoint m_posSel;
      /** Offset de position.*/
--- 288,297 ----
      wxBitmap m_Bmp;
  
! 	/** Descripteur de propriétés de l'image.*/
! 	BitmapProperties m_BmpProp;
! 
!     /** Buffer de s�lection.*/
      wxBitmap m_bmpSel;
!     /** Position de la s�lection.*/
      wxPoint m_posSel;
      /** Offset de position.*/
***************
*** 315,320 ****
  
      /** Dessine un trait.
!      * @param ptFrom Point de départ du trait.
!      * @param ptTo Point d'arrivée du trait.
       * @param pen Crayon de dessin du trait.
       */
--- 322,327 ----
  
      /** Dessine un trait.
!      * @param ptFrom Point de d�part du trait.
!      * @param ptTo Point d'arriv�e du trait.
       * @param pen Crayon de dessin du trait.
       */
***************
*** 322,327 ****
  
      /** Dessine un rectangle.
!      * @param ptFrom Point de départ du rectangle.
!      * @param ptTo Point d'arrivée du rectangle.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
--- 329,334 ----
  
      /** Dessine un rectangle.
!      * @param ptFrom Point de d�part du rectangle.
!      * @param ptTo Point d'arriv�e du rectangle.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
***************
*** 329,333 ****
      void DrawRect(wxPoint ptFrom, wxPoint ptTo, const wxPen &pen, const wxBrush &brush);
      /** Dessine un rectangle.
!      * @param r Rectangle à dessiner.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
--- 336,340 ----
      void DrawRect(wxPoint ptFrom, wxPoint ptTo, const wxPen &pen, const wxBrush &brush);
      /** Dessine un rectangle.
!      * @param r Rectangle � dessiner.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
***************
*** 336,341 ****
  
      /** Dessine un rectangle arrondi.
!      * @param ptFrom Point de départ du rectangle.
!      * @param ptTo Point d'arrivée du rectangle.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
--- 343,348 ----
  
      /** Dessine un rectangle arrondi.
!      * @param ptFrom Point de d�part du rectangle.
!      * @param ptTo Point d'arriv�e du rectangle.
       * @param pen Crayon du contour du rectangle.
       * @param brush Pinceau de remplissage du rectangle.
***************
*** 344,349 ****
  
      /** Dessine une ellipse.
!      * @param ptFrom Point de départ de l'ellipse.
!      * @param ptTo Point d'arrivée de l'ellipse.
       * @param pen Crayon du contour de l'ellipse.
       * @param brush Pinceau de remplissage de l'ellipse.
--- 351,356 ----
  
      /** Dessine une ellipse.
!      * @param ptFrom Point de d�part de l'ellipse.
!      * @param ptTo Point d'arriv�e de l'ellipse.
       * @param pen Crayon du contour de l'ellipse.
       * @param brush Pinceau de remplissage de l'ellipse.
***************
*** 352,357 ****
  
      /** Applique/colle un bitmap par dessus l'image d'origine.
!      * @param bmp Bitmap à appliquer.
!      * @param pos Position où appliquer le bitmap.*/
      void DrawBitmap(const wxBitmap& bmp, wxPoint pos);
  
--- 359,364 ----
  
      /** Applique/colle un bitmap par dessus l'image d'origine.
!      * @param bmp Bitmap � appliquer.
!      * @param pos Position o� appliquer le bitmap.*/
      void DrawBitmap(const wxBitmap& bmp, wxPoint pos);
  
***************
*** 362,401 ****
      /** @} */
  
!     /** @name Gestion de la sélection.
       * @{ */
!     /** Fixe une nouvelle sélection. Ne rafraichit pas les vues.*/
      void SetSelection(const wxBitmap& bmp, wxPoint pos);
!     /** Déplace la sélection à un endroit donné. Ne rafraichit pas les vues.*/
      void SetSelectionPosition(wxPoint pos);
!     /** Accesseur sur la bitmap de sélection.*/
      const wxBitmap& GetSelectionBitmap()const{return m_bmpSel;}
!     /** Accesseur sur la position de la sélection.*/
      wxPoint GetSelectionPosition()const{return m_posSel;}
!     /** Accesseur sur la taille de la sélection.*/
      wxSize GetSelectionSize()const{return wxSize(m_bmpSel.GetWidth(), m_bmpSel.GetHeight());}
!     /** Accesseur sur le rectangle de sélection.*/
      wxRect GetSelectionRect()const{return wxRect(m_posSel.x, m_posSel.y, m_bmpSel.GetWidth(), m_bmpSel.GetHeight());}
!     /** Teste si une sélection existe.*/
      bool HasSelection()const{return m_bmpSel.Ok() && m_bmpSel.GetWidth()>0 && m_bmpSel.GetHeight()>0;}
!     /** Change l'offset de sélection.*/
      void SetSelectionOffset(wxPoint offset){m_offSel = offset;}
!     /** Retourne l'offset de sélection.*/
      wxPoint GetSelectionOffset()const{return m_offSel;}
  
!     /** Sélectionne une partie de l'image.
!      * @param r Coordonnées e la partie d'image à copier.
       * @param brush Pinceau de remplissage.*/
      void Select(wxRect r, const wxBrush brush=wxNullBrush);
!     /** Désélectionne.*/
      void Deselect();
!     /** Déplace la sélection.
!      * @param pos Nouvelle position de la sélection.*/
      void MoveSelection(wxPoint pos);
!     /** Déplace la sélection.
!      * @param offset Déplacement à effectuer.*/
      void MoveSelection(wxSize offset);
!     /** Déplace la sélection de la valeur de l'offset et réinitialise l'offset.*/
      void MoveSelection();
!     /** Colle la sélection à l'endoit où elle se trouve, offset compris.*/
      void PasteSelection();
      /** @} */
--- 369,408 ----
      /** @} */
  
!     /** @name Gestion de la s�lection.
       * @{ */
!     /** Fixe une nouvelle s�lection. Ne rafraichit pas les vues.*/
      void SetSelection(const wxBitmap& bmp, wxPoint pos);
!     /** D�place la s�lection � un endroit donn�. Ne rafraichit pas les vues.*/
      void SetSelectionPosition(wxPoint pos);
!     /** Accesseur sur la bitmap de s�lection.*/
      const wxBitmap& GetSelectionBitmap()const{return m_bmpSel;}
!     /** Accesseur sur la position de la s�lection.*/
      wxPoint GetSelectionPosition()const{return m_posSel;}
!     /** Accesseur sur la taille de la s�lection.*/
      wxSize GetSelectionSize()const{return wxSize(m_bmpSel.GetWidth(), m_bmpSel.GetHeight());}
!     /** Accesseur sur le rectangle de s�lection.*/
      wxRect GetSelectionRect()const{return wxRect(m_posSel.x, m_posSel.y, m_bmpSel.GetWidth(), m_bmpSel.GetHeight());}
!     /** Teste si une s�lection existe.*/
      bool HasSelection()const{return m_bmpSel.Ok() && m_bmpSel.GetWidth()>0 && m_bmpSel.GetHeight()>0;}
!     /** Change l'offset de s�lection.*/
      void SetSelectionOffset(wxPoint offset){m_offSel = offset;}
!     /** Retourne l'offset de s�lection.*/
      wxPoint GetSelectionOffset()const{return m_offSel;}
  
!     /** S�lectionne une partie de l'image.
!      * @param r Coordonn�es e la partie d'image � copier.
       * @param brush Pinceau de remplissage.*/
      void Select(wxRect r, const wxBrush brush=wxNullBrush);
!     /** D�s�lectionne.*/
      void Deselect();
!     /** D�place la s�lection.
!      * @param pos Nouvelle position de la s�lection.*/
      void MoveSelection(wxPoint pos);
!     /** D�place la s�lection.
!      * @param offset D�placement � effectuer.*/
      void MoveSelection(wxSize offset);
!     /** D�place la s�lection de la valeur de l'offset et r�initialise l'offset.*/
      void MoveSelection();
!     /** Colle la s�lection � l'endoit o� elle se trouve, offset compris.*/
      void PasteSelection();
      /** @} */
***************
*** 403,411 ****
      /** @name Gestion du presse-papier.
       * @{ */
!     /** Copier la sélection vers le presse-papiers.*/
      bool CopyToClipboard();
!     /** Couper la sélection vers le presse-papiers.*/
      bool CutToClipboard();
!     /** Coller le contenu du presse-papiers dans la sélection.*/
      bool PasteFromClipboard();
      /** @} */
--- 410,418 ----
      /** @name Gestion du presse-papier.
       * @{ */
!     /** Copier la s�lection vers le presse-papiers.*/
      bool CopyToClipboard();
!     /** Couper la s�lection vers le presse-papiers.*/
      bool CutToClipboard();
!     /** Coller le contenu du presse-papiers dans la s�lection.*/
      bool PasteFromClipboard();
      /** @} */
***************
*** 417,437 ****
      static int GetBitmapType(wxDevCenter::FilePath strFile);
  
!     /** Type de mises à jours des vues.*/
      enum BmpDocUpdateMode{
          BmpDocUpdateAll    = 0,
!         BmpDocUpdateDraw   = 1,     // r = zone de mise à jour (largeur de trait inclus).
!         BmpDocUpdateSel    = 2      // r = ancienne zone desélection (cadre de sélection non compris).
      };
  
  protected:
!     /** Interception de l'évènement de coupage vers le presse-papiers.*/
      void OnCutToClipboard(wxCommandEvent& event);
!     /** Interception de l'évènement de copiage vers le presse-papiers.*/
      void OnCopyToClipboard(wxCommandEvent& event);
!     /** Interception de l'évènement de collage vers le presse-papiers.*/
      void OnPasteFromClipboard(wxCommandEvent& event);
!     /** Interception de la mise à jour des menu d'envoi vers le presse-papiers.*/
      void OnUpdateSendToClipboard(wxUpdateUIEvent& event);
!     /** Interception de la mise à jour des menus de reception depuis le presse-papiers.*/
      void OnUpdatePasteFromClipboard(wxUpdateUIEvent& event);
  };
--- 424,444 ----
      static int GetBitmapType(wxDevCenter::FilePath strFile);
  
!     /** Type de mises � jours des vues.*/
      enum BmpDocUpdateMode{
          BmpDocUpdateAll    = 0,
!         BmpDocUpdateDraw   = 1,     // r = zone de mise � jour (largeur de trait inclus).
!         BmpDocUpdateSel    = 2      // r = ancienne zone des�lection (cadre de s�lection non compris).
      };
  
  protected:
!     /** Interception de l'�v�nement de coupage vers le presse-papiers.*/
      void OnCutToClipboard(wxCommandEvent& event);
!     /** Interception de l'�v�nement de copiage vers le presse-papiers.*/
      void OnCopyToClipboard(wxCommandEvent& event);
!     /** Interception de l'�v�nement de collage vers le presse-papiers.*/
      void OnPasteFromClipboard(wxCommandEvent& event);
!     /** Interception de la mise � jour des menu d'envoi vers le presse-papiers.*/
      void OnUpdateSendToClipboard(wxUpdateUIEvent& event);
!     /** Interception de la mise � jour des menus de reception depuis le presse-papiers.*/
      void OnUpdatePasteFromClipboard(wxUpdateUIEvent& event);
  };
***************
*** 464,476 ****
      wxBrush m_Brush;
  
!     /** Intercepte le changement de couleur de la sélection gauche.*/
      void OnSelLeftColourChanged(wxCommandEvent& event);
!     /** Intercepte le changement de couleur de la sélection droite.*/
      void OnSelRightColourChanged(wxCommandEvent& event);
  
  
!     /** @name Contrôles d'outils.
       * @{ */
!     /** Création de la barre d'outil.*/
      wxToolBar* CreateToolBar();
      /** Outils.*/
--- 471,483 ----
      wxBrush m_Brush;
  
!     /** Intercepte le changement de couleur de la s�lection gauche.*/
      void OnSelLeftColourChanged(wxCommandEvent& event);
!     /** Intercepte le changement de couleur de la s�lection droite.*/
      void OnSelRightColourChanged(wxCommandEvent& event);
  
  
!     /** @name Contr�les d'outils.
       * @{ */
!     /** Cr�ation de la barre d'outil.*/
      wxToolBar* CreateToolBar();
      /** Outils.*/
***************
*** 490,496 ****
          BVD_SIZEALL     = 11
      };
!     /** Fonction de tracé courante.*/
      BitmapViewDrawing m_BVD;
!     /** Interception de la sélection d'un outil.*/
      void OnTool(wxCommandEvent& event);
      /** Interception de l'update des outils.*/
--- 497,503 ----
          BVD_SIZEALL     = 11
      };
!     /** Fonction de trac� courante.*/
      BitmapViewDrawing m_BVD;
!     /** Interception de la s�lection d'un outil.*/
      void OnTool(wxCommandEvent& event);
      /** Interception de l'update des outils.*/
***************
*** 501,512 ****
  
  
!     /** @name Contrôles de trait.
       * @{ */
      int m_iPenType;
!     /** Création de la barre de pinceau.*/
      wxPanel* CreatePenBar();
      /** Taille du trait.*/
      wxSliderSpinCtrl* m_pPenSize;
!     /** Interception de la sélection d'un outil.*/
      void OnPenStyle(wxCommandEvent& event);
      /** Interception de l'update des outils.*/
--- 508,519 ----
  
  
!     /** @name Contr�les de trait.
       * @{ */
      int m_iPenType;
!     /** Cr�ation de la barre de pinceau.*/
      wxPanel* CreatePenBar();
      /** Taille du trait.*/
      wxSliderSpinCtrl* m_pPenSize;
!     /** Interception de la s�lection d'un outil.*/
      void OnPenStyle(wxCommandEvent& event);
      /** Interception de l'update des outils.*/
***************
*** 515,533 ****
  
  
!     /** @name Mise à jour du controle de bitmap.
       * @{ */
!     /** Mise à jour de tout ou partie du controle de bitmap.
       * Ne de mande pa de rafraichir le controle.
!      * @param region Region à mettre à jour. */
      void UpdateBitmapContent(const wxRegion& region);
!     /** Mise à jour de tout ou partie du controle de bitmap.
       * Ne de mande pa de rafraichir le controle.
!      * @param rect Rectangle à mettre à jour.*/
      void UpdateBitmapContent(wxRect rect);
      /** @} */
  
!     /** @name Données de manipulations.
       *@{*/
!     /** Drapeau d'indication de copie de sélection.*/
      bool    m_bCopySel;
      /** Sauvegarde d'un point.*/
--- 522,540 ----
  
  
!     /** @name Mise � jour du controle de bitmap.
       * @{ */
!     /** Mise � jour de tout ou partie du controle de bitmap.
       * Ne de mande pa de rafraichir le controle.
!      * @param region Region � mettre � jour. */
      void UpdateBitmapContent(const wxRegion& region);
!     /** Mise � jour de tout ou partie du controle de bitmap.
       * Ne de mande pa de rafraichir le controle.
!      * @param rect Rectangle � mettre � jour.*/
      void UpdateBitmapContent(wxRect rect);
      /** @} */
  
!     /** @name Donn�es de manipulations.
       *@{*/
!     /** Drapeau d'indication de copie de s�lection.*/
      bool    m_bCopySel;
      /** Sauvegarde d'un point.*/
***************
*** 535,545 ****
      /** @}*/
  
!     /** @name Interception des évènements souris.
       *@{*/
!     /** Interception d'un déplacement de souris (non drag).*/
      void OnLeftMove(wxExtendedMouseEvent& event);
      /** Interception d'un drag gauche.*/
      void OnLeftDrag(wxExtendedMouseEvent& event);
!     /** Interception d'un début de drag gauche.*/
      void OnLeftDragStart(wxExtendedMouseEvent& event);
      /** Interception d'une fin de drag gauche.*/
--- 542,552 ----
      /** @}*/
  
!     /** @name Interception des �v�nements souris.
       *@{*/
!     /** Interception d'un d�placement de souris (non drag).*/
      void OnLeftMove(wxExtendedMouseEvent& event);
      /** Interception d'un drag gauche.*/
      void OnLeftDrag(wxExtendedMouseEvent& event);
!     /** Interception d'un d�but de drag gauche.*/
      void OnLeftDragStart(wxExtendedMouseEvent& event);
      /** Interception d'une fin de drag gauche.*/
***************
*** 547,557 ****
      /** @}*/
  
!     /** Interception de la mise à jour des workbar.
!      * Sert à activer la workbar de dessin et à désactiver les autres.*/
      void OnUpdateWorkBar(wxUpdateUIEvent& event);
  
  public:
      /** Demande un changement d'outil.
!      * Permet de finaliser certains tracés en cours.
       */
      void ChangeTool(BitmapViewDrawing tool);
--- 554,564 ----
      /** @}*/
  
!     /** Interception de la mise � jour des workbar.
!      * Sert � activer la workbar de dessin et � d�sactiver les autres.*/
      void OnUpdateWorkBar(wxUpdateUIEvent& event);
  
  public:
      /** Demande un changement d'outil.
!      * Permet de finaliser certains trac�s en cours.
       */
      void ChangeTool(BitmapViewDrawing tool);
***************
*** 562,568 ****
      void OnUpdate(View *pSender, unsigned int nUpdateCode, void* pUpdateInfo);
  
!     /** Supprime la sélection.*/
      void RemoveSelection();
!     /** Sélectionne la totalité de la bitmap.*/
      void SelectAll();
  
--- 569,575 ----
      void OnUpdate(View *pSender, unsigned int nUpdateCode, void* pUpdateInfo);
  
!     /** Supprime la s�lection.*/
      void RemoveSelection();
!     /** S�lectionne la totalit� de la bitmap.*/
      void SelectAll();
  
***************
*** 574,578 ****
  {
  protected:
!     /** Déclaration des informations RTTI pour que la classe soit dynamique.*/
      DECLARE_DYNAMIC_CLASS(BitmapMiniDoc);
      /** Image.*/
--- 581,585 ----
  {
  protected:
!     /** D�claration des informations RTTI pour que la classe soit dynamique.*/
      DECLARE_DYNAMIC_CLASS(BitmapMiniDoc);
      /** Image.*/
***************
*** 587,597 ****
      /** Destructeur.*/
      virtual ~BitmapMiniDoc();
!     /** Crée une MiniVue.
!     * @return NULL si la création échoue.
      */
      virtual wxDevCenter::MiniView* CreateMiniView(wxWindow* pParent, wxWindowID id);
!     /** Retourne une copie de l'image éventuellement étirée.
!     * @param cx Largeur de l'image, -1 si non modifiée.
!     * @param cy Hauteur de l'image, -1 si non modifiée.
      * @return Copie de l'image.
      */
--- 594,604 ----
      /** Destructeur.*/
      virtual ~BitmapMiniDoc();
!     /** Cr�e une MiniVue.
!     * @return NULL si la cr�ation �choue.
      */
      virtual wxDevCenter::MiniView* CreateMiniView(wxWindow* pParent, wxWindowID id);
!     /** Retourne une copie de l'image �ventuellement �tir�e.
!     * @param cx Largeur de l'image, -1 si non modifi�e.
!     * @param cy Hauteur de l'image, -1 si non modifi�e.
      * @return Copie de l'image.
      */
***************
*** 605,617 ****
  {
  protected:
!     /** Déclaration de la table des évènements.*/
  	DECLARE_EVENT_TABLE()
      /** Buffer de l'image.*/
      wxImage m_ImageBuffer;
      /** Etat du buffer.
!     * A recharger si à false.*/
      bool m_bReloadBuffer;
  public:
!     /** Constructeur générique d'une minivue.*/
      BitmapMiniView(wxWindow* pParent, wxWindowID id);
      /** Destructeur.*/
--- 612,624 ----
  {
  protected:
!     /** D�claration de la table des �v�nements.*/
  	DECLARE_EVENT_TABLE()
      /** Buffer de l'image.*/
      wxImage m_ImageBuffer;
      /** Etat du buffer.
!     * A recharger si � false.*/
      bool m_bReloadBuffer;
  public:
!     /** Constructeur g�n�rique d'une minivue.*/
      BitmapMiniView(wxWindow* pParent, wxWindowID id);
      /** Destructeur.*/
***************
*** 620,626 ****
      bool OnInitialize();
      void OnUpdate();
!     /** Interception de l'évènement de redimmensionnement de la fenêtre.*/
      void OnResize(wxSizeEvent &event);
!     /** Interception de l'évènement de rafraichissement de la fenêtre.*/
      void OnPaint(wxPaintEvent &event);
      /** Acces au MiniDoc.*/
--- 627,633 ----
      bool OnInitialize();
      void OnUpdate();
!     /** Interception de l'�v�nement de redimmensionnement de la fen�tre.*/
      void OnResize(wxSizeEvent &event);
!     /** Interception de l'�v�nement de rafraichissement de la fen�tre.*/
      void OnPaint(wxPaintEvent &event);
      /** Acces au MiniDoc.*/

[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.28,1.29

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

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

Modified Files:
	BitmapDocView.cpp 
Log Message:
Link creation bitmap size to the "new bitmap" dialog box data.
Fill created bitmap in white.

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** BitmapDocView.cpp	24 Aug 2005 10:55:34 -0000	1.28
--- BitmapDocView.cpp	24 Aug 2005 16:27:25 -0000	1.29
***************
*** 9,14 ****
  #include <wxDevCenter/StdPlugin/BitmapDocView.h>
  
- #include <wxDevCenter/StdPlugin/BitmapProp.h>
- 
  #include <wxDevCenter/FileSystem.h>
  #include <wxDevCenter/DocView.h>
--- 9,12 ----
***************
*** 359,362 ****
--- 357,368 ----
  //////////////////////////////////////////////////////////////////////
  
+ // Remplit la bitmap avec la couleur de fond.
+ bool action::Create::Do()
+ {
+     BitmapDrawRectangle(m_pDoc->GetBitmap(), wxRect(wxPoint(0,0), m_pDoc->GetBitmapSize()), *wxTRANSPARENT_PEN, *wxWHITE_BRUSH);
+ 	return true;
+ }
+ 
+ 
  
  /**
***************
*** 591,595 ****
  
  BitmapDocument::BitmapDocument():
!     ActionDocument()
  {
      m_strName = wxT("NewBitmap");
--- 597,602 ----
  
  BitmapDocument::BitmapDocument():
!     ActionDocument(),
!     m_BmpProp(wxSize(640, 480))
  {
      m_strName = wxT("NewBitmap");
***************
*** 606,609 ****
--- 613,617 ----
      }
      m_Bmp = wxBitmap(Img);
+     m_BmpProp.SetSize(wxSize(m_Bmp.GetWidth(), m_Bmp.GetHeight()));
  	return true;
  }
***************
*** 635,643 ****
  
  	BitmapPropertiesDialog Dialog(NULL, -1, wxT("New bitmap"));
! 	Dialog.ShowModal();
  
!     m_Bmp.Create(40, 40, 24);
!     ClearCommands();
!     Do(new action::Create(this));
      return true;
  }
--- 643,655 ----
  
  	BitmapPropertiesDialog Dialog(NULL, -1, wxT("New bitmap"));
! 	Dialog.SetProperties(m_BmpProp);
! 	if(Dialog.ShowModal()==wxID_OK)
! 	{
! 		m_BmpProp = Dialog.GetProperties();
  
! 	    m_Bmp.Create(m_BmpProp.GetSize().x, m_BmpProp.GetSize().y, 24);
! 	    ClearCommands();
! 	    Do(new action::Create(this));
! 	}
      return true;
  }

[Wxdevcenter-cvs] wxDevCenter/src AboutBox.cpp,1.3,1.4

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

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

Modified Files:
	AboutBox.cpp 
Log Message:
Fix About-box icons pbs.

Index: AboutBox.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/AboutBox.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutBox.cpp	14 May 2005 12:15:56 -0000	1.3
--- AboutBox.cpp	24 Aug 2005 15:57:00 -0000	1.4
***************
*** 3,7 ****
   * @author Cursor
   *
!  * @brief Implémentation des classes de la boite de dialogue "A propos".
   */
  //  
--- 3,7 ----
   * @author Cursor
   *
!  * @brief Impl�mentation des classes de la boite de dialogue "A propos".
   */
  //  
***************
*** 29,32 ****
--- 29,33 ----
  #include <wx/stattext.h>
  #include <wx/notebook.h>
+ #include <wx/artprov.h>
  
  
***************
*** 77,81 ****
  
  //////////////////////////////////////////////////////////////////////
! //  Implémentation des fonctions de la classe d' about
  
  BEGIN_EVENT_TABLE(wxDevCenter::AboutBoxAboutPage, wxWindow)
--- 78,82 ----
  
  //////////////////////////////////////////////////////////////////////
! //  Impl�mentation des fonctions de la classe d' about
  
  BEGIN_EVENT_TABLE(wxDevCenter::AboutBoxAboutPage, wxWindow)
***************
*** 87,92 ****
  {
  	SetBackgroundColour(*wxWHITE);
! 	m_WXDCLogo = Application::GetApp().LoadAppBitmap("wxDevCenter.png", wxBITMAP_TYPE_PNG);
!     m_WXLogo = Application::GetApp().LoadAppBitmap("wx.png", wxBITMAP_TYPE_PNG);
  }
  
--- 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));
  }
  
***************
*** 110,114 ****
  
  //////////////////////////////////////////////////////////////////////
! //  Implémentation des fonctions de la classe des plugins
  AboutBoxPluginPage::AboutBoxPluginPage(wxWindow* parent, wxWindowID id):
      wxListbook(parent, id)
--- 111,115 ----
  
  //////////////////////////////////////////////////////////////////////
! //  Impl�mentation des fonctions de la classe des plugins
  AboutBoxPluginPage::AboutBoxPluginPage(wxWindow* parent, wxWindowID id):
      wxListbook(parent, id)
***************
*** 128,132 ****
  
  //////////////////////////////////////////////////////////////////////
! //  Implémentation des fonctions de la classe de la licence
  
  AboutBoxLicencePage::AboutBoxLicencePage(wxWindow* parent, wxWindowID id):
--- 129,133 ----
  
  //////////////////////////////////////////////////////////////////////
! //  Impl�mentation des fonctions de la classe de la licence
  
  AboutBoxLicencePage::AboutBoxLicencePage(wxWindow* parent, wxWindowID id):

[Wxdevcenter-cvs] wxDevCenter/data/icons wxWidgets.png,NONE,1.1 wxDevCenter.png,1.1,1.2 wx.png,1.1,NONE

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

Update of /cvsroot/wxdevcenter/wxDevCenter/data/icons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv831/data/icons

Modified Files:
	wxDevCenter.png 
Added Files:
	wxWidgets.png 
Removed Files:
	wx.png 
Log Message:
Fix About-box icons pbs.

Index: wxDevCenter.png
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/data/icons/wxDevCenter.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsxhZHLC and /tmp/cvsXyTBcy differ

--- wx.png DELETED ---

--- NEW FILE: wxWidgets.png ---
(This appears to be a binary file; contents omitted.)

[Wxdevcenter-cvs] StdPlugin/include/wxDevCenter/StdPlugin BitmapProp.h,1.1,1.2

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

Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30456/include/wxDevCenter/StdPlugin

Modified Files:
	BitmapProp.h 
Log Message:
Rewrite the unit system.

Index: BitmapProp.h
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapProp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BitmapProp.h	24 Aug 2005 10:55:35 -0000	1.1
--- BitmapProp.h	24 Aug 2005 15:43:30 -0000	1.2
***************
*** 15,32 ****
  {
  
! /** Type of size unit.*/
! enum SizeUnit
  {
! 	Point,
! 	Millimeter,
! 	Centimeter,
! 	Meter,
! 	Inch,
! 	Twip,
! 	Pixel
  };
  
  
! /** Classe de description des propri�t�s d'une image bitmap.*/
  class BitmapProperties : public wxObject
  {
--- 15,57 ----
  {
  
! /** Structure de description d'une unité de mesure.
!  * @note Un twip est la mesure de base : 1 twip est 1/15 de pixel, 1/1440 de pouce (inch).
!  */
! struct SizeUnit
  {
! 	/** Nom de l'unité.*/
! 	wxString name;
! 	/** Symbole.*/
! 	wxString symbol;
! 	/** Coeficient de conversion depuis un twip (nombre de twip dans une unité).*/
! 	double	 coef;
! 	
! 	/** Convertit une longueur d'une unité à une autre.
! 	 * @param d Longueur à convertir.
! 	 * @param UnitIn Unité de la longueur d'entrée.
! 	 * @param UnitOut Unité de la longueur de retour.
! 	 * @return Longueur convertie.*/
! 	static double Convert(double d, const SizeUnit& UnitIn, const SizeUnit& UnitOut)
! 	{
! 		return d*UnitIn.coef/UnitOut.coef;
! 	}
! 	
  };
  
+ namespace Units
+ {
+ extern SizeUnit Twip;
+ extern SizeUnit Point;
+ extern SizeUnit Pica;
+ extern SizeUnit Inch;
+ extern SizeUnit Millimeter;
+ extern SizeUnit Centimeter;
+ extern SizeUnit Meter;
+ }
+ 
  
! 
! 
! /** Classe de description des propriétés d'une image bitmap.*/
  class BitmapProperties : public wxObject
  {
***************
*** 34,39 ****
  	/** Taille en pixels.*/
  	wxSize m_Size;
! 	/** Ratio en ppp.*/
! 	wxRealPoint m_Ratio;
  public:
  	/** Default constructor.*/
--- 59,64 ----
  	/** Taille en pixels.*/
  	wxSize m_Size;
! 	/** Résolution en ppp (point per pixel).*/
! 	double m_dRes;
  public:
  	/** Default constructor.*/
***************
*** 42,87 ****
  	BitmapProperties(const BitmapProperties& BmpProp);
  	/** Constructor.*/
! 	BitmapProperties(wxSize sz, wxRealPoint ratio=wxRealPoint(72,72));
  	
  	/** Retourne la taille.
  	 * @return Taille en pixel.*/
  	wxSize GetSize()const{return m_Size;}
! 	/** Retourne le ratio.
! 	 * @return Ratio en ppp.*/
! 	wxRealPoint GetRatio()const{return m_Ratio;}
  
- 	/** Retourne la résolution dans l'unité de taille demandée.
- 	 * @param unit Unité demandée pour la résolution.
- 	 * @return Résolution dans l'unité de taille demandée.*/	
- 	wxRealPoint GetResolution(SizeUnit unit)const;
- 	
  	/** Fixe la taille.
  	 * @param size Nouvelle taille en pixels.*/
  	void SetSize(wxSize size){m_Size = size;};
! 	/** Fixe le ratio.
! 	 * @param ratio Nouveau ratio en ppp.*/
! 	void SetRatio(wxRealPoint ratio){m_Ratio = ratio;}
! 	
! 	/** Fixe la taille depuis une résolution.
! 	 * @param res Nouvelle résolution.
! 	 * @param unit Unit� de la résolution.*/
! 	void SetSize(wxRealPoint res, SizeUnit unit);
  
- 	/** Fixe le ratio depuis une résolution.
- 	 * @param res Nouvelle résolution.
- 	 * @param unit Unit� de la résolution.*/
- 	void SetRatio(wxRealPoint res, SizeUnit unit);
  
! 	/** Convertit une longueur d'une unité à une autre.
! 	 * @param d Longueur é convertir.
! 	 * @param unitIn Unité d'entrée.
! 	 * @param unitOut Unité de sortie.*/
! 	double ConvertUnit(double d, SizeUnit unitIn, SizeUnit unitOut)const;
  
! 	/** Convertit une Taille d'une unité à une autre.
! 	 * @param pt Taille à convertir.
! 	 * @param unitIn Unité d'entr�e.
! 	 * @param unitOut Unité de sortie.*/
! 	wxRealPoint ConvertUnit(wxRealPoint pt, SizeUnit unitIn, SizeUnit unitOut)const;
  };
  
--- 67,106 ----
  	BitmapProperties(const BitmapProperties& BmpProp);
  	/** Constructor.*/
! 	BitmapProperties(wxSize sz, double dRes=72.0);
  	
  	/** Retourne la taille.
  	 * @return Taille en pixel.*/
  	wxSize GetSize()const{return m_Size;}
! 	/** Retourne la résolution.
! 	 * @return Résolution en ppp.*/
! 	double GetRes()const{return m_dRes;}
  
  	/** Fixe la taille.
  	 * @param size Nouvelle taille en pixels.*/
  	void SetSize(wxSize size){m_Size = size;};
! 	/** Fixe la résolution.
! 	 * @param dRes Nouvelle résolution en ppp.*/
! 	void SetRes(double dRes){m_dRes = dRes;}
  
  
! 	/** Retourne la taille dans l'unité de taille demandée.
! 	 * @param unit Unité demandée pour la taille.
! 	 * @return Taille dans l'unité de mesure demandée.*/	
! 	wxRealPoint GetSize(const SizeUnit& unit)const;
! 	/** Retourne la résolution dans l'unité de taille demandée.
! 	 * @param unit Unité demandée pour la résolution.
! 	 * @return Résolution dans l'unité de mesure demandée.*/
! 	double GetRes(const SizeUnit& unit)const;
  
! 	
! 	/** Fixe la taille.
! 	 * @param size Nouvelle taille.
! 	 * @param unit Unité de mesure de la taille.*/
! 	void SetSize(wxRealPoint size, const SizeUnit& unit);
! 
! 	/** Fixe la résolution.
! 	 * @param dRes Nouvelle résolution.
! 	 * @param unit Unité de la résolution.*/
! 	void SetRes(double dRes, const SizeUnit& unit);
  };
  
***************
*** 107,114 ****
  	wxStaticText* m_pSizeTextCtrl;
  	
! 	/** Résolution horizontale.*/
! 	wxTextCtrl*   m_pHResTextCtrl;
! 	/** Résolution verticale.*/
! 	wxTextCtrl*   m_pVResTextCtrl;
  	/** Unité.*/
  	wxChoice*	  m_pResUnitChoice;
--- 126,131 ----
  	wxStaticText* m_pSizeTextCtrl;
  	
! 	/** Résolution.*/
! 	wxTextCtrl*   m_pResTextCtrl;
  	/** Unité.*/
  	wxChoice*	  m_pResUnitChoice;
***************
*** 116,125 ****
  public:
  	/** Standard constructor.*/
! 	BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
  	
! 	/** Fixe les propri�t�s.*/
  	void SetProperties(const BitmapProperties& BmpProp){m_BmpProp = BmpProp;}
! 	/** Retourne les propri�t�s.*/
  	BitmapProperties GetProperties()const{return m_BmpProp;}
  };
  
--- 133,157 ----
  public:
  	/** Standard constructor.*/
! 	BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER, const wxString& name = wxT("BitmapPropertiesDialog"));
  	
! 	/** Fixe les propriétés.*/
  	void SetProperties(const BitmapProperties& BmpProp){m_BmpProp = BmpProp;}
! 	/** Retourne les propriétés.*/
  	BitmapProperties GetProperties()const{return m_BmpProp;}
+ 	
+ 	/** Met à jour les controles.*/
+ 	void UpdateCtrl(bool bUpdateSize=true, bool bUpdateRes=true);
+ protected:
+ 	/** Mise à jour initiale.*/
+ 	void OnInitialUpdate(wxInitDialogEvent& event);
+ 	
+ 	/** Interception d'un changement d'unté d'affichage.*/
+ 	void OnChangeUnit(wxCommandEvent& event);
+ 	
+ 	/** Interception d'un changement de taille.*/
+ 	void OnSizeChanged(wxCommandEvent& event);
+ 	
+ 	/** Interception d'un changement de résolution.*/
+ 	void OnResChanged(wxCommandEvent& event);	
  };
  

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

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

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

Modified Files:
	BitmapProp.cpp 
Log Message:
Rewrite the unit system.

Index: BitmapProp.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapProp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BitmapProp.cpp	24 Aug 2005 10:55:34 -0000	1.1
--- BitmapProp.cpp	24 Aug 2005 15:43:30 -0000	1.2
***************
*** 13,21 ****
  
  //////////////////////////////////////////////////////////////////////
  //  BitmapProperties
  //////////////////////////////////////////////////////////////////////
  
  // Default constructor.
! BitmapProperties::BitmapProperties():wxObject()
  {
  }
--- 13,53 ----
  
  //////////////////////////////////////////////////////////////////////
+ //  Unités de mesures.
+ //////////////////////////////////////////////////////////////////////
+ 
+ namespace StdPlugin {
+ namespace Bitmap {
+ namespace Units {
+ SizeUnit Twip 		= {wxT("Twip"), 		wxT("twp"),    1.0};
+ SizeUnit Point		= {wxT("Point"), 		wxT("pt"),    20.0};
+ SizeUnit Pica		= {wxT("Pica"), 		wxT("p"),    240.0};
+ SizeUnit Inch		= {wxT("Inch"), 		wxT("in"),  1440.0};
+ SizeUnit Millimeter = {wxT("Millimeter"), 	wxT("mm"),  1440.0*1/25.4};
+ SizeUnit Centimeter = {wxT("Centimeter"), 	wxT("cm"),  1440.0*1/2.54};
+ SizeUnit Meter		= {wxT("Meter"), 		wxT("m"),   1440.0*1/0.0254};
+ }}}
+ 
+ 
+ static SizeUnit SizeUnits[]=
+ {
+ 	Units::Twip,
+ 	Units::Point,
+ 	Units::Pica,
+ 	Units::Inch,
+ 	Units::Millimeter,
+ 	Units::Centimeter,
+ 	Units::Meter
+ };
+ 
+ 
+ //////////////////////////////////////////////////////////////////////
  //  BitmapProperties
  //////////////////////////////////////////////////////////////////////
  
  // Default constructor.
! BitmapProperties::BitmapProperties():
! 	wxObject(),
! 	m_Size(0, 0),
! 	m_dRes(72)
  {
  }
***************
*** 25,127 ****
  	wxObject(),
  	m_Size(BmpProp.GetSize()),
! 	m_Ratio(BmpProp.GetRatio())
  {
  }
  
  // Constructor.
! BitmapProperties::BitmapProperties(wxSize sz, wxRealPoint ratio):
  	wxObject(),
  	m_Size(sz),
! 	m_Ratio(ratio)
  {
  }
  
  
- // Retourne la résolution dans l'unité de taille demandée.
- wxRealPoint BitmapProperties::GetResolution(SizeUnit unit)const
- {
- 	wxRealPoint sz(GetSize().x, GetSize().y);
- 	sz.x *= GetRatio().x;
- 	sz.y *= GetRatio().y;
- 	return ConvertUnit(sz, Inch, unit);
- }
  
! // Fixe la taille depuis une résolution.
! void BitmapProperties::SetSize(wxRealPoint res, SizeUnit unit)
  {
! 	res.x /= GetRatio().x;
! 	res.y /= GetRatio().y;
! 	res = ConvertUnit(res, unit, Inch);
! 	SetSize(wxSize((wxCoord)res.x, (wxCoord)res.y));
  }
  
! // Fixe le ratio depuis une résolution.
! void BitmapProperties::SetRatio(wxRealPoint res, SizeUnit unit)
  {
! 	res.x /= GetSize().x;
! 	res.y /= GetSize().y;
! 	res = ConvertUnit(res, unit, Inch);
! 	SetSize(wxSize((wxCoord)res.x, (wxCoord)res.y));
  }
  
- // Convertit une longueur d'une unité à une autre.
- double BitmapProperties::ConvertUnit(double d, SizeUnit unitIn, SizeUnit unitOut)const
- {
- 	double coef = 1;
  
! 	switch(unitIn)
! 	{
! 		case Point:
! 			coef = 1.0;
! 			break;
! 		case Inch:
! 			coef = 72.0;
! 			break;
! 		case Twip:
! 			coef = 1.0/20.0;
! 			break;
! 		case Millimeter:
! 			coef = 72.0/25.4;
! 			break;
! 		case Centimeter:
! 			coef = 72.0/2.54;
! 			break;
! 		case Meter:
! 			coef = 72.0/0.0254;
! 			break;
! 		default:
! 			break;
! 	}
! 	switch(unitOut)
! 	{
! 		case Point:
! 			coef = 1.0;
! 			break;
! 		case Inch:
! 			coef = 1/72.0;
! 			break;
! 		case Twip:
! 			coef = 20.0;
! 			break;
! 		case Millimeter:
! 			coef = 25.4/72.0;
! 			break;
! 		case Centimeter:
! 			coef = 2.54/72.0;
! 			break;
! 		case Meter:
! 			coef = 0.0254/72.0;
! 			break;
! 		default:
! 			break;
! 	}
  	
- 	return d*coef;
  }
  
! // Convertit une Taille d'une unité à une autre.
! wxRealPoint BitmapProperties::ConvertUnit(wxRealPoint pt, SizeUnit unitIn, SizeUnit unitOut)const
  {
! 	return wxRealPoint(ConvertUnit(pt.x, unitIn, unitOut), ConvertUnit(pt.y, unitIn, unitOut));
  }
  
--- 57,100 ----
  	wxObject(),
  	m_Size(BmpProp.GetSize()),
! 	m_dRes(BmpProp.GetRes())
  {
  }
  
  // Constructor.
! BitmapProperties::BitmapProperties(wxSize sz, double dRes):
  	wxObject(),
  	m_Size(sz),
! 	m_dRes(dRes)
  {
  }
  
  
  
! // Retourne la taille dans l'unité de taille demandée.
! wxRealPoint BitmapProperties::GetSize(const SizeUnit& unit)const
  {
! 	return wxRealPoint(SizeUnit::Convert(GetSize().x/GetRes(), Units::Point, unit),
! 					SizeUnit::Convert(GetSize().y/GetRes(), Units::Point, unit));
  }
  
! // Retourne la résolution dans l'unité de taille demandée.
! double BitmapProperties::GetRes(const SizeUnit& unit)const
  {
! 	return SizeUnit::Convert(GetRes(), Units::Point, unit);
  }
  
  
! // Fixe la taille.
! void BitmapProperties::SetSize(wxRealPoint size, const SizeUnit& unit)
! {
! 	SetSize(wxSize( (wxCoord) (SizeUnit::Convert(size.x, unit, Units::Point) * GetRes()) ,
! 			        (wxCoord) (SizeUnit::Convert(size.y, unit, Units::Point) * GetRes()) ));
  	
  }
  
! // Fixe la résolution.
! void BitmapProperties::SetRes(double dRes, const SizeUnit& unit)
  {
! 	SetRes(SizeUnit::Convert(dRes, unit, Units::Point));
  }
  
***************
*** 132,174 ****
  //////////////////////////////////////////////////////////////////////
  
  BEGIN_EVENT_TABLE(BitmapPropertiesDialog, wxDialog)
  END_EVENT_TABLE()
  
- 
- /** Type of size unit.*/
- static wxString s_strSizeUnit[]={
- "Point",
- "Millimeter",
- "Centimeter",
- "Meter",
- "Inch",
- "Twip",
- "Pixel"
- };
- 
- /** Type of resolution unit.*/
- static wxString s_strResUnit[]={
- "Pixel/Point",
- "Pixel/Millimeter",
- "Pixel/Centimeter",
- "Pixel/Meter",
- "Pixel/Inch",
- "Pixel/Twip",
- };
- 
- 
  // Standard constructor.
! BitmapPropertiesDialog::BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size):
! 	wxDialog(parent, id, title, pos, size)
  {
  	// Création des controles.
! 	m_pWidthTextCtrl  = new wxTextCtrl(this, -1, wxT("21.0"));
! 	m_pHeightTextCtrl = new wxTextCtrl(this, -1, wxT("29.7"));
! 	m_pUnitChoice     = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, 7, s_strSizeUnit);
! 	m_pSizeTextCtrl   = new wxStaticText(this, -1, wxT(""));
  
! 	m_pHResTextCtrl	  = new wxTextCtrl(this, -1, wxT("72.0"));
! 	m_pVResTextCtrl   = new wxTextCtrl(this, -1, wxT("72.0"));
! 	m_pResUnitChoice  = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, 6, s_strResUnit);
  
  	
--- 105,137 ----
  //////////////////////////////////////////////////////////////////////
  
+ #define ID_WIDTH_TEXT_CTRL		20
+ #define ID_HEIGHT_TEXT_CTRL		21
+ #define ID_UNIT_CHOICE			22
+ #define ID_SIZETEXT_CTRL		23
+ #define ID_RES_TEXT_CTRL		24
+ #define ID_RESUNIT_CHOICE		25
+ 
  BEGIN_EVENT_TABLE(BitmapPropertiesDialog, wxDialog)
+ 	EVT_INIT_DIALOG(BitmapPropertiesDialog::OnInitialUpdate)
+ 	
+ 	EVT_TEXT(ID_WIDTH_TEXT_CTRL, BitmapPropertiesDialog::OnSizeChanged)
+ 	EVT_TEXT(ID_HEIGHT_TEXT_CTRL, BitmapPropertiesDialog::OnSizeChanged)
+ 	
+ 	EVT_CHOICE(ID_UNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit)
+ 	EVT_CHOICE(ID_RESUNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit)
  END_EVENT_TABLE()
  
  // Standard constructor.
! BitmapPropertiesDialog::BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name):
! 	wxDialog(parent, id, title, pos, size, style, name)
  {
  	// Création des controles.
! 	m_pWidthTextCtrl  = new wxTextCtrl(this, ID_WIDTH_TEXT_CTRL, wxT("21.0"));
! 	m_pHeightTextCtrl = new wxTextCtrl(this, ID_HEIGHT_TEXT_CTRL, wxT("29.7"));
! 	m_pUnitChoice     = new wxChoice(this, ID_UNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL);
! 	m_pSizeTextCtrl   = new wxStaticText(this, ID_SIZETEXT_CTRL, wxT(""));
  
! 	m_pResTextCtrl	  = new wxTextCtrl(this, ID_RES_TEXT_CTRL, wxT("72.0"));
! 	m_pResUnitChoice  = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL);
  
  	
***************
*** 192,201 ****
  	// Zone de résolution
  	wxSizer* pResSizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Résolution"));
! 	pLineSizer = new wxGridSizer(2, 3, 8, 8);
! 	pLineSizer->Add(new wxStaticText(this, -1, wxT("Resolution X : ")), 0, wxEXPAND|wxALL, 4);
! 	pLineSizer->Add(m_pHResTextCtrl, 0, wxEXPAND|wxALL, 4);
! 	pLineSizer->AddStretchSpacer(1);
! 	pLineSizer->Add(new wxStaticText(this, -1, wxT("Resolution Y : ")), 0, wxEXPAND|wxALL, 4);
! 	pLineSizer->Add(m_pVResTextCtrl, 0, wxEXPAND|wxALL, 4);
  	pLineSizer->Add(m_pResUnitChoice, 0, wxEXPAND|wxALL, 4);
  	pResSizer->Add(pLineSizer, 0, wxEXPAND|wxALL, 4);
--- 155,161 ----
  	// Zone de résolution
  	wxSizer* pResSizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Résolution"));
! 	pLineSizer = new wxGridSizer(1, 3, 8, 8);
! 	pLineSizer->Add(new wxStaticText(this, -1, wxT("Resolution : ")), 0, wxEXPAND|wxALL, 4);
! 	pLineSizer->Add(m_pResTextCtrl, 0, wxEXPAND|wxALL, 4);
  	pLineSizer->Add(m_pResUnitChoice, 0, wxEXPAND|wxALL, 4);
  	pResSizer->Add(pLineSizer, 0, wxEXPAND|wxALL, 4);
***************
*** 208,209 ****
--- 168,272 ----
  }
  
+ // Mise à jour initiale.
+ void BitmapPropertiesDialog::OnInitialUpdate(wxInitDialogEvent& WXUNUSED(event))
+ {
+ 	long l, nb = sizeof(SizeUnits)/sizeof(SizeUnit);
+ 	
+ 	// Ajoute les unités de taille.
+ 	m_pUnitChoice->Append(wxT("Pixel"), (void*)NULL);
+ 	for(l=0; l<nb; l++)
+ 		m_pUnitChoice->Append(SizeUnits[l].name, (void*)&SizeUnits[l]);
+ 	m_pUnitChoice->SetSelection(0);
+ 
+ 	// Ajoute les unités de résolution.
+ 	for(l=0; l<nb; l++)
+ 		m_pResUnitChoice->Append(wxT("Pixel/") + SizeUnits[l].name, (void*)&SizeUnits[l]);
+ 	m_pResUnitChoice->SetSelection(3);
+ 	
+ 	UpdateCtrl();
+ }
+ 
+ // Met à jour les controles.
+ void BitmapPropertiesDialog::UpdateCtrl(bool bUpdateSize, bool bUpdateRes)
+ {
+ 	int id;
+ 	SizeUnit* pUnit;
+ 	
+ 	// Zone de taille.
+ 	if(bUpdateSize)
+ 	{
+ 		id = m_pUnitChoice->GetSelection();
+ 		if(id==wxNOT_FOUND || id==0)
+ 		{
+ 			m_pWidthTextCtrl->SetValue(wxString::Format(wxT("%d"),m_BmpProp.GetSize().x));
+ 			m_pHeightTextCtrl->SetValue(wxString::Format(wxT("%d"),m_BmpProp.GetSize().y));
+ 		}
+ 		else
+ 		{
+ 			pUnit = (SizeUnit*) m_pUnitChoice->GetClientData(id);
+ 			m_pWidthTextCtrl->SetValue(wxString::Format(wxT("%g"),m_BmpProp.GetSize(*pUnit).x));
+ 			m_pHeightTextCtrl->SetValue(wxString::Format(wxT("%g"),m_BmpProp.GetSize(*pUnit).y));
+ 		}
+ 	}
+ 	
+ 	// Zone de résolution.
+ 	if(bUpdateRes)
+ 	{
+ 		id = m_pResUnitChoice->GetSelection();
+ 		if(id==wxNOT_FOUND)
+ 		{
+ 			m_pResTextCtrl->SetValue(wxT("###"));
+ 		}
+ 		else
+ 		{
+ 			pUnit = (SizeUnit*) m_pResUnitChoice->GetClientData(id);
+ 			m_pResTextCtrl->SetValue(wxString::Format(wxT("%g"),m_BmpProp.GetRes(*pUnit)));
+ 		}
+ 	}
+ 	
+ 	//	Récapitulatif de taille.
+ 	m_pSizeTextCtrl->SetLabel(wxString::Format(wxT("%dx%d pixels - %gppp"), m_BmpProp.GetSize().x,m_BmpProp.GetSize().y, m_BmpProp.GetRes()));
+ 	
+ }
+ 
+ // Interception d'un changement d'unté d'affichage.
+ void BitmapPropertiesDialog::OnChangeUnit(wxCommandEvent& WXUNUSED(event))
+ {
+ 	UpdateCtrl();
+ }
+ 
+ // Interception d'un changement de taille.
+ void BitmapPropertiesDialog::OnSizeChanged(wxCommandEvent& WXUNUSED(event))
+ {
+ 	SizeUnit* pUnit;
+ 	int id = m_pUnitChoice->GetSelection();
+ 	
+ 	if(id==wxNOT_FOUND || id==0)
+ 	{
+ 		long lX, lY;
+ 		if(!m_pWidthTextCtrl->GetValue().ToLong(&lX, 0))
+ 			lX = m_BmpProp.GetSize().x;
+ 		if(!m_pHeightTextCtrl->GetValue().ToLong(&lY, 0))
+ 			lY = m_BmpProp.GetSize().y;
+ 		m_BmpProp.SetSize(wxSize(lX, lY));
+ 	}
+ 	else
+ 	{
+ 		double dX, dY;
+ 		pUnit = (SizeUnit*) m_pUnitChoice->GetClientData(id);
+ 		if(!m_pWidthTextCtrl->GetValue().ToDouble(&dX))
+ 			dX = m_BmpProp.GetSize(*pUnit).x;
+ 		if(!m_pHeightTextCtrl->GetValue().ToDouble(&dY))
+ 			dY = m_BmpProp.GetSize(*pUnit).y;
+ 		m_BmpProp.SetSize(wxRealPoint(dX, dY), *pUnit);
+ 	}
+ 
+ 	UpdateCtrl(false, true);
+ }
+ 
+ // Interception d'un changement de résolution.
+ void BitmapPropertiesDialog::OnResChanged(wxCommandEvent& event)
+ {
+ 	UpdateCtrl(true, false);
+ }
+ 

[Wxdevcenter-cvs] StdPlugin/src BitmapProp.cpp,NONE,1.1 BitmapDocView.cpp,1.27,1.28

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

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

Modified Files:
	BitmapDocView.cpp 
Added Files:
	BitmapProp.cpp 
Log Message:
BitmapProperties dialog box.

--- NEW FILE: BitmapProp.cpp ---
(This appears to be a binary file; contents omitted.)

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BitmapDocView.cpp	23 Aug 2005 15:44:30 -0000	1.27
--- BitmapDocView.cpp	24 Aug 2005 10:55:34 -0000	1.28
***************
*** 3,7 ****
   * @author Cursor
   *
!  * @brief Implémentation du type de documents "Image bitmap".
   */
  
--- 3,7 ----
   * @author Cursor
   *
!  * @brief Impl�mentation du type de documents "Image bitmap".
   */
  
***************
*** 9,12 ****
--- 9,14 ----
  #include <wxDevCenter/StdPlugin/BitmapDocView.h>
  
+ #include <wxDevCenter/StdPlugin/BitmapProp.h>
+ 
  #include <wxDevCenter/FileSystem.h>
  #include <wxDevCenter/DocView.h>
***************
*** 22,26 ****
  
  
! /** 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"),
                            WXDC_VIEWTYPE_IMAGE_STD_NAME, CLASSINFO(BitmapView), WXDC_VIEWTYPE_IMAGE_STD_DESCRIPT, wxT("filetypes/bmp"), CLASSINFO(BitmapMiniDoc));
--- 24,28 ----
  
  
! /** 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"),
                            WXDC_VIEWTYPE_IMAGE_STD_NAME, CLASSINFO(BitmapView), WXDC_VIEWTYPE_IMAGE_STD_DESCRIPT, wxT("filetypes/bmp"), CLASSINFO(BitmapMiniDoc));
***************
*** 28,36 ****
  
  
! /** 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.*/
  void BitmapDrawLine(wxBitmap& bmp, wxPoint pos1, wxPoint pos2, const wxPen& pen)
  {
--- 30,38 ----
  
  
! /** 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.*/
  void BitmapDrawLine(wxBitmap& bmp, wxPoint pos1, wxPoint pos2, const wxPen& pen)
  {
***************
*** 44,48 ****
  }
  
! /** Fonction de tracé de rectangle dans une bitmap.*/
  void BitmapDrawRectangle(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
--- 46,50 ----
  }
  
! /** Fonction de trac� de rectangle dans une bitmap.*/
  void BitmapDrawRectangle(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
***************
*** 58,62 ****
  }
  
! /** Fonction de tracé de rectangle arrondi dans une bitmap.*/
  void BitmapDrawRoundedRectangle(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
--- 60,64 ----
  }
  
! /** Fonction de trac� de rectangle arrondi dans une bitmap.*/
  void BitmapDrawRoundedRectangle(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
***************
*** 72,76 ****
  }
  
! /** Fonction de tracé d'ellipse dans une bitmap.*/
  void BitmapDrawEllipse(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
--- 74,78 ----
  }
  
! /** Fonction de trac� d'ellipse dans une bitmap.*/
  void BitmapDrawEllipse(wxBitmap& bmp, wxRect r, const wxPen& pen, const wxBrush& brush)
  {
***************
*** 354,358 ****
  
  //////////////////////////////////////////////////////////////////////
! //  BitmapAction et associées.
  //////////////////////////////////////////////////////////////////////
  
--- 356,360 ----
  
  //////////////////////////////////////////////////////////////////////
! //  BitmapAction et associ�es.
  //////////////////////////////////////////////////////////////////////
  
***************
*** 362,366 ****
   */
  
! // Demande de sauvegarder une partie de l'image passée en paramètre.
  void action::Drawing::SetBuffer(const wxBitmap& bmp, wxRect r)
  {
--- 364,368 ----
   */
  
! // Demande de sauvegarder une partie de l'image pass�e en param�tre.
  void action::Drawing::SetBuffer(const wxBitmap& bmp, wxRect r)
  {
***************
*** 405,409 ****
  }
  
! // Donner un nom à la commande.
  wxString action::LineDrawing::GetName()
  {
--- 407,411 ----
  }
  
! // Donner un nom � la commande.
  wxString action::LineDrawing::GetName()
  {
***************
*** 454,458 ****
  }
  
! // Donner un nom à la commande.
  wxString action::SimpleDrawing::GetName()
  {
--- 456,460 ----
  }
  
! // Donner un nom � la commande.
  wxString action::SimpleDrawing::GetName()
  {
***************
*** 631,634 ****
--- 633,640 ----
      if(!ActionDocument::OnNewDocument())
          return false;
+ 
+ 	BitmapPropertiesDialog Dialog(NULL, -1, wxT("New bitmap"));
+ 	Dialog.ShowModal();
+ 
      m_Bmp.Create(40, 40, 24);
      ClearCommands();
***************
*** 747,751 ****
  }
  
! // Fixe une nouvelle sélection.
  void BitmapDocument::SetSelection(const wxBitmap& bmp, wxPoint pos)
  {
--- 753,757 ----
  }
  
! // Fixe une nouvelle s�lection.
  void BitmapDocument::SetSelection(const wxBitmap& bmp, wxPoint pos)
  {
***************
*** 754,758 ****
  }
  
! // Déplace la sélection à un endroit donné.
  void BitmapDocument::SetSelectionPosition(wxPoint pos)
  {
--- 760,764 ----
  }
  
! // D�place la s�lection � un endroit donn�.
  void BitmapDocument::SetSelectionPosition(wxPoint pos)
  {
***************
*** 760,764 ****
  }
  
! // Sélectionne une partie de l'image.
  void BitmapDocument::Select(wxRect r, const wxBrush brush)
  {
--- 766,770 ----
  }
  
! // S�lectionne une partie de l'image.
  void BitmapDocument::Select(wxRect r, const wxBrush brush)
  {
***************
*** 766,770 ****
  }
  
! // Désélectionne.
  void BitmapDocument::Deselect()
  {
--- 772,776 ----
  }
  
! // D�s�lectionne.
  void BitmapDocument::Deselect()
  {
***************
*** 772,776 ****
  }
  
! // Déplace la sélection.
  void BitmapDocument::MoveSelection(wxPoint pos)
  {
--- 778,782 ----
  }
  
! // D�place la s�lection.
  void BitmapDocument::MoveSelection(wxPoint pos)
  {
***************
*** 778,782 ****
  }
  
! // Déplace la sélection.
  void BitmapDocument::MoveSelection(wxSize offset)
  {
--- 784,788 ----
  }
  
! // D�place la s�lection.
  void BitmapDocument::MoveSelection(wxSize offset)
  {
***************
*** 784,788 ****
  }
  
! // Déplace la sélection de la valeur de l'offset et réinitialise l'offset.
  void BitmapDocument::MoveSelection()
  {
--- 790,794 ----
  }
  
! // D�place la s�lection de la valeur de l'offset et r�initialise l'offset.
  void BitmapDocument::MoveSelection()
  {
***************
*** 792,796 ****
  }
  
! // Colle la sélection à l'endoit où elle se trouve, offset compris.
  void BitmapDocument::PasteSelection()
  {
--- 798,802 ----
  }
  
! // Colle la s�lection � l'endoit o� elle se trouve, offset compris.
  void BitmapDocument::PasteSelection()
  {
***************
*** 799,803 ****
  
  
! // Copier la sélection vers le presse-papiers.
  bool BitmapDocument::CopyToClipboard()
  {
--- 805,809 ----
  
  
! // Copier la s�lection vers le presse-papiers.
  bool BitmapDocument::CopyToClipboard()
  {
***************
*** 812,816 ****
  }
  
! // Couper la sélection vers le presse-papiers.
  bool BitmapDocument::CutToClipboard()
  {
--- 818,822 ----
  }
  
! // Couper la s�lection vers le presse-papiers.
  bool BitmapDocument::CutToClipboard()
  {
***************
*** 826,830 ****
  }
  
! // Coller le contenu du presse-papiers dans la sélection.
  bool BitmapDocument::PasteFromClipboard()
  {
--- 832,836 ----
  }
  
! // Coller le contenu du presse-papiers dans la s�lection.
  bool BitmapDocument::PasteFromClipboard()
  {
***************
*** 847,851 ****
  }
  
! // Interception de l'évènement de coupage vers le presse-papiers.
  void BitmapDocument::OnCutToClipboard(wxCommandEvent& WXUNUSED(event))
  {
--- 853,857 ----
  }
  
! // Interception de l'�v�nement de coupage vers le presse-papiers.
  void BitmapDocument::OnCutToClipboard(wxCommandEvent& WXUNUSED(event))
  {
***************
*** 853,857 ****
  }
  
! // Interception de l'évènement de copiage vers le presse-papiers.
  void BitmapDocument::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
  {
--- 859,863 ----
  }
  
! // Interception de l'�v�nement de copiage vers le presse-papiers.
  void BitmapDocument::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
  {
***************
*** 859,863 ****
  }
  
! // Interception de l'évènement de collage vers le presse-papiers.
  void BitmapDocument::OnPasteFromClipboard(wxCommandEvent& WXUNUSED(event))
  {
--- 865,869 ----
  }
  
! // Interception de l'�v�nement de collage vers le presse-papiers.
  void BitmapDocument::OnPasteFromClipboard(wxCommandEvent& WXUNUSED(event))
  {
***************
*** 865,869 ****
  }
  
! // Interception de la mise à jour des menu d'envoi vers le presse-papiers.
  void BitmapDocument::OnUpdateSendToClipboard(wxUpdateUIEvent& event)
  {
--- 871,875 ----
  }
  
! // Interception de la mise � jour des menu d'envoi vers le presse-papiers.
  void BitmapDocument::OnUpdateSendToClipboard(wxUpdateUIEvent& event)
  {
***************
*** 871,875 ****
  }
  
! // Interception de la mise à jour des menus de reception depuis le presse-papiers.
  void BitmapDocument::OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
  {
--- 877,881 ----
  }
  
! // Interception de la mise � jour des menus de reception depuis le presse-papiers.
  void BitmapDocument::OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
  {
***************
*** 1011,1015 ****
  
  
! // Création de la barre d'outil.
  wxToolBar* BitmapView::CreateToolBar()
  {
--- 1017,1021 ----
  
  
! // Cr�ation de la barre d'outil.
  wxToolBar* BitmapView::CreateToolBar()
  {
***************
*** 1123,1127 ****
  
  
! // Intercepte le changement de couleur de la sélection gauche.
  void BitmapView::OnSelLeftColourChanged(wxCommandEvent& event)
  {
--- 1129,1133 ----
  
  
! // Intercepte le changement de couleur de la s�lection gauche.
  void BitmapView::OnSelLeftColourChanged(wxCommandEvent& event)
  {
***************
*** 1131,1135 ****
  }
  
! // Intercepte le changement de couleur de la sélection droite.
  void BitmapView::OnSelRightColourChanged(wxCommandEvent& event)
  {
--- 1137,1141 ----
  }
  
! // Intercepte le changement de couleur de la s�lection droite.
  void BitmapView::OnSelRightColourChanged(wxCommandEvent& event)
  {
***************
*** 1139,1143 ****
  }
  
! // Création de la barre de pinceau.
  wxPanel* BitmapView::CreatePenBar()
  {
--- 1145,1149 ----
  }
  
! // Cr�ation de la barre de pinceau.
  wxPanel* BitmapView::CreatePenBar()
  {
***************
*** 1171,1175 ****
  }
  
! // Interception de la sélection d'un outil.
  void BitmapView::OnPenStyle(wxCommandEvent& event)
  {
--- 1177,1181 ----
  }
  
! // Interception de la s�lection d'un outil.
  void BitmapView::OnPenStyle(wxCommandEvent& event)
  {
***************
*** 1218,1222 ****
  
  
! // Interception d'un déplacement de souris (non drag).
  void BitmapView::OnLeftMove(wxExtendedMouseEvent& event)
  {
--- 1224,1228 ----
  
  
! // Interception d'un d�placement de souris (non drag).
  void BitmapView::OnLeftMove(wxExtendedMouseEvent& event)
  {
***************
*** 1341,1345 ****
  }
  
! // Interception d'un début de drag gauche.
  void BitmapView::OnLeftDragStart(wxExtendedMouseEvent& event)
  {
--- 1347,1351 ----
  }
  
! // Interception d'un d�but de drag gauche.
  void BitmapView::OnLeftDragStart(wxExtendedMouseEvent& event)
  {
***************
*** 1368,1372 ****
      case BVD_SELMOVE:
          m_pBitmapCtrl->ClearSaveBitmap();
!         // Si pas de buffer alors annuler le déplacement
          if(!GetDocument()->HasSelection())
          {
--- 1374,1378 ----
      case BVD_SELMOVE:
          m_pBitmapCtrl->ClearSaveBitmap();
!         // Si pas de buffer alors annuler le d�placement
          if(!GetDocument()->HasSelection())
          {
***************
*** 1374,1378 ****
              break;
          }
!         // Si souris en dehors du buffer alors pas de déplacement.
          m_pt = m_pBitmapCtrl->ClientToBitmap(event.GetFromPos());
          if(!GetDocument()->GetSelectionRect().Inside(m_pt))
--- 1380,1384 ----
              break;
          }
!         // Si souris en dehors du buffer alors pas de d�placement.
          m_pt = m_pBitmapCtrl->ClientToBitmap(event.GetFromPos());
          if(!GetDocument()->GetSelectionRect().Inside(m_pt))
***************
*** 1385,1389 ****
          GetDocument()->SetSelectionOffset(wxPoint(0,0));
  
!         // Colle le buffer si ctrl est appuyé.
          if(event.CtrlIsDown())
              GetDocument()->PasteSelection();
--- 1391,1395 ----
          GetDocument()->SetSelectionOffset(wxPoint(0,0));
  
!         // Colle le buffer si ctrl est appuy�.
          if(event.CtrlIsDown())
              GetDocument()->PasteSelection();
***************
*** 1443,1447 ****
          r =  m_pBitmapCtrl->ClientToBitmap(wxRect(event.GetFromPos(), event.GetToPos()));
          GetDocument()->Select(r, m_Brush);
!         // Passe en "Déplacement de sélection"
          ChangeTool(BVD_SELMOVE);
          break;
--- 1449,1453 ----
          r =  m_pBitmapCtrl->ClientToBitmap(wxRect(event.GetFromPos(), event.GetToPos()));
          GetDocument()->Select(r, m_Brush);
!         // Passe en "D�placement de s�lection"
          ChangeTool(BVD_SELMOVE);
          break;
***************
*** 1511,1515 ****
  }
  
! // Interception de la sélection d'un outil.
  void BitmapView::OnTool(wxCommandEvent& event)
  {
--- 1517,1521 ----
  }
  
! // Interception de la s�lection d'un outil.
  void BitmapView::OnTool(wxCommandEvent& event)
  {
***************
*** 1518,1522 ****
  
  
! // Supprime la sélection.
  void BitmapView::RemoveSelection()
  {
--- 1524,1528 ----
  
  
! // Supprime la s�lection.
  void BitmapView::RemoveSelection()
  {
***************
*** 1525,1537 ****
  }
  
! // Sélectionne la totalité de la bitmap.
  void BitmapView::SelectAll()
  {
!     /** @todo Faire la sélection totale.*/
  }
  
  
  
! // Mise à jour de tout ou partie du controle de bitmap.
  void BitmapView::UpdateBitmapContent(const wxRegion& region)
  {
--- 1531,1543 ----
  }
  
! // S�lectionne la totalit� de la bitmap.
  void BitmapView::SelectAll()
  {
!     /** @todo Faire la s�lection totale.*/
  }
  
  
  
! // Mise � jour de tout ou partie du controle de bitmap.
  void BitmapView::UpdateBitmapContent(const wxRegion& region)
  {
***************
*** 1544,1548 ****
  }
  
! // Mise à jour de tout ou partie du controle de bitmap.
  void BitmapView::UpdateBitmapContent(wxRect rect)
  {
--- 1550,1554 ----
  }
  
! // Mise � jour de tout ou partie du controle de bitmap.
  void BitmapView::UpdateBitmapContent(wxRect rect)
  {
***************
*** 1561,1565 ****
              wxRect rSel = GetDocument()->GetSelectionRect();
              rSel.Offset(GetDocument()->GetSelectionOffset());
!             // On redessine toutes les régions à repeindre sans la zone de sélection (offset compris).
              wxRegion region(rect);
              region.Subtract(rSel);
--- 1567,1571 ----
              wxRect rSel = GetDocument()->GetSelectionRect();
              rSel.Offset(GetDocument()->GetSelectionOffset());
!             // On redessine toutes les r�gions � repeindre sans la zone de s�lection (offset compris).
              wxRegion region(rect);
              region.Subtract(rSel);
***************
*** 1572,1576 ****
                  RegIter++;
              }
!             // On redessine la sélection si besoin est.
              rect = rect.Intersect(rSel);
              if(!rect.IsEmpty())
--- 1578,1582 ----
                  RegIter++;
              }
!             // On redessine la s�lection si besoin est.
              rect = rect.Intersect(rSel);
              if(!rect.IsEmpty())
***************
*** 1597,1601 ****
  }
  
! // Interception de la mise à jour des workbar.
  void BitmapView::OnUpdateWorkBar(wxUpdateUIEvent& event)
  {
--- 1603,1607 ----
  }
  
! // Interception de la mise � jour des workbar.
  void BitmapView::OnUpdateWorkBar(wxUpdateUIEvent& event)
  {
***************
*** 1635,1639 ****
  }
  
! /** Crée une MiniVue.*/
  wxDevCenter::MiniView* BitmapMiniDoc::CreateMiniView(wxWindow* pParent, wxWindowID id)
  {
--- 1641,1645 ----
  }
  
! /** Cr�e une MiniVue.*/
  wxDevCenter::MiniView* BitmapMiniDoc::CreateMiniView(wxWindow* pParent, wxWindowID id)
  {
***************
*** 1641,1645 ****
  }
  
! /** Retourne une copie de l'image éventuellement étirée.*/
  wxImage BitmapMiniDoc::GetImage(int cx, int cy)const
  {
--- 1647,1651 ----
  }
  
! /** Retourne une copie de l'image �ventuellement �tir�e.*/
  wxImage BitmapMiniDoc::GetImage(int cx, int cy)const
  {
***************
*** 1677,1681 ****
  }
  
! /** Interception de l'évènement de redimmensionnement de la fenêtre.*/
  void BitmapMiniView::OnResize(wxSizeEvent &event)
  {
--- 1683,1687 ----
  }
  
! /** Interception de l'�v�nement de redimmensionnement de la fen�tre.*/
  void BitmapMiniView::OnResize(wxSizeEvent &event)
  {
***************
*** 1690,1694 ****
  }
  
! /** Interception de l'évènement de rafraichissement de la fenêtre.*/
  void BitmapMiniView::OnPaint(wxPaintEvent& WXUNUSED(event))
  {
--- 1696,1700 ----
  }
  
! /** Interception de l'�v�nement de rafraichissement de la fen�tre.*/
  void BitmapMiniView::OnPaint(wxPaintEvent& WXUNUSED(event))
  {
***************
*** 1714,1718 ****
  }
  
! /** Mise à jour après modification du fichier.*/
  void BitmapMiniView::OnUpdate()
  {
--- 1720,1724 ----
  }
  
! /** Mise � jour apr�s modification du fichier.*/
  void BitmapMiniView::OnUpdate()
  {

[Wxdevcenter-cvs] StdPlugin/include/wxDevCenter/StdPlugin BitmapProp.h,NONE,1.1

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

Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31681/include/wxDevCenter/StdPlugin

Added Files:
	BitmapProp.h 
Log Message:
BitmapProperties dialog box.

--- NEW FILE: BitmapProp.h ---
(This appears to be a binary file; contents omitted.)

[Wxdevcenter-cvs] StdPlugin/build install.bkl,1.5,1.6 StdPlugin.bkl,1.3,1.4

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

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

Modified Files:
	install.bkl StdPlugin.bkl 
Log Message:
BitmapProperties dialog box.

Index: install.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install.bkl	23 Aug 2005 15:44:31 -0000	1.5
--- install.bkl	24 Aug 2005 10:55:35 -0000	1.6
***************
*** 12,15 ****
--- 12,16 ----
              StdPlugin/BitmapCtrl.h
              StdPlugin/BitmapDocView.h
+             StdPlugin/BitmapProp.h
              StdPlugin/Controls.h
              StdPlugin/extmouse.h

Index: StdPlugin.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/build/StdPlugin.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StdPlugin.bkl	22 Aug 2005 17:52:23 -0000	1.3
--- StdPlugin.bkl	24 Aug 2005 10:55:35 -0000	1.4
***************
*** 46,49 ****
--- 46,50 ----
              src/BitmapCtrl.cpp
              src/BitmapDocView.cpp
+             src/BitmapProp.cpp
              src/Controls.cpp
              src/extmouse.cpp

[Wxdevcenter-cvs] StdPlugin GNUmakefile,1.5,1.6

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

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

Modified Files:
	GNUmakefile 
Log Message:
BitmapProperties dialog box.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GNUmakefile	23 Aug 2005 15:44:32 -0000	1.5
--- GNUmakefile	24 Aug 2005 10:55:34 -0000	1.6
***************
*** 73,76 ****
--- 73,77 ----
  	./build/$(BUILD)/Bitmap_BitmapCtrl.o \
  	./build/$(BUILD)/Bitmap_BitmapDocView.o \
+ 	./build/$(BUILD)/Bitmap_BitmapProp.o \
  	./build/$(BUILD)/Bitmap_Controls.o \
  	./build/$(BUILD)/Bitmap_extmouse.o
***************
*** 138,142 ****
  install: all install_Text install_Bitmap
  	$(INSTALL) -d $(prefix)/include/wxDevCenter
! 	for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/SimpleTextDocView.h; do \
  	if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \
--- 139,143 ----
  install: all install_Text install_Bitmap
  	$(INSTALL) -d $(prefix)/include/wxDevCenter
! 	for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/BitmapProp.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/SimpleTextDocView.h; do \
  	if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \
***************
*** 211,214 ****
--- 212,218 ----
  	$(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $<
  
+ ./build/$(BUILD)/Bitmap_BitmapProp.o: ./src/BitmapProp.cpp
+ 	$(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $<
+ 
  ./build/$(BUILD)/Bitmap_Controls.o: ./src/Controls.cpp
  	$(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $<

[Wxdevcenter-cvs] StdPlugin/conf StdPlugin.Text.conf,NONE,1.1 Text.conf,1.2,NONE

[Andreas T. <cor...@us...>]

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

Added Files:
	StdPlugin.Text.conf 
Removed Files:
	Text.conf 
Log Message:
One more renaming.

--- NEW FILE: StdPlugin.Text.conf ---
name00=
name01=Text
name02=Python
name03=CPP
name04=HTML
name05=XML
name06=Perl
name07=SQL
name08=Visual-Basic
name09=Properties
name10=Error-list
name11=Makefile
name12=Batch
name13=XCode
name14=LaTeX
name15=LUA
name16=Diff
name17=Config
name18=Pascal
name19=AVE
name20=ADA
name21=Lisp
name22=Ruby
name23=Eiffel
name24=EiffelKW
name25=TCL
name26=NN-Cron-Table
name27=Bullant
name28=Visual-Basic-Script
name29=ASP
name30=PHP
name31=BAAM
name32=MATLab
name33=Scriptol
name34=ASM
name35=CPP-no-case
name36=Fortran
name37=F77
name38=CSS
name39=POV
name40=LOUT
name41=ESCRIPT
name42=PS
name43=NSIS
name44=MMIXAL
name45=CLW
name46=CLW-no-case
name47=LOT
name48=YAML
name49=TeX
name50=METAPOST
name51=Power-Basic
name52=FORTH
name53=ERLANG
name54=Octave
name55=MS-SQL
name56=Verilog
name57=KIX
name58=GUI2CLI
name59=SPECMAN
name60=AU3
name61=APDL
name62=BASH

--- Text.conf DELETED ---

[Wxdevcenter-cvs] StdPlugin/conf/Text GUI2CLI.conf,1.2,NONE Makefile.conf,1.2,NONE Visual-Basic-Script.conf,1.1,NONE CLW-no-case.conf,1.1,NONE CPP-no-case.conf,1.1,NONE KIX.conf,1.2,NONE Config.conf,1.2,NONE NN-Cron-Table.conf,1.1,NONE Perl.conf,1.2,NONE Pascal.conf,1.2,NONE Ruby.conf,1.2,NONE ASP.conf,1.2,NONE YAML.conf,1.2,NONE BAAM.conf,1.2,NONE EiffelKW.conf,1.2,NONE FORTH.conf,1.2,NONE Lisp.conf,1.2,NONE SPECMAN.conf,1.2,NONE ERLANG.conf,1.2,NONE Verilog.conf,1.2,NONE MATLab.conf,1.2,NONE BASH.conf,1.2,NONE LaTeX.conf,1.2,NONE Power-Basic.conf,1.1,NONE POV.conf,1.2,NONE ADA.conf,1.2,NONE XML.conf,1.2,NONE Eiffel.conf,1.2,NONE AU3.conf,1.2,NONE Text.conf,1.2,NONE XCode.conf,1.2,NONE HTML.conf,1.2,NONE Diff.conf,1.2,NONE Visual-Basic.conf,1.1,NONE AVE.conf,1.2,NONE MS-SQL.conf,1.2,NONE Batch.conf,1.2,NONE MMIXAL.conf,1.2,NONE Fortran.conf,1.2,NONE LOT.conf,1.2,NONE CSS.conf,1.2,NONE LOUT.conf,1.2,NONE Properties.conf,1.2,NONE APDL.conf,1.2,NONE NSIS.conf,1.2,NONE PHP.conf,1.2,NONE METAPOST.conf,1.2,NONE F77.conf,1.2,NONE Scriptol.conf,1.2,NONE ASM.conf,1.2,NONE SQL.conf,1.2,NONE PS.conf,1.2,NONE .conf,1.2,NONE Python.conf,1.2,NONE Bullant.conf,1.2,NONE TeX.conf,1.2,NONE Error-list.conf,1.1,NONE Octave.conf,1.2,NONE TCL.conf,1.2,NONE ESCRIPT.conf,1.2,NONE CPP.conf,1.2,NONE CLW.conf,1.2,NONE LUA.conf,1.2,NONE

[Andreas T. <cor...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/conf/Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22669/conf/Text

Removed Files:
	GUI2CLI.conf Makefile.conf Visual-Basic-Script.conf 
	CLW-no-case.conf CPP-no-case.conf KIX.conf Config.conf 
	NN-Cron-Table.conf Perl.conf Pascal.conf Ruby.conf ASP.conf 
	YAML.conf BAAM.conf EiffelKW.conf FORTH.conf Lisp.conf 
	SPECMAN.conf ERLANG.conf Verilog.conf MATLab.conf BASH.conf 
	LaTeX.conf Power-Basic.conf POV.conf ADA.conf XML.conf 
	Eiffel.conf AU3.conf Text.conf XCode.conf HTML.conf Diff.conf 
	Visual-Basic.conf AVE.conf MS-SQL.conf Batch.conf MMIXAL.conf 
	Fortran.conf LOT.conf CSS.conf LOUT.conf Properties.conf 
	APDL.conf NSIS.conf PHP.conf METAPOST.conf F77.conf 
	Scriptol.conf ASM.conf SQL.conf PS.conf .conf Python.conf 
	Bullant.conf TeX.conf Error-list.conf Octave.conf TCL.conf 
	ESCRIPT.conf CPP.conf CLW.conf LUA.conf 
Log Message:
Forgot to change directory name...

--- FORTH.conf DELETED ---

--- TCL.conf DELETED ---

--- TeX.conf DELETED ---

--- MS-SQL.conf DELETED ---

--- .conf DELETED ---

--- CSS.conf DELETED ---

--- AU3.conf DELETED ---

--- Visual-Basic.conf DELETED ---

--- SQL.conf DELETED ---

--- XML.conf DELETED ---

--- NSIS.conf DELETED ---

--- Pascal.conf DELETED ---

--- ASM.conf DELETED ---

--- CLW.conf DELETED ---

--- Lisp.conf DELETED ---

--- Power-Basic.conf DELETED ---

--- EiffelKW.conf DELETED ---

--- Ruby.conf DELETED ---

--- LaTeX.conf DELETED ---

--- MATLab.conf DELETED ---

--- APDL.conf DELETED ---

--- BAAM.conf DELETED ---

--- ERLANG.conf DELETED ---

--- Diff.conf DELETED ---

--- Error-list.conf DELETED ---

--- ASP.conf DELETED ---

--- BASH.conf DELETED ---

--- Eiffel.conf DELETED ---

--- Fortran.conf DELETED ---

--- Scriptol.conf DELETED ---

--- F77.conf DELETED ---

--- Makefile.conf DELETED ---

--- LUA.conf DELETED ---

--- Verilog.conf DELETED ---

--- METAPOST.conf DELETED ---

--- CLW-no-case.conf DELETED ---

--- Perl.conf DELETED ---

--- Visual-Basic-Script.conf DELETED ---

--- YAML.conf DELETED ---

--- Batch.conf DELETED ---

--- ESCRIPT.conf DELETED ---

--- Python.conf DELETED ---

--- Properties.conf DELETED ---

--- Bullant.conf DELETED ---

--- AVE.conf DELETED ---

--- CPP-no-case.conf DELETED ---

--- PHP.conf DELETED ---

--- HTML.conf DELETED ---

--- GUI2CLI.conf DELETED ---

--- Octave.conf DELETED ---

--- NN-Cron-Table.conf DELETED ---

--- POV.conf DELETED ---

--- CPP.conf DELETED ---

--- LOUT.conf DELETED ---

--- ADA.conf DELETED ---

--- SPECMAN.conf DELETED ---

--- LOT.conf DELETED ---

--- KIX.conf DELETED ---

--- Config.conf DELETED ---

--- PS.conf DELETED ---

--- XCode.conf DELETED ---

--- Text.conf DELETED ---

--- MMIXAL.conf DELETED ---

[Wxdevcenter-cvs] StdPlugin/conf/StdPlugin.Text CPP-no-case.conf,NONE,1.1 POV.conf,NONE,1.1 NN-Cron-Table.conf,NONE,1.1 Diff.conf,NONE,1.1 CPP.conf,NONE,1.1 XCode.conf,NONE,1.1 LUA.conf,NONE,1.1 F77.conf,NONE,1.1 Scriptol.conf,NONE,1.1 ASP.conf,NONE,1.1 TeX.conf,NONE,1.1 Config.conf,NONE,1.1 Pascal.conf,NONE,1.1 MS-SQL.conf,NONE,1.1 ESCRIPT.conf,NONE,1.1 BAAM.conf,NONE,1.1 TCL.conf,NONE,1.1 CLW.conf,NONE,1.1 SPECMAN.conf,NONE,1.1 NSIS.conf,NONE,1.1 Eiffel.conf,NONE,1.1 Octave.conf,NONE,1.1 MATLab.conf,NONE,1.1 Perl.conf,NONE,1.1 ASM.conf,NONE,1.1 Ruby.conf,NONE,1.1 Batch.conf,NONE,1.1 CSS.conf,NONE,1.1 BASH.conf,NONE,1.1 Makefile.conf,NONE,1.1 LaTeX.conf,NONE,1.1 Visual-Basic-Script.conf,NONE,1.1 Lisp.conf,NONE,1.1 METAPOST.conf,NONE,1.1 Error-list.conf,NONE,1.1 SQL.conf,NONE,1.1 .conf,NONE,1.1 Python.conf,NONE,1.1 GUI2CLI.conf,NONE,1.1 AVE.conf,NONE,1.1 EiffelKW.conf,NONE,1.1 APDL.conf,NONE,1.1 CLW-no-case.conf,NONE,1.1 AU3.conf,NONE,1.1 PHP.conf,NONE,1.1 PS.conf,NONE,1.1 KIX.conf,NONE,1.1 MMIXAL.conf,NONE,1.1 Fortran.conf,NONE,1.1 FORTH.conf,NONE,1.1 Visual-Basic.conf,NONE,1.1 Text.conf,NONE,1.1 YAML.conf,NONE,1.1 Verilog.conf,NONE,1.1 XML.conf,NONE,1.1 ERLANG.conf,NONE,1.1 Properties.conf,NONE,1.1 LOUT.conf,NONE,1.1 LOT.conf,NONE,1.1 HTML.conf,NONE,1.1 Power-Basic.conf,NONE,1.1 Bullant.conf,NONE,1.1 ADA.conf,NONE,1.1

[Andreas T. <cor...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/conf/StdPlugin.Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22669/conf/StdPlugin.Text

Added Files:
	CPP-no-case.conf POV.conf NN-Cron-Table.conf Diff.conf 
	CPP.conf XCode.conf LUA.conf F77.conf Scriptol.conf ASP.conf 
	TeX.conf Config.conf Pascal.conf MS-SQL.conf ESCRIPT.conf 
	BAAM.conf TCL.conf CLW.conf SPECMAN.conf NSIS.conf Eiffel.conf 
	Octave.conf MATLab.conf Perl.conf ASM.conf Ruby.conf 
	Batch.conf CSS.conf BASH.conf Makefile.conf LaTeX.conf 
	Visual-Basic-Script.conf Lisp.conf METAPOST.conf 
	Error-list.conf SQL.conf .conf Python.conf GUI2CLI.conf 
	AVE.conf EiffelKW.conf APDL.conf CLW-no-case.conf AU3.conf 
	PHP.conf PS.conf KIX.conf MMIXAL.conf Fortran.conf FORTH.conf 
	Visual-Basic.conf Text.conf YAML.conf Verilog.conf XML.conf 
	ERLANG.conf Properties.conf LOUT.conf LOT.conf HTML.conf 
	Power-Basic.conf Bullant.conf ADA.conf 
Log Message:
Forgot to change directory name...

--- NEW FILE: FORTH.conf ---
name=FORTH

--- NEW FILE: TCL.conf ---
name=TCL

--- NEW FILE: TeX.conf ---
name=TeX

--- NEW FILE: MS-SQL.conf ---
name=MS-SQL

--- NEW FILE: .conf ---
name=

--- NEW FILE: CSS.conf ---
name=CSS Stylesheet


--- NEW FILE: AU3.conf ---
name=AU3

--- NEW FILE: Visual-Basic.conf ---
name=Visual Basic

--- NEW FILE: SQL.conf ---
name=SQL

--- NEW FILE: XML.conf ---
name=XML

--- NEW FILE: NSIS.conf ---
name=NSIS

--- NEW FILE: Pascal.conf ---
name=Pascal

--- NEW FILE: ASM.conf ---
name=ASM

--- NEW FILE: CLW.conf ---
name=CLW

--- NEW FILE: Lisp.conf ---
name=Lisp

--- NEW FILE: Power-Basic.conf ---
name=Power Basic

--- NEW FILE: EiffelKW.conf ---
name=EiffelKW

--- NEW FILE: Ruby.conf ---
name=Ruby

--- NEW FILE: LaTeX.conf ---
name=LaTeX

--- NEW FILE: MATLab.conf ---
name=MATLab

--- NEW FILE: APDL.conf ---
name=APDL

--- NEW FILE: BAAM.conf ---
name=BAAM

--- NEW FILE: ERLANG.conf ---
name=ERLANG

--- NEW FILE: Diff.conf ---
name=Diff

--- NEW FILE: Error-list.conf ---
name=Error list

--- NEW FILE: ASP.conf ---
name=ASP

--- NEW FILE: BASH.conf ---
name=BASH

--- NEW FILE: Eiffel.conf ---
name=Eiffel

--- NEW FILE: Fortran.conf ---
name=Fortran

--- NEW FILE: Scriptol.conf ---
name=Scriptol

--- NEW FILE: F77.conf ---
name=F77

--- NEW FILE: Makefile.conf ---
name=Makefile

--- NEW FILE: LUA.conf ---
folds=7
name=LUA

[keywords00]
keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while
keyname=LUA language keywords
[keywords01]
keywords=_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring print tonumber tostring type unpack _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype rawget rawset require sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall rawegal rawget rawset require setfenv setmetatable xpcall string table math coroutine io os debug
keyname=LUA debug keywords
[keywords02]
keywords=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 max min mod rad random randomseed sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan string.byte string.char string.dump string.find string.len string.lower string.rep string.sub string.upper string.format string.gfind string.gsub table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan
keyname=Mathematics keywords
[keywords03]
keywords=openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname read write clock date difftime execute exit getenv setlocale time coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname
keyname=IO keywords
[keywords04]
keywords=
keyname=
[keywords05]
keywords=
keyname=
[keywords06]
keywords=
keyname=
[keywords07]
keywords=
keyname=
[keywords08]
keywords=
keyname=

[style00]
used=1
style-label=Default
fore=BLACK
[style01]
used=1
style-label=Comment
fore=FOREST GREEN
[style02]
used=1
style-label=Line comment
fore=FOREST GREEN
[style03]
used=1
style-label=Doc comment
fore=FOREST GREEN
[style04]
used=1
style-label=Number
fore=VIOLET
[style06]
used=1
style-label=Word
fore=BLUE
[style07]
used=1
style-label=String
fore=VIOLET
[style08]
used=1
style-label=Character
fore=VIOLET
[style09]
used=1
style-label=Literal string
fore=VIOLET
[style10]
used=1
style-label=Preprocessor
fore=BLUE
[style11]
used=1
style-label=Operator
fore=BLACK
[style12]
used=1
style-label=Identifier
fore=BLACK
[style13]
used=1
style-label=End of line not closed string
fore=VIOLET

--- NEW FILE: Verilog.conf ---
name=Verilog

--- NEW FILE: METAPOST.conf ---
name=METAPOST

--- NEW FILE: CLW-no-case.conf ---
name=CLW no case

--- NEW FILE: Perl.conf ---
name=Perl

--- NEW FILE: Visual-Basic-Script.conf ---
name=Visual Basic Script

--- NEW FILE: YAML.conf ---
name=YAML

--- NEW FILE: Batch.conf ---
name=Batch

--- NEW FILE: ESCRIPT.conf ---
name=ESCRIPT

--- NEW FILE: Python.conf ---
name=Python

--- NEW FILE: Properties.conf ---
name=Properties

--- NEW FILE: Bullant.conf ---
name=Bullant

--- NEW FILE: AVE.conf ---
name=AVE

--- NEW FILE: CPP-no-case.conf ---
name=C++ no case

--- NEW FILE: PHP.conf ---
name=PHP

--- NEW FILE: HTML.conf ---
name=HTML

--- NEW FILE: GUI2CLI.conf ---
name=GUI2CLI

--- NEW FILE: Octave.conf ---
name=Octave

--- NEW FILE: NN-Cron-Table.conf ---
name=NN Cron Table

--- NEW FILE: POV.conf ---
name=POV

--- NEW FILE: CPP.conf ---
folds=7
name=C/C++ - Java

[keywords00]
keywords=asm auto bool break case catch char class const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new operator private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while
keyname=C/C++ standard keywords
[keywords01]
keywords=
keyname=
[keywords02]
keywords=
keyname=User custom keywords
[keywords03]
keywords=a addindex addtogroup anchor arg attention author b brief bug c class code date def defgroup deprecated dontinclude e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li line link mainpage name namespace nosubgrouping note overload p page par param post pre ref relates remarks return retval sa section see showinitializer since skip skipline struct subsection test throw todo typedef union until var verbatim verbinclude version warning weakgroup $ @  & < > # { }
keyname=Doxygen documentation markers
[keywords04]
keywords=
keyname=
[keywords05]
keywords=
keyname=
[keywords06]
keywords=
keyname=
[keywords07]
keywords=
keyname=
[keywords08]
keywords=
keyname=

[style00]
used=1
style-label=Default
[style01]
used=1
style-label=Comment
fore=FOREST GREEN
[style02]
used=1
style-label=Line comment
fore=FOREST GREEN
[style03]
used=1
style-label=Doc comment
fore=FOREST GREEN
[style04]
used=1
style-label=Number
fore=VIOLET
[style05]
used=0
style-label=C/C++ key-word
fore=BLUE
[style06]
used=1
style-label=String
font-style=I
fore=VIOLET
[style07]
used=1
style-label=Character
font-style=I
fore=VIOLET
[style08]
used=1
style-label=UUID
fore=BLUE
[style09]
used=1
style-label=Preprocessor
font-style=B
fore=BLUE
[style10]
used=1
style-label=Operator
[style11]
used=1
style-label=Custom identifier
[style12]
used=1
style-label=End of line not closed string
fore=VIOLET
[style13]
used=0
style-label=Not used
[style14]
used=1
style-label=Regular expression
fore=BLUE
[style15]
used=1
style-label=Comment line doc
fore=GREEN
[style16]
used=1
style-label=C/C++ additionnal key-word
fore=BLUE
[style17]
used=1
style-label=Doxygen document
fore=FIREBRICK
[style18]
used=1
style-label=Doxygen document error
fore=RED
[style19]
used=1
style-label=Global class
fore=BLUE

--- NEW FILE: LOUT.conf ---
name=LOUT

--- NEW FILE: ADA.conf ---
name=ADA

--- NEW FILE: SPECMAN.conf ---
name=SPECMAN

--- NEW FILE: LOT.conf ---
name=LOT

--- NEW FILE: KIX.conf ---
name=KIX

--- NEW FILE: Config.conf ---
name=Config

--- NEW FILE: PS.conf ---
name=PS

--- NEW FILE: XCode.conf ---
name=XCode

--- NEW FILE: Text.conf ---
name=Text

--- NEW FILE: MMIXAL.conf ---
name=MMIXAL

[Wxdevcenter-cvs] StdPlugin/conf/StdPlugin.Text - New directory

[Andreas T. <cor...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/conf/StdPlugin.Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22642/conf/StdPlugin.Text

Log Message:
Directory /cvsroot/wxdevcenter/StdPlugin/conf/StdPlugin.Text added to the repository

[Wxdevcenter-cvs] wxDevCenter/build install.bkl,1.8,1.9

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

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

Modified Files:
	install.bkl 
Log Message:
Oups

Index: install.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/install.bkl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.bkl	23 Aug 2005 15:43:02 -0000	1.8
--- install.bkl	23 Aug 2005 17:03:13 -0000	1.9
***************
*** 80,84 ****
  	<!-- Install freedesktop menu icon. -->
  	<data-files id="freedesktop_menu_icon">
! 		<srcdir>data/img</srcdir>
  		<install-to>$(DATADIR)/pixmaps</install-to>
  		<files>wxDevCenter.png</files>
--- 80,84 ----
  	<!-- Install freedesktop menu icon. -->
  	<data-files id="freedesktop_menu_icon">
! 		<srcdir>data/icons</srcdir>
  		<install-to>$(DATADIR)/pixmaps</install-to>
  		<files>wxDevCenter.png</files>

[Wxdevcenter-cvs] wxDevCenter GNUmakefile,1.8,1.9

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

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

Modified Files:
	GNUmakefile 
Log Message:
Oups

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GNUmakefile	23 Aug 2005 15:43:02 -0000	1.8
--- GNUmakefile	23 Aug 2005 17:03:14 -0000	1.9
***************
*** 188,192 ****
  	(cd data/ ; $(INSTALL) -m 644  $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications)
  	$(INSTALL) -d $(prefix)/share/pixmaps
! 	(cd data/img/ ; $(INSTALL) -m 644  wxDevCenter.png $(prefix)/share/pixmaps)
  
  uninstall: 
--- 188,192 ----
  	(cd data/ ; $(INSTALL) -m 644  $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications)
  	$(INSTALL) -d $(prefix)/share/pixmaps
! 	(cd data/icons/ ; $(INSTALL) -m 644  wxDevCenter.png $(prefix)/share/pixmaps)
  
  uninstall: 

[Wxdevcenter-cvs] StdPlugin GNUmakefile,1.4,1.5

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

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

Modified Files:
	GNUmakefile 
Log Message:
Unify icons and bitmap location.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GNUmakefile	22 Aug 2005 19:32:21 -0000	1.4
--- GNUmakefile	23 Aug 2005 15:44:32 -0000	1.5
***************
*** 145,149 ****
  	done
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/data
! 	for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico img/scintilla.png img/bmp/brush.png img/bmp/DOT.PNG img/bmp/DOT_DASH.PNG img/bmp/ellipse.png img/bmp/handdraw.png img/bmp/line.png img/bmp/LONG_DASH.PNG img/bmp/rect.png img/bmp/rrect.png img/bmp/selall.png img/bmp/selcopy.png img/bmp/selcut.png img/bmp/selection.png img/bmp/selmove.png img/bmp/selpaste.png img/bmp/selremove.png img/bmp/sizeall.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG img/bmp/spray.png img/bmp/TRANSPARENT.PNG; do \
  	if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \
--- 145,149 ----
  	done
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/data
! 	for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico icons/scintilla.png icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/transparent.png; do \
  	if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \
***************
*** 166,170 ****
  	done
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/conf
! 	for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW-no-case.conf Text/CLW.conf Text/Config.conf Text/CPP-no-case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error-list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN-Cron-Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power-Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual-Basic-Script.conf Text/Visual-Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \
  	if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \
--- 166,170 ----
  	done
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/conf
! 	for f in StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf; do \
  	if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \

[Wxdevcenter-cvs] StdPlugin/include/wxDevCenter/StdPlugin language.h,1.15,1.16

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

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

Modified Files:
	language.h 
Log Message:
Unify icons and bitmap location.

Index: language.h
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/language.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** language.h	12 Apr 2005 12:10:55 -0000	1.15
--- language.h	23 Aug 2005 15:44:32 -0000	1.16
***************
*** 69,74 ****
  #define WXDC_SIMPLETEXT_USERCONFIGDIALOG "User style configuration"
  
! #define WXDC_SIMPLETEXT_CONFIG_ROOT     "Text"
! #define WXDC_SIMPLETEXT_VIEWCONFIGROOT   "/SimpleTextView/"
  
  #define WXDC_SIMPLETEXT_VIEWCONFIGFOLDS     "folds"
--- 69,74 ----
  #define WXDC_SIMPLETEXT_USERCONFIGDIALOG "User style configuration"
  
! #define WXDC_SIMPLETEXT_CONFIG_ROOT     "StdPlugin.Text"
! #define WXDC_SIMPLETEXT_VIEWCONFIGROOT   "/StdPlugin.Text/"
  
  #define WXDC_SIMPLETEXT_VIEWCONFIGFOLDS     "folds"

[Wxdevcenter-cvs] StdPlugin/data/icons/StdPlugin.Bitmap handdraw.png,NONE,1.1 selremove.png,NONE,1.1 rect.png,NONE,1.1 selall.png,NONE,1.1 brush.png,NONE,1.1 selcopy.png,NONE,1.1 selcut.png,NONE,1.1 transparent.png,NONE,1.1 rrect.png,NONE,1.1 selpaste.png,NONE,1.1 selection.png,NONE,1.1 solid.png,NONE,1.1 selmove.png,NONE,1.1 sizeall.png,NONE,1.1 long_dash.png,NONE,1.1 ellipse.png,NONE,1.1 dot.png,NONE,1.1 short_dash.png,NONE,1.1 spray.png,NONE,1.1 line.png,NONE,1.1 dot_dash.png,NONE,1.1

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

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

Added Files:
	handdraw.png selremove.png rect.png selall.png brush.png 
	selcopy.png selcut.png transparent.png rrect.png selpaste.png 
	selection.png solid.png selmove.png sizeall.png long_dash.png 
	ellipse.png dot.png short_dash.png spray.png line.png 
	dot_dash.png 
Log Message:
Unify icons and bitmap location.

--- NEW FILE: short_dash.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selection.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: solid.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selall.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selcut.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dot_dash.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selremove.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selmove.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dot.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: handdraw.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: long_dash.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: line.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rrect.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sizeall.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rect.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ellipse.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spray.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selcopy.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: brush.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: selpaste.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: transparent.png ---
(This appears to be a binary file; contents omitted.)

[Wxdevcenter-cvs] StdPlugin/data/icons scintilla.png,NONE,1.1

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

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

Added Files:
	scintilla.png 
Log Message:
Unify icons and bitmap location.

--- NEW FILE: scintilla.png ---
(This appears to be a binary file; contents omitted.)

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

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

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);

[Wxdevcenter-cvs] StdPlugin/data/img/bmp selcopy.png,1.1,NONE brush.png,1.1,NONE handdraw.png,1.1,NONE SHORT_DASH.PNG,1.1,NONE rect.png,1.1,NONE LONG_DASH.PNG,1.1,NONE selall.png,1.1,NONE DOT.PNG,1.1,NONE DOT_DASH.PNG,1.1,NONE selection.png,1.1,NONE line.png,1.1,NONE TRANSPARENT.PNG,1.1,NONE spray.png,1.1,NONE selmove.png,1.1,NONE selpaste.png,1.1,NONE SOLID.PNG,1.1,NONE sizeall.png,1.1,NONE ellipse.png,1.1,NONE selcut.png,1.1,NONE selremove.png,1.1,NONE rrect.png,1.1,NONE

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

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

Removed Files:
	selcopy.png brush.png handdraw.png SHORT_DASH.PNG rect.png 
	LONG_DASH.PNG selall.png DOT.PNG DOT_DASH.PNG selection.png 
	line.png TRANSPARENT.PNG spray.png selmove.png selpaste.png 
	SOLID.PNG sizeall.png ellipse.png selcut.png selremove.png 
	rrect.png 
Log Message:
Unify icons and bitmap location.

--- selection.png DELETED ---

--- SHORT_DASH.PNG DELETED ---

--- SOLID.PNG DELETED ---

--- selall.png DELETED ---

--- selcut.png DELETED ---

--- DOT_DASH.PNG DELETED ---

--- TRANSPARENT.PNG DELETED ---

--- selremove.png DELETED ---

--- selmove.png DELETED ---

--- LONG_DASH.PNG DELETED ---

--- line.png DELETED ---

--- rrect.png DELETED ---

--- sizeall.png DELETED ---

--- rect.png DELETED ---

--- ellipse.png DELETED ---

--- spray.png DELETED ---

--- DOT.PNG DELETED ---

--- selcopy.png DELETED ---

--- brush.png DELETED ---

--- selpaste.png DELETED ---

--- handdraw.png DELETED ---

[Wxdevcenter-cvs] StdPlugin/build install.bkl,1.4,1.5

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

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

Modified Files:
	install.bkl 
Log Message:
Unify icons and bitmap location.

Index: install.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** install.bkl	22 Aug 2005 19:32:21 -0000	1.4
--- install.bkl	23 Aug 2005 15:44:31 -0000	1.5
***************
*** 26,51 ****
              icons/filetypes/bmp.ico
              icons/filetypes/txt.ico
!             img/scintilla.png
!             img/bmp/brush.png
!             img/bmp/DOT.PNG
!             img/bmp/DOT_DASH.PNG
!             img/bmp/ellipse.png
!             img/bmp/handdraw.png
!             img/bmp/line.png
!             img/bmp/LONG_DASH.PNG
!             img/bmp/rect.png
!             img/bmp/rrect.png
!             img/bmp/selall.png
!             img/bmp/selcopy.png
!             img/bmp/selcut.png
!             img/bmp/selection.png
!             img/bmp/selmove.png
!             img/bmp/selpaste.png
!             img/bmp/selremove.png
!             img/bmp/sizeall.png
!             img/bmp/SHORT_DASH.PNG
!             img/bmp/SOLID.PNG
!             img/bmp/spray.png
!             img/bmp/TRANSPARENT.PNG
          </files>
      </data-files-tree>
--- 26,51 ----
              icons/filetypes/bmp.ico
              icons/filetypes/txt.ico
!             icons/scintilla.png
!             icons/StdPlugin.Bitmap/brush.png
!             icons/StdPlugin.Bitmap/dot.png
!             icons/StdPlugin.Bitmap/dot_dash.png
!             icons/StdPlugin.Bitmap/ellipse.png
!             icons/StdPlugin.Bitmap/handdraw.png
!             icons/StdPlugin.Bitmap/line.png
!             icons/StdPlugin.Bitmap/long_dash.png
!             icons/StdPlugin.Bitmap/rect.png
!             icons/StdPlugin.Bitmap/rrect.png
!             icons/StdPlugin.Bitmap/selall.png
!             icons/StdPlugin.Bitmap/selcopy.png
!             icons/StdPlugin.Bitmap/selcut.png
!             icons/StdPlugin.Bitmap/selection.png
!             icons/StdPlugin.Bitmap/selmove.png
!             icons/StdPlugin.Bitmap/selpaste.png
!             icons/StdPlugin.Bitmap/selremove.png
!             icons/StdPlugin.Bitmap/sizeall.png
!             icons/StdPlugin.Bitmap/short_dash.png
!             icons/StdPlugin.Bitmap/solid.png
!             icons/StdPlugin.Bitmap/spray.png
!             icons/StdPlugin.Bitmap/transparent.png
          </files>
      </data-files-tree>
***************
*** 75,142 ****
          <install-to>$(DATADIR)/wxDevCenter/conf</install-to>
          <files>
!             Text.conf
!             Text/.conf
!             Text/ADA.conf
!             Text/APDL.conf
!             Text/ASM.conf
!             Text/ASP.conf
!             Text/AU3.conf
!             Text/AVE.conf
!             Text/BAAM.conf
!             Text/BASH.conf
!             Text/Batch.conf
!             Text/Bullant.conf
!             Text/CLW-no-case.conf
!             Text/CLW.conf
!             Text/Config.conf
!             Text/CPP-no-case.conf
!             Text/CPP.conf
!             Text/CSS.conf
!             Text/Diff.conf
!             Text/Eiffel.conf
!             Text/EiffelKW.conf
!             Text/ERLANG.conf
!             Text/Error-list.conf
!             Text/ESCRIPT.conf
!             Text/F77.conf
!             Text/FORTH.conf
!             Text/Fortran.conf
!             Text/GUI2CLI.conf
!             Text/HTML.conf
!             Text/KIX.conf
!             Text/LaTeX.conf
!             Text/Lisp.conf
!             Text/LOT.conf
!             Text/LOUT.conf
!             Text/LUA.conf
!             Text/Makefile.conf
!             Text/MATLab.conf
!             Text/METAPOST.conf
!             Text/MMIXAL.conf
!             Text/MS-SQL.conf
!             Text/NN-Cron-Table.conf
!             Text/NSIS.conf
!             Text/Octave.conf
!             Text/Pascal.conf
!             Text/Perl.conf
!             Text/PHP.conf
!             Text/POV.conf
!             Text/Power-Basic.conf
!             Text/Properties.conf
!             Text/PS.conf
!             Text/Python.conf
!             Text/Ruby.conf
!             Text/Scriptol.conf
!             Text/SPECMAN.conf
!             Text/SQL.conf
!             Text/TCL.conf
!             Text/TeX.conf
!             Text/Text.conf
!             Text/Verilog.conf
!             Text/Visual-Basic-Script.conf
!             Text/Visual-Basic.conf
!             Text/XCode.conf
!             Text/XML.conf
!             Text/YAML.conf
          </files>
      </data-files-tree>
--- 75,142 ----
          <install-to>$(DATADIR)/wxDevCenter/conf</install-to>
          <files>
!             StdPlugin.Text.conf
!             StdPlugin.Text/.conf
!             StdPlugin.Text/ADA.conf
!             StdPlugin.Text/APDL.conf
!             StdPlugin.Text/ASM.conf
!             StdPlugin.Text/ASP.conf
!             StdPlugin.Text/AU3.conf
!             StdPlugin.Text/AVE.conf
!             StdPlugin.Text/BAAM.conf
!             StdPlugin.Text/BASH.conf
!             StdPlugin.Text/Batch.conf
!             StdPlugin.Text/Bullant.conf
!             StdPlugin.Text/CLW-no-case.conf
!             StdPlugin.Text/CLW.conf
!             StdPlugin.Text/Config.conf
!             StdPlugin.Text/CPP-no-case.conf
!             StdPlugin.Text/CPP.conf
!             StdPlugin.Text/CSS.conf
!             StdPlugin.Text/Diff.conf
!             StdPlugin.Text/Eiffel.conf
!             StdPlugin.Text/EiffelKW.conf
!             StdPlugin.Text/ERLANG.conf
!             StdPlugin.Text/Error-list.conf
!             StdPlugin.Text/ESCRIPT.conf
!             StdPlugin.Text/F77.conf
!             StdPlugin.Text/FORTH.conf
!             StdPlugin.Text/Fortran.conf
!             StdPlugin.Text/GUI2CLI.conf
!             StdPlugin.Text/HTML.conf
!             StdPlugin.Text/KIX.conf
!             StdPlugin.Text/LaTeX.conf
!             StdPlugin.Text/Lisp.conf
!             StdPlugin.Text/LOT.conf
!             StdPlugin.Text/LOUT.conf
!             StdPlugin.Text/LUA.conf
!             StdPlugin.Text/Makefile.conf
!             StdPlugin.Text/MATLab.conf
!             StdPlugin.Text/METAPOST.conf
!             StdPlugin.Text/MMIXAL.conf
!             StdPlugin.Text/MS-SQL.conf
!             StdPlugin.Text/NN-Cron-Table.conf
!             StdPlugin.Text/NSIS.conf
!             StdPlugin.Text/Octave.conf
!             StdPlugin.Text/Pascal.conf
!             StdPlugin.Text/Perl.conf
!             StdPlugin.Text/PHP.conf
!             StdPlugin.Text/POV.conf
!             StdPlugin.Text/Power-Basic.conf
!             StdPlugin.Text/Properties.conf
!             StdPlugin.Text/PS.conf
!             StdPlugin.Text/Python.conf
!             StdPlugin.Text/Ruby.conf
!             StdPlugin.Text/Scriptol.conf
!             StdPlugin.Text/SPECMAN.conf
!             StdPlugin.Text/SQL.conf
!             StdPlugin.Text/TCL.conf
!             StdPlugin.Text/TeX.conf
!             StdPlugin.Text/Text.conf
!             StdPlugin.Text/Verilog.conf
!             StdPlugin.Text/Visual-Basic-Script.conf
!             StdPlugin.Text/Visual-Basic.conf
!             StdPlugin.Text/XCode.conf
!             StdPlugin.Text/XML.conf
!             StdPlugin.Text/YAML.conf
          </files>
      </data-files-tree>

[Wxdevcenter-cvs] StdPlugin/data/img scintilla.png,1.1,NONE

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

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

Removed Files:
	scintilla.png 
Log Message:
Unify icons and bitmap location.

--- scintilla.png DELETED ---

[Wxdevcenter-cvs] StdPlugin/data/icons/StdPlugin.Bitmap - New directory

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

Update of /cvsroot/wxdevcenter/StdPlugin/data/icons/StdPlugin.Bitmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv393/data/icons/StdPlugin.Bitmap

Log Message:
Directory /cvsroot/wxdevcenter/StdPlugin/data/icons/StdPlugin.Bitmap added to the repository