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

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

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

Modified Files:
	BitmapDocView.cpp 
Log Message:
Add Command support (menu/toolbar unification).
Add begining of layout support.

Index: BitmapDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Bitmap/BitmapDocView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BitmapDocView.cpp	25 Aug 2005 20:36:08 -0000	1.1
--- BitmapDocView.cpp	14 Sep 2005 15:36:25 -0000	1.2
***************
*** 963,966 ****
--- 963,972 ----
  END_EVENT_TABLE()
  
+ wxDevCenter::CommandGroup* BitmapView::s_pEditCommandGroup = NULL;
+ wxDevCenter::CommandGroup* BitmapView::s_pToolsCommandGroup = NULL;
+ wxDevCenter::CommandGroup* BitmapView::s_pPenCommandGroup = NULL;
+ wxDevCenter::CommandGroup* BitmapView::s_pViewCommandGroup = NULL;
+ 
+ 
  
  BitmapView::BitmapView():
***************
*** 970,1014 ****
      m_BVD(BVD_NONE)
  {
!     wxMenu  *pMenu;
! 
!     pMenu = new wxMenu();
!     pMenu->Append(wxID_CUT          , WXDC_BITMAP_MENU_EDIT_SELCUT);
!     pMenu->Append(wxID_COPY         , WXDC_BITMAP_MENU_EDIT_SELCOPY);
!     pMenu->Append(wxID_PASTE        , WXDC_BITMAP_MENU_EDIT_SELPASTE);
!     pMenu->AppendSeparator();
!     pMenu->AppendCheckItem(ID_TOOL_SELALL    , WXDC_BITMAP_MENU_EDIT_SELALL);
!     pMenu->AppendCheckItem(ID_TOOL_SELREMOVE , WXDC_BITMAP_MENU_EDIT_SELREMOVE);
!     m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_EDIT);
! 
!     pMenu = new wxMenu();
!     pMenu->AppendCheckItem(ID_TOOL_HANDDRAW  , WXDC_BITMAP_MENU_TOOLS_HANDDRAW);
!     pMenu->AppendCheckItem(ID_TOOL_SPRAY     , WXDC_BITMAP_MENU_TOOLS_SPRAY);
!     pMenu->AppendSeparator();
!     pMenu->AppendCheckItem(ID_TOOL_LINE      , WXDC_BITMAP_MENU_TOOLS_LINE);
!     pMenu->AppendCheckItem(ID_TOOL_RECT      , WXDC_BITMAP_MENU_TOOLS_RECT);
!     pMenu->AppendCheckItem(ID_TOOL_RRECT     , WXDC_BITMAP_MENU_TOOLS_RRECT);
!     pMenu->AppendCheckItem(ID_TOOL_ELLIPSE   , WXDC_BITMAP_MENU_TOOLS_ELLIPSE);
!     pMenu->AppendSeparator();
!     pMenu->AppendCheckItem(ID_TOOL_SELECTION , WXDC_BITMAP_MENU_TOOLS_SELECTION);
!     pMenu->AppendCheckItem(ID_TOOL_SELMOVE   , WXDC_BITMAP_MENU_TOOLS_SELMOVE);
!     pMenu->AppendSeparator();
!     pMenu->AppendCheckItem(ID_TOOL_SIZEALL   , WXDC_BITMAP_MENU_TOOLS_SIZEALL);    
!     m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_TOOLS);
  
!     pMenu = new wxMenu();
!     pMenu->AppendCheckItem(ID_PEN_SOLID         , WXDC_BITMAP_MENU_PEN_SOLID      );
!     pMenu->AppendCheckItem(ID_PEN_TRANSPARENT   , WXDC_BITMAP_MENU_PEN_TRANSPARENT);
!     pMenu->AppendCheckItem(ID_PEN_DOT           , WXDC_BITMAP_MENU_PEN_DOT        );
!     pMenu->AppendCheckItem(ID_PEN_LONG_DASH     , WXDC_BITMAP_MENU_PEN_LONG_DASH  );
!     pMenu->AppendCheckItem(ID_PEN_SHORT_DASH    , WXDC_BITMAP_MENU_PEN_SHORT_DASH );
!     pMenu->AppendCheckItem(ID_PEN_DOT_DASH      , WXDC_BITMAP_MENU_PEN_DOT_DASH   );
!     m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_PEN);
  
  
!     pMenu = new wxMenu();
!     pMenu->AppendCheckItem(IDM_VIEW_EXTRASCROLL, WXDC_BITMAP_MENU_VIEW_EXTRASCROLL);
! 	pMenu->Append(IDM_VIEW_CENTER, WXDC_BITMAP_MENU_VIEW_CENTER);
!     m_aMenu.Append(pMenu, WXDC_BITMAP_MENU_VIEW);
  
  }
  
--- 976,1035 ----
      m_BVD(BVD_NONE)
  {
! 	CreateCommandGroups();
! }
  
! // Create command groups if any.
! void BitmapView::CreateCommandGroups()
! {
! 	if(s_pEditCommandGroup==NULL)
! 	{
! 		s_pEditCommandGroup = new wxDevCenter::CommandGroup(WXDC_BITMAP_MENU_EDIT);
! 		s_pEditCommandGroup->AppendCommand(wxID_CUT          , WXDC_BITMAP_MENU_EDIT_SELCUT, wxT(""), wxT("StdPlugin.Bitmap/selcut"));
! 		s_pEditCommandGroup->AppendCommand(wxID_COPY         , WXDC_BITMAP_MENU_EDIT_SELCOPY, wxT(""), wxT("StdPlugin.Bitmap/selcopy"));
! 		s_pEditCommandGroup->AppendCommand(wxID_PASTE        , WXDC_BITMAP_MENU_EDIT_SELPASTE, wxT(""), wxT("StdPlugin.Bitmap/selpaste"));
! 		s_pEditCommandGroup->AppendSeparator();
! 		s_pEditCommandGroup->AppendCommand(ID_TOOL_SELALL    , WXDC_BITMAP_MENU_EDIT_SELALL, wxT(""), wxT("StdPlugin.Bitmap/selall"));
! 		s_pEditCommandGroup->AppendCommand(ID_TOOL_SELREMOVE , WXDC_BITMAP_MENU_EDIT_SELREMOVE, wxT(""), wxT("StdPlugin.Bitmap/selremove"));
! 		wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pEditCommandGroup, CLASSINFO(BitmapView), CmdGrpType_View);
! 	}
  
+ 	if(s_pToolsCommandGroup==NULL)
+ 	{
+ 		s_pToolsCommandGroup = new wxDevCenter::CommandGroup(WXDC_BITMAP_MENU_TOOLS);
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_HANDDRAW  , WXDC_BITMAP_MENU_TOOLS_HANDDRAW, wxT(""), wxT("StdPlugin.Bitmap/handdraw"));
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_SPRAY     , WXDC_BITMAP_MENU_TOOLS_SPRAY, wxT(""), wxT("StdPlugin.Bitmap/spray"));
+ 		s_pToolsCommandGroup->AppendSeparator();
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_LINE      , WXDC_BITMAP_MENU_TOOLS_LINE, wxT(""), wxT("StdPlugin.Bitmap/line"));
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_RECT      , WXDC_BITMAP_MENU_TOOLS_RECT, wxT(""), wxT("StdPlugin.Bitmap/rect"));
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_RRECT     , WXDC_BITMAP_MENU_TOOLS_RRECT, wxT(""), wxT("StdPlugin.Bitmap/rrect"));
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_ELLIPSE   , WXDC_BITMAP_MENU_TOOLS_ELLIPSE, wxT(""), wxT("StdPlugin.Bitmap/ellipse"));
+ 		s_pToolsCommandGroup->AppendSeparator();
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_SELECTION , WXDC_BITMAP_MENU_TOOLS_SELECTION, wxT(""), wxT("StdPlugin.Bitmap/selection"));
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_SELMOVE   , WXDC_BITMAP_MENU_TOOLS_SELMOVE, wxT(""), wxT("StdPlugin.Bitmap/selmove"));
+ 		s_pToolsCommandGroup->AppendSeparator();
+ 		s_pToolsCommandGroup->AppendChechCommand(ID_TOOL_SIZEALL   , WXDC_BITMAP_MENU_TOOLS_SIZEALL, wxT(""), wxT("StdPlugin.Bitmap/sizeall"));
+ 		wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pToolsCommandGroup, CLASSINFO(BitmapView), CmdGrpType_View);
+ 	}
  
! 	if(s_pPenCommandGroup==NULL)
! 	{
! 		s_pPenCommandGroup = new wxDevCenter::CommandGroup(WXDC_BITMAP_MENU_PEN);
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_SOLID         , WXDC_BITMAP_MENU_PEN_SOLID      );
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_TRANSPARENT   , WXDC_BITMAP_MENU_PEN_TRANSPARENT);
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_DOT           , WXDC_BITMAP_MENU_PEN_DOT        );
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_LONG_DASH     , WXDC_BITMAP_MENU_PEN_LONG_DASH  );
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_SHORT_DASH    , WXDC_BITMAP_MENU_PEN_SHORT_DASH );
! 		s_pPenCommandGroup->AppendChechCommand(ID_PEN_DOT_DASH      , WXDC_BITMAP_MENU_PEN_DOT_DASH   );
! 		wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pPenCommandGroup, CLASSINFO(BitmapView), CmdGrpType_View);
! 	}
  
+ 	if(s_pViewCommandGroup==NULL)
+ 	{
+ 		s_pViewCommandGroup = new wxDevCenter::CommandGroup(WXDC_BITMAP_MENU_VIEW);
+ 		s_pViewCommandGroup->AppendChechCommand(IDM_VIEW_EXTRASCROLL, WXDC_BITMAP_MENU_VIEW_EXTRASCROLL);
+ 		s_pViewCommandGroup->AppendCommand(IDM_VIEW_CENTER, WXDC_BITMAP_MENU_VIEW_CENTER);
+ 		wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pViewCommandGroup, CLASSINFO(BitmapView), CmdGrpType_View);
+ 	}
+ 	
  }