Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just simplify wxBookCtrlBase unit test a little.

Browse Source 
Add Realize() virtual function that can be overridden in ToolbookTestCase
instead of using explicit wxDynamicCasts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-23 16:39:15 +00:00
parent 10e6908dd3
commit 6f71e06242
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/controls/bookctrlbasetest.cpp
View File

@@ -17,8 +17,6 @@
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/bookctrl.h" #include "wx/bookctrl.h"
#include "wx/toolbook.h"
#include "wx/toolbar.h"
#include "bookctrlbasetest.h" #include "bookctrlbasetest.h"
#include "testableframe.h" #include "testableframe.h"
@@ -35,11 +33,7 @@ void BookCtrlBaseTestCase::AddPanels()
base->AssignImageList(m_list); base->AssignImageList(m_list);
//We need to realize the toolbar if we ware running the wxToolbook tests Realize();
wxToolbook *book = wxDynamicCast(base, wxToolbook);
if(book)
book->GetToolBar()->Realize();
m_panel1 = new wxPanel(base); m_panel1 = new wxPanel(base);
m_panel2 = new wxPanel(base); m_panel2 = new wxPanel(base);
@@ -96,11 +90,7 @@ void BookCtrlBaseTestCase::PageManagement()
base->InsertPage(0, new wxPanel(base), "New Panel", true, 0); base->InsertPage(0, new wxPanel(base), "New Panel", true, 0);
//We need to realize the toolbar if we ware running the wxToolbook tests Realize();
wxToolbook *book = wxDynamicCast(base, wxToolbook);
if(book)
book->GetToolBar()->Realize();
CPPUNIT_ASSERT_EQUAL(0, base->GetSelection()); CPPUNIT_ASSERT_EQUAL(0, base->GetSelection());
CPPUNIT_ASSERT_EQUAL(4, base->GetPageCount()); CPPUNIT_ASSERT_EQUAL(4, base->GetPageCount());

3
tests/controls/bookctrlbasetest.h
View File

@@ -48,6 +48,9 @@ protected:
//the ctrl. //the ctrl.
void AddPanels(); void AddPanels();
// Override this to call Realize() on the toolbar in the wxToolbook test.
virtual void Realize() { }
wxPanel* m_panel1; wxPanel* m_panel1;
wxPanel* m_panel2; wxPanel* m_panel2;
wxPanel* m_panel3; wxPanel* m_panel3;

2
tests/controls/toolbooktest.cpp
View File

@@ -41,6 +41,8 @@ private:
virtual wxEventType GetChangingEvent() const virtual wxEventType GetChangingEvent() const
{ return wxEVT_TOOLBOOK_PAGE_CHANGING; } { return wxEVT_TOOLBOOK_PAGE_CHANGING; }
virtual void Realize() { m_toolbook->GetToolBar()->Realize(); }
CPPUNIT_TEST_SUITE( ToolbookTestCase ); CPPUNIT_TEST_SUITE( ToolbookTestCase );
wxBOOK_CTRL_BASE_TESTS(); wxBOOK_CTRL_BASE_TESTS();
CPPUNIT_TEST( ToolBar ); CPPUNIT_TEST( ToolBar );