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

Use wxScopedPtr in MiscGUIFuncsTestCase for automatic cleanup

Browse Source 
Replace manual calls to Destroy() to ensure that the objects created in
this test will be destroyed even if a check fails.
This commit is contained in:
Vadim Zeitlin
2021-10-20 23:21:04 +01:00
parent ec975c70cc
commit 87b394a555
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/misc/guifuncs.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/dataobj.h" #include "wx/dataobj.h"
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/scopedptr.h"
#include "asserthelper.h" #include "asserthelper.h"
@@ -143,12 +144,12 @@ void MiscGUIFuncsTestCase::ClientToScreen()
wxWindow* const tlw = wxTheApp->GetTopWindow(); wxWindow* const tlw = wxTheApp->GetTopWindow();
CPPUNIT_ASSERT( tlw ); CPPUNIT_ASSERT( tlw );
wxPanel* const wxScopedPtr<wxPanel> const
p1 = new wxPanel(tlw, wxID_ANY, wxPoint(0, 0), wxSize(100, 50)); p1(new wxPanel(tlw, wxID_ANY, wxPoint(0, 0), wxSize(100, 50)));
wxPanel* const wxScopedPtr<wxPanel> const
p2 = new wxPanel(tlw, wxID_ANY, wxPoint(0, 50), wxSize(100, 50)); p2(new wxPanel(tlw, wxID_ANY, wxPoint(0, 50), wxSize(100, 50)));
wxWindow* const wxWindow* const
b = new wxWindow(p2, wxID_ANY, wxPoint(10, 10), wxSize(30, 10)); b = new wxWindow(p2.get(), wxID_ANY, wxPoint(10, 10), wxSize(30, 10));
// We need this to realize the windows created above under wxGTK. // We need this to realize the windows created above under wxGTK.
wxYield(); wxYield();
@@ -166,9 +167,6 @@ void MiscGUIFuncsTestCase::ClientToScreen()
tlwOrig + wxPoint(10, 60), tlwOrig + wxPoint(10, 60),
b->ClientToScreen(wxPoint(0, 0)) b->ClientToScreen(wxPoint(0, 0))
); );
p1->Destroy();
p2->Destroy();
} }
namespace namespace
@@ -206,9 +204,11 @@ void MiscGUIFuncsTestCase::FindWindowAtPoint()
// assertion messages. // assertion messages.
parent->SetLabel("parent"); parent->SetLabel("parent");
wxWindow* btn1 = new TestButton(parent, "1", wxPoint(10, 10)); wxScopedPtr<wxWindow> btn1(new TestButton(parent, "1", wxPoint(10, 10)));
wxWindow* btn2 = new TestButton(parent, "2", wxPoint(10, 90)); wxScopedPtr<wxWindow> btn2(new TestButton(parent, "2", wxPoint(10, 90)));
wxWindow* btn3 = new TestButton(btn2, "3", wxPoint(20, 20));
// No need to use wxScopedPtr<> for this one, it will be deleted by btn2.
wxWindow* btn3 = new TestButton(btn2.get(), "3", wxPoint(20, 20));
// We need this to realize the windows created above under wxGTK. // We need this to realize the windows created above under wxGTK.
wxYield(); wxYield();
@@ -265,8 +265,4 @@ void MiscGUIFuncsTestCase::FindWindowAtPoint()
btn3->GetLabel(), btn3->GetLabel(),
GetLabelOfWindowAtPoint(parent, 31, 111) GetLabelOfWindowAtPoint(parent, 31, 111)
); );
btn1->Destroy();
btn2->Destroy();
// btn3 was already deleted when its parent was
} }