wxCHECK/CHECK_RET adjustments

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index c9396bf3989f6d1eb138833efbd8da069ea2a1da..b04dd8748c2f5d7c1826797109fb34ed70ef7fd5 100644 (file)
--- 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