[Wgui-cvs] wgui/tests TestView1.cpp,1.84,1.85 TestView1.h,1.25,1.26 UnitTests-VS71.vcproj,1.5,1.6 Un
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2005-12-29 13:46:33
|
Update of /cvsroot/wgui/wgui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3448/tests Modified Files: TestView1.cpp TestView1.h UnitTests-VS71.vcproj UnitTests.cpp UnitTests.dsp Log Message: Integrated a number of changes from Jurgen De Backer including the new CRadioButton class Index: TestView1.h =================================================================== RCS file: /cvsroot/wgui/wgui/tests/TestView1.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TestView1.h 25 Jun 2004 19:37:51 -0000 1.25 --- TestView1.h 29 Dec 2005 13:46:19 -0000 1.26 *************** *** 79,82 **** --- 79,89 ---- char m_iClickCount; wGui::EwgResourceId m_eCurrentPicture; + wGui::CGroupBox* m_pRadioGroupBox1; + wGui::CGroupBox* m_pRadioGroupBox2; + wGui::CRadioButton* m_pRadio1; + wGui::CRadioButton* m_pRadio2; + wGui::CRadioButton* m_pRadio3; + wGui::CRadioButton* m_pRadio4; + wGui::CRadioButton* m_pRadio5; }; Index: TestView1.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/tests/TestView1.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** TestView1.cpp 27 Sep 2005 19:00:01 -0000 1.84 --- TestView1.cpp 29 Dec 2005 13:46:19 -0000 1.85 *************** *** 138,141 **** --- 138,148 ---- wUtil::Trace(e.std_what()); } + m_pRadioGroupBox1 = new wGui::CGroupBox(wGui::CRect(20, 380, 100, 420), this); + m_pRadio1 = new wGui::CRadioButton(wGui::CRect(10, 0, 20, 10), m_pRadioGroupBox1); + m_pRadio2 = new wGui::CRadioButton(wGui::CRect(30, 0, 40, 10), m_pRadioGroupBox1); + m_pRadio3 = new wGui::CRadioButton(wGui::CRect(50, 0, 60, 10), m_pRadioGroupBox1); + m_pRadioGroupBox2 = new wGui::CGroupBox(wGui::CRect(120, 380, 200, 420), this); + m_pRadio4 = new wGui::CRadioButton(wGui::CRect(10, 0, 20, 10), m_pRadioGroupBox2); + m_pRadio5 = new wGui::CRadioButton(wGui::CRect(30, 0, 40, 10), m_pRadioGroupBox2); m_pToolBar = new wGui::CToolBar(wGui::CRect(0, 0, 170, 24), this); Index: UnitTests-VS71.vcproj =================================================================== RCS file: /cvsroot/wgui/wgui/tests/UnitTests-VS71.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UnitTests-VS71.vcproj 22 Sep 2005 20:49:55 -0000 1.5 --- UnitTests-VS71.vcproj 29 Dec 2005 13:46:19 -0000 1.6 *************** *** 187,190 **** --- 187,193 ---- </File> <File + RelativePath="..\includes\unit_tests\wg_radiobutton_unittests.h"> + </File> + <File RelativePath="..\includes\unit_tests\wg_rect_unittests.h"> </File> Index: UnitTests.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/tests/UnitTests.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** UnitTests.cpp 22 Apr 2004 07:15:11 -0000 1.24 --- UnitTests.cpp 29 Dec 2005 13:46:19 -0000 1.25 *************** *** 48,51 **** --- 48,52 ---- tut::RegisterUnitTests_CPoint(); tut::RegisterUnitTests_CProgress(); + tut::RegisterUnitTests_CRadioButton(); tut::RegisterUnitTests_CRect(); tut::RegisterUnitTests_CRGBColor(); Index: UnitTests.dsp =================================================================== RCS file: /cvsroot/wgui/wgui/tests/UnitTests.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UnitTests.dsp 11 Mar 2004 02:50:48 -0000 1.3 --- UnitTests.dsp 29 Dec 2005 13:46:19 -0000 1.4 *************** *** 167,170 **** --- 167,174 ---- # Begin Source File + SOURCE=..\includes\unit_tests\wg_radiobutton_unittests.h + # End Source File + # Begin Source File + SOURCE=..\includes\unit_tests\wg_rect_unittests.h # End Source File |