[Wxdevcenter-cvs] wxDevCenter/src MainFrame.cpp,1.20,1.21

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

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

Modified Files:
	MainFrame.cpp 
Log Message:
Remove old menu system.

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MainFrame.cpp	14 Sep 2005 14:19:11 -0000	1.20
--- MainFrame.cpp	14 Sep 2005 15:40:03 -0000	1.21
***************
*** 290,346 ****
  {
      wxMenuBar *pMenuBar = new wxMenuBar();
! /*    wxMenu      *pMenu;
! 
!     //  Menu Fichier
!     pMenu = new wxMenu();
!     pMenu->Append(IDM_FILE_NEW, WXDC_MENU_FILE_NEW);
!     pMenu->Append(IDM_FILE_OPEN, WXDC_MENU_FILE_OPEN);
!     pMenu->Append(IDM_FILE_CLOSE, WXDC_MENU_FILE_CLOSE);
!     pMenu->Append(IDM_FILE_CLOSEALL, WXDC_MENU_FILE_CLOSEALL);
!     pMenu->Append(IDM_FILE_SAVE, WXDC_MENU_FILE_SAVE);
!     pMenu->Append(IDM_FILE_SAVEAS, WXDC_MENU_FILE_SAVEAS);
! 	pMenu->AppendSeparator();
! 	pMenu->Append(IDM_PROJECT_NEW, WXDC_MENU_PROJECT_NEW);
! 	pMenu->Append(IDM_PROJECT_OPEN, WXDC_MENU_PROJECT_OPEN);
! 	pMenu->Append(IDM_PROJECT_CLOSE, WXDC_MENU_PROJECT_CLOSE);
! 	pMenu->AppendSeparator();
! 	pMenu->Append(IDM_FILE_PRINT, WXDC_MENU_FILE_PRINT);	
! 	pMenu->Append(IDM_FILE_PRINTSETUP, WXDC_MENU_FILE_PRINTSETUP);
! 	pMenu->Append(IDM_FILE_PRINTPREVIEW, WXDC_MENU_FILE_PRINTPREVIEW);
! 	pMenu->AppendSeparator();
!     pMenu->Append(wxID_EXIT, WXDC_MENU_APP_EXIT);
!     pMenuBar->Append(pMenu, WXDC_MENU_FILES);
! 
!     //  Menu Fenetres
!     pMenu = new wxMenu();
!     pMenu->Append(IDM_WINDOW_CLONE, WXDC_MENU_WINDOW_CLONE);
!     pMenu->Append(IDM_WINDOW_NEW, WXDC_MENU_WINDOW_NEW);
!     pMenu->Append(IDM_WINDOW_CLOSE, WXDC_MENU_WINDOW_CLOSE);
!     pMenu->Append(IDM_WINDOW_CLOSEALL, WXDC_MENU_WINDOW_CLOSEALL);
! 	pMenu->AppendSeparator();
!     m_pMenuItemWorkBar = pMenu->Append(IDM_WINDOW_WORKBAR, WXDC_MENU_WINDOW_WORKBAR, new wxMenu);
!     pMenu->AppendSeparator();
!     pMenu->Append(IDM_WINDOW_NEXT, WXDC_MENU_WINDOW_NEXT);
!     pMenu->Append(IDM_WINDOW_PREV, WXDC_MENU_WINDOW_PREV);
!     pMenu->AppendSeparator();
!     pMenuBar->Append(pMenu, WXDC_MENU_WINDOW);
! 
!     //  Menu Aide
!     pMenu = new wxMenu();
!     pMenu->Append(IDM_HELP_CONTENT, WXDC_MENU_HELP_CONTENT);
!     pMenu->Append(IDM_HELP_INDEX, WXDC_MENU_HELP_INDEX);
!     pMenu->AppendSeparator();
!     pMenu->Append(IDM_HELP_ABOUT, WXDC_MENU_HELP_ABOUT);
!     pMenuBar->Append(pMenu, WXDC_MENU_HELP);
! 
! 
!     // Fixe la barre de menus
! */    SetMenuBar(pMenuBar);
! 		CommandManager::GetCommandManager().PopulateMenuBar(GetMenuBar(), GetLayout());
! 
! /*    m_iMenuSeparator = 1;
  
      // Reconstruit le sous menu des workbars
!     RebuildWorkBarMenu();*/
  }
  
--- 290,298 ----
  {
      wxMenuBar *pMenuBar = new wxMenuBar();
!     SetMenuBar(pMenuBar);
!     CommandManager::GetCommandManager().PopulateMenuBar(GetMenuBar(), GetLayout());
  
      // Reconstruit le sous menu des workbars
!     //RebuildWorkBarMenu();
  }
  
***************
*** 368,372 ****
  void MainFrame::OnCurrentViewChanging(ViewEvent &event)
  {
- //    RemoveViewMenu(event.GetOldView());
  	CommandManager::GetCommandManager().PopulateMenuBar(GetMenuBar(), GetLayout());
      SetIcon(m_Icon);
--- 320,323 ----
***************
*** 382,386 ****
      if(pNewView!=NULL)
      {
- //        InsertViewMenu(pNewView);
  		CommandManager::GetCommandManager().PopulateMenuBar(GetMenuBar(), GetLayout());
  
--- 333,336 ----
***************
*** 462,466 ****
  {
  //    wxMenu *pMenu = m_pMenuItemWorkBar->GetSubMenu();
- 
  //    m_pLayoutManager->SetWindowMenu(pMenu);
  }
--- 412,415 ----