[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.23,1.24 SimpleTextDocView.cpp,1.10,1.11

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

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

Modified Files:
	BitmapDocView.cpp SimpleTextDocView.cpp 
Log Message:
Nouvelle archi des bakefiles.

Index: SimpleTextDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SimpleTextDocView.cpp	16 Mar 2005 14:26:35 -0000	1.10
--- SimpleTextDocView.cpp	25 Apr 2005 15:40:14 -0000	1.11
***************
*** 36,43 ****
--- 36,59 ----
  #include <stdio.h>
  
+ 
+ 
+ 
  using namespace wxDevCenter;
  using namespace StdPlugin::Text;
  
  
+ /** Définition du type de document 'Texte simple'.*/
+ wxDevCenter::DocType TxtType(WXDC_DOCTYPE_TEXT_NAME, CLASSINFO(SimpleTextDocument), WXDC_DOCTYPE_TEXT_DESCRIPT, wxT("txt;log"),
+                           WXDC_VIEWTYPE_TEXT_NAME, CLASSINFO(SimpleTextView), WXDC_VIEWTYPE_TEXT_DESCRIPT, wxT("filetypes/txt"));
+ 
+ /** Définition du type de document 'Programme CPP'.*/
+ wxDevCenter::DocType CppType(WXDC_DOCTYPE_CPP_NAME, CLASSINFO(SimpleTextDocument), WXDC_DOCTYPE_CPP_DESCRIPT, "c;cpp;cxx;h;hpp;hxx;cc;hh;java",
+                           WXDC_VIEWTYPE_TEXT_NAME, CLASSINFO(SimpleTextView), WXDC_VIEWTYPE_TEXT_DESCRIPT, "filetypes/txt");
+ 
+ /** Définition du type de document 'Script LUA'.*/
+ wxDevCenter::DocType LuaType(WXDC_DOCTYPE_LUA_NAME, CLASSINFO(SimpleTextDocument), WXDC_DOCTYPE_LUA_DESCRIPT, "lua",
+                           WXDC_VIEWTYPE_TEXT_NAME, CLASSINFO(SimpleTextView), WXDC_VIEWTYPE_TEXT_DESCRIPT, "filetypes/txt");
+ 
+ 
  
  IMPLEMENT_DYNAMIC_CLASS(SimpleTextView, wxDevCenter::View)

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** BitmapDocView.cpp	12 Apr 2005 12:10:55 -0000	1.23
--- BitmapDocView.cpp	25 Apr 2005 15:40:14 -0000	1.24
***************
*** 21,24 ****
--- 21,31 ----
  
  
+ /** 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));
+ 
+ 
+ 
+ 
  /** Fonction de tracé de ligne dans une bitmap.*/
  void BitmapDrawLine(wxBitmap& bmp, wxPoint pos1, wxPoint pos2, const wxPen& pen)
***************
*** 918,921 ****
--- 925,931 ----
      EVT_MENU_RANGE(ID_PEN_STYLE_FIRST, ID_PEN_STYLE_LAST, BitmapView::OnPenStyle)
      EVT_TEXT(ID_PEN_SIZE, BitmapView::OnPenSizeChange)
+ 
+     EVT_UPDATE_UI(-1, BitmapView::OnUpdateWorkBar)
+ 
  END_EVENT_TABLE()
  
***************
*** 1060,1063 ****
--- 1070,1075 ----
      case BitmapDocument::BmpDocUpdateSel:
  wxLogDebug("  Selection");
+ 		m_pBitmapCtrl->ClearSaveBitmap();
+ 
          UpdateBitmapContent(wxRect(0, 0, GetDocument()->GetBitmap().GetWidth(), GetDocument()->GetBitmap().GetHeight()));
          m_pBitmapCtrl->Refresh();        
***************
*** 1554,1558 ****
  }
  
! 
  
  //////////////////////////////////////////////////////////////////////
--- 1566,1577 ----
  }
  
! // Interception de la mise à jour des workbar.
! void BitmapView::OnUpdateWorkBar(wxUpdateUIEvent& event)
! {
!     wxObject *pObj = event.GetEventObject();
!     if(pObj!=NULL)
!         event.Enable(wxDynamicCast(pObj, BitmapWorkBar)!=NULL);
!     event.Skip();
! }
  
  //////////////////////////////////////////////////////////////////////