From c99a3a1d94cafb4e6f24321773eb06fa7b9275f1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Jul 1998 23:13:47 +0000 Subject: [PATCH] wxCHECK/CHECK_RET adjustments git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/regtest/regtest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp index c9396bf398..b04dd8748c 100644 --- a/samples/regtest/regtest.cpp +++ b/samples/regtest/regtest.cpp @@ -492,7 +492,7 @@ void RegTreeCtrl::OnMenuTest() long lId = GetSelection(); TreeNode *pNode = (TreeNode *)GetItemData(lId); - wxCHECK( pNode != NULL ); + wxCHECK_RET( pNode != NULL, "tree item without data?" ); if ( pNode->IsRoot() ) { wxLogError("Can't create a subkey under the root key."); @@ -736,7 +736,7 @@ void RegTreeCtrl::DeleteSelected() TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent), *pParent = (TreeNode *)GetItemData(lParent); - wxCHECK ( pCurrent && pParent ); + wxCHECK_RET( pCurrent && pParent, "either node or parent without data?" ); if ( pParent->IsRoot() ) { wxLogError("Can't delete standard key."); @@ -773,7 +773,7 @@ void RegTreeCtrl::CreateNewKey(const wxString& strName) long lCurrent = GetSelection(); TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent); - wxCHECK( pCurrent != NULL ); + wxCHECK_RET( pCurrent != NULL, "node without data?" ); wxASSERT( pCurrent->IsKey() ); // check must have been done before @@ -792,7 +792,7 @@ void RegTreeCtrl::CreateNewTextValue(const wxString& strName) long lCurrent = GetSelection(); TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent); - wxCHECK( pCurrent != NULL ); + wxCHECK_RET( pCurrent != NULL, "node without data?" ); wxASSERT( pCurrent->IsKey() ); // check must have been done before @@ -810,7 +810,7 @@ void RegTreeCtrl::CreateNewBinaryValue(const wxString& strName) long lCurrent = GetSelection(); TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent); - wxCHECK( pCurrent != NULL ); + wxCHECK_RET( pCurrent != NULL, "node without data?" ); wxASSERT( pCurrent->IsKey() ); // check must have been done before @@ -828,7 +828,7 @@ bool RegTreeCtrl::IsKeySelected() const long lCurrent = GetSelection(); TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent); - wxCHECK_RET( pCurrent != NULL, false ); + wxCHECK( pCurrent != NULL, false ); return pCurrent->IsKey(); } \ No newline at end of file -- 2.47.2