[Wgui-cvs] wgui/tests TestView1.cpp,1.82,1.83

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26081/tests

Modified Files:
	TestView1.cpp 
Log Message:
Working on the CMenu bug

Index: TestView1.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/TestView1.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** TestView1.cpp	26 Sep 2005 18:37:48 -0000	1.82
--- TestView1.cpp	26 Sep 2005 21:09:25 -0000	1.83
***************
*** 76,90 ****
  
  	AttachMenu(new wGui::CMenu(wGui::CRect(0, 0, 80, 22), this));
! 	wGui::CPopupMenu* pContextSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 180, 50), this);
! 	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Show Message Box", SHOW_MESSAGE_BOX_1));
! 	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Show A Different Message Box", SHOW_MESSAGE_BOX_2));
! 	pContextSubmenu->InsertMenuItem(wGui::SMenuItem());  // instert a spacer
! 	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Exit", EXIT_APP));
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("File", 0, pContextSubmenu));
! 	pContextSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 70, 50), this);
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("Edit", 0, pContextSubmenu));
  	GetMenu()->InsertMenuItem(wGui::SMenuItem());
! 	pContextSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 70, 50), this);
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("Help", 0, pContextSubmenu));
  
  	m_pButton = new wGui::CButton(wGui::CRect(20, 40, 100, 60), this, "Test Button");
--- 76,90 ----
  
  	AttachMenu(new wGui::CMenu(wGui::CRect(0, 0, 80, 22), this));
! 	wGui::CPopupMenu* pSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 180, 50), this);
! 	pSubmenu->InsertMenuItem(wGui::SMenuItem("Show Message Box", SHOW_MESSAGE_BOX_1));
! 	pSubmenu->InsertMenuItem(wGui::SMenuItem("Show A Different Message Box", SHOW_MESSAGE_BOX_2));
! 	pSubmenu->InsertMenuItem(wGui::SMenuItem());  // instert a spacer
! 	pSubmenu->InsertMenuItem(wGui::SMenuItem("Exit", EXIT_APP));
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("File", 0, pSubmenu));
! 	pSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 70, 50), this);
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("Edit", 0, pSubmenu));
  	GetMenu()->InsertMenuItem(wGui::SMenuItem());
! 	pSubmenu =  new wGui::CPopupMenu(wGui::CRect(0, 0, 70, 50), this);
! 	GetMenu()->InsertMenuItem(wGui::SMenuItem("Help", 0, pSubmenu));
  
  	m_pButton = new wGui::CButton(wGui::CRect(20, 40, 100, 60), this, "Test Button");
***************
*** 167,171 ****
  	// So it's being commented out for the purposes of getting 0.4.0 released
  	// There's probably something wrong with the CMenu class, but I haven't figured it out yet
! /*	pContextSubmenu = new wGui::CPopupMenu(wGui::CRect(0, 0, 80, 50), m_pContextMenu);
  	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Clear", CLEAR_EDIT_BOX_1));
  	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Fill", FILL_EDIT_BOX_1));
--- 167,171 ----
  	// So it's being commented out for the purposes of getting 0.4.0 released
  	// There's probably something wrong with the CMenu class, but I haven't figured it out yet
! 	wGui::CPopupMenu* pContextSubmenu = new wGui::CPopupMenu(wGui::CRect(0, 0, 80, 50), m_pContextMenu);
  	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Clear", CLEAR_EDIT_BOX_1));
  	pContextSubmenu->InsertMenuItem(wGui::SMenuItem("Fill", FILL_EDIT_BOX_1));
***************
*** 183,187 ****
  	wGui::CPopupMenu* pContextSubmenu4 =  new wGui::CPopupMenu(wGui::CRect(0, 0, 140, 50), pContextSubmenu3);
  	pContextSubmenu3->InsertMenuItem(wGui::SMenuItem("Empty submenu 3", 0, pContextSubmenu4));
! */
  	m_pDropDown = new wGui::CDropDown(wGui::CRect(10, 55, 205, 73), m_pGroupBox);
  	m_pDropDown->AddItem(wGui::SListItem("Item1"));
--- 183,187 ----
  	wGui::CPopupMenu* pContextSubmenu4 =  new wGui::CPopupMenu(wGui::CRect(0, 0, 140, 50), pContextSubmenu3);
  	pContextSubmenu3->InsertMenuItem(wGui::SMenuItem("Empty submenu 3", 0, pContextSubmenu4));
! 
  	m_pDropDown = new wGui::CDropDown(wGui::CRect(10, 55, 205, 73), m_pGroupBox);
  	m_pDropDown->AddItem(wGui::SListItem("Item1"));