unused parameter warnings suppressed

[wxWidgets.git] / src / generic / prop.cpp

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 2e913449ef6029fc5ee5305a69f9c61e73c1c208..3aa479d8e488d0aa6ce61d0744f1d7958a022549 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -242,7 +242,7 @@ void wxPropertyValue::Insert(wxPropertyValue *expr)
 void wxPropertyValue::Delete(wxPropertyValue *node)
 {
   wxPropertyValue *expr = GetFirst();
-  
+
   wxPropertyValue *previous = NULL;
   while (expr && (expr != node))
   {
@@ -254,7 +254,7 @@ void wxPropertyValue::Delete(wxPropertyValue *node)
   {
     if (previous)
       previous->m_next = expr->m_next;
-      
+
     // If node was the first in the list,
     // make the list point to the NEXT one.
     if (GetFirst() == expr)
@@ -327,10 +327,8 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
    case wxPropertyValueStringPtr:
      return new wxPropertyValue(m_value.stringPtr);
 
-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+   case wxPropertyValueNull:
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
   return NULL;
@@ -349,11 +347,11 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueReal:
       (*this) = copyFrom.RealValue();
       return ;
-      
+
     case wxPropertyValueString:
       (*this) = wxString(copyFrom.StringValue());
       return ;
-      
+
     case wxPropertyValuebool:
       (*this) = copyFrom.BoolValue();
       return ;
@@ -371,10 +369,23 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueStringPtr:
     {
       wxChar** s = copyFrom.StringValuePtr();
+      
+#if 0      
+      // what is this? are you trying to assign a bool or a string?  VA can't figure it out..
+#if defined(__VISAGECPP__) || defined( __VISUALC__ )
+      (*this) = s;
+#else
+      (*this) = s != 0;
+#endif
+#endif // if 0
+
+      // TODO: check if this is right.  MB
+      //
       (*this) = s;
+      
       return ;
     }
-      
+
     case wxPropertyValueList:
     {
       m_value.first = NULL;
@@ -389,10 +400,8 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
       }
       return;
     }
-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+   case wxPropertyValueNull:
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
 }
@@ -463,7 +472,7 @@ void wxPropertyValue::WritePropertyClause(wxString& stream)  // Write this expre
         stream.Append( _T("  ") );
       node->WritePropertyType(stream);
       node = node->m_next;
-      if (node) 
+      if (node)
         stream.Append( _T(",\n" ) );
       first = FALSE;
     }
@@ -550,7 +559,7 @@ void wxPropertyValue::WritePropertyType(wxString& stream)    // Write as any oth
         {
           expr->WritePropertyType(stream);
           expr = expr->m_next;
-          if (expr) 
+          if (expr)
            stream.Append( _T(", ") );
         }
         stream.Append( _T("]") );
@@ -599,7 +608,7 @@ void wxPropertyValue::operator=(const wxString& val1)
     else
       *m_value.stringPtr = NULL;
   }
-  
+
   m_clientData = NULL;
   m_next = NULL;
   m_last = NULL;
@@ -773,7 +782,7 @@ wxChar **wxPropertyValue::StringValuePtr(void) const
 /*
  * A property (name plus value)
  */
- 
+
 IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
 
 wxProperty::wxProperty(void)
@@ -863,7 +872,7 @@ void wxProperty::operator=(const wxPropertyValue& val)
 /*
  * Base property view class
  */
- 
+
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
 
 wxPropertyView::wxPropertyView(long flags)
@@ -887,7 +896,7 @@ wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property)
 {
   if (property->GetValidator())
     return property->GetValidator();
-    
+
   wxNode *node = m_validatorRegistryList.First();
   while (node)
   {
@@ -964,8 +973,8 @@ void wxPropertySheet::RemoveProperty(const wxString& name)
 }      
 
 bool wxPropertySheet::HasProperty(const wxString& name) const
-{ 
-       return (GetProperty(name)?TRUE:FALSE); 
+{
+       return (GetProperty(name)?TRUE:FALSE);
 }
 
 // Clear all properties
@@ -991,7 +1000,7 @@ void wxPropertySheet::SetAllModified(bool flag)
     wxProperty *prop = (wxProperty *)node->Data();
     prop->GetValue().SetModified(flag);
     node = node->Next();
-  }  
+  }
 }
 
 /*
@@ -1024,7 +1033,7 @@ void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();
   wxNode *node;
-  while ((node = Next()))
+  while ((node = Next()) != NULL)
   {
     delete (wxPropertyValidator *)node->Data();
   }