fixed typo that caused incorrect if there was only one book

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

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 6fa86ca2b1fdd7dfe2dbf7882f5e876d131f7ef6..717558038272163fc7c9e0cf8d5bb504fad777a7 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -24,26 +24,14 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#include "wx/debug.h"
+#include "wx/prop.h"
+

 #include <ctype.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
 #include <ctype.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 

-#if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-#else
-#include <strstream>
-#endif
-
-#include "wx/window.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/debug.h"
-#include "wx/prop.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 


@@ -59,6 +47,7 @@ wxPropertyValue::wxPropertyValue(void)
 
 wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
 {
 
 wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
 {

+  m_value.string = (wxChar*) NULL;

   m_modifiedFlag = FALSE;
   Copy((wxPropertyValue& )copyFrom);
 }
   m_modifiedFlag = FALSE;
   Copy((wxPropertyValue& )copyFrom);
 }


@@ -190,7 +179,7 @@ wxPropertyValue::wxPropertyValue(wxStringList *the_list)
   wxNode *node = the_list->First();
   while (node)
   {
   wxNode *node = the_list->First();
   while (node)
   {

-    char *s = (char *)node->Data();
+    wxChar *s = (wxChar *)node->Data();

     Append(new wxPropertyValue(s));
     node = node->Next();
   }
     Append(new wxPropertyValue(s));
     node = node->Next();
   }


@@ -254,7 +243,7 @@ void wxPropertyValue::Insert(wxPropertyValue *expr)
 void wxPropertyValue::Delete(wxPropertyValue *node)
 {
   wxPropertyValue *expr = GetFirst();
 void wxPropertyValue::Delete(wxPropertyValue *node)
 {
   wxPropertyValue *expr = GetFirst();

-  
+

   wxPropertyValue *previous = NULL;
   while (expr && (expr != node))
   {
   wxPropertyValue *previous = NULL;
   while (expr && (expr != node))
   {


@@ -266,7 +255,7 @@ void wxPropertyValue::Delete(wxPropertyValue *node)
   {
     if (previous)
       previous->m_next = expr->m_next;
   {
     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)
     // If node was the first in the list,
     // make the list point to the NEXT one.
     if (GetFirst() == expr)


@@ -339,10 +328,8 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
    case wxPropertyValueStringPtr:
      return new wxPropertyValue(m_value.stringPtr);
 
    case wxPropertyValueStringPtr:
      return new wxPropertyValue(m_value.stringPtr);
 

-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+   case wxPropertyValueNull:
+    wxFAIL_MSG( wxT("Should never get here!\n" ) );

     break;
   }
   return NULL;
     break;
   }
   return NULL;


@@ -350,6 +337,11 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
 
 void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
 {
 
 void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
 {

+  if (m_type == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }

   m_type = copyFrom.Type();
 
   switch (m_type)
   m_type = copyFrom.Type();
 
   switch (m_type)


@@ -361,11 +353,11 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueReal:
       (*this) = copyFrom.RealValue();
       return ;
     case wxPropertyValueReal:
       (*this) = copyFrom.RealValue();
       return ;

-      
+

     case wxPropertyValueString:
       (*this) = wxString(copyFrom.StringValue());
       return ;
     case wxPropertyValueString:
       (*this) = wxString(copyFrom.StringValue());
       return ;

-      
+

     case wxPropertyValuebool:
       (*this) = copyFrom.BoolValue();
       return ;
     case wxPropertyValuebool:
       (*this) = copyFrom.BoolValue();
       return ;


@@ -383,10 +375,21 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueStringPtr:
     {
       wxChar** s = copyFrom.StringValuePtr();
     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;
       (*this) = s;

+#else
+      (*this) = s != 0;
+#endif
+#endif // if 0
+
+      (*this) = (bool)(s != 0);
+      

       return ;
     }
       return ;
     }

-      
+

     case wxPropertyValueList:
     {
       m_value.first = NULL;
     case wxPropertyValueList:
     {
       m_value.first = NULL;


@@ -401,10 +404,8 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
       }
       return;
     }
       }
       return;
     }

-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+   case wxPropertyValueNull:
+    wxFAIL_MSG( wxT("Should never get here!\n" ) );

     break;
   }
 }
     break;
   }
 }


@@ -457,7 +458,7 @@ int wxPropertyValue::Number(void) const
   return i;
 }
 
   return i;
 }
 

-void wxPropertyValue::WritePropertyClause(ostream& stream)  // Write this expression as a top-level clause
+void wxPropertyValue::WritePropertyClause(wxString& stream)  // Write this expression as a top-level clause

 {
   if (m_type != wxPropertyValueList)
     return;
 {
   if (m_type != wxPropertyValueList)
     return;


@@ -466,91 +467,78 @@ void wxPropertyValue::WritePropertyClause(ostream& stream)  // Write this expres
   if (node)
   {
     node->WritePropertyType(stream);
   if (node)
   {
     node->WritePropertyType(stream);

-    stream << "(";
+    stream.Append( wxT("(") );

     node = node->m_next;
     bool first = TRUE;
     while (node)
     {
       if (!first)
     node = node->m_next;
     bool first = TRUE;
     while (node)
     {
       if (!first)

-        stream << "  ";
+        stream.Append( wxT("  ") );

       node->WritePropertyType(stream);
       node = node->m_next;
       node->WritePropertyType(stream);
       node = node->m_next;

-      if (node) stream << ",\n";
+      if (node)
+        stream.Append( wxT(",\n" ) );

       first = FALSE;
     }
       first = FALSE;
     }

-    stream << ").\n\n";
+    stream.Append( wxT(").\n\n") );

   }
 }
 
   }
 }
 

-void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any other subexpression
+void wxPropertyValue::WritePropertyType(wxString& stream)    // Write as any other subexpression

 {
 {

+  wxString tmp;

   switch (m_type)
   {
     case wxPropertyValueInteger:
     {
   switch (m_type)
   {
     case wxPropertyValueInteger:
     {

-      stream << m_value.integer;
+      tmp.Printf( wxT("%ld"), m_value.integer );
+      stream.Append( tmp );

       break;
     }
     case wxPropertyValueIntegerPtr:
     {
       break;
     }
     case wxPropertyValueIntegerPtr:
     {

-      stream << *m_value.integerPtr;
+      tmp.Printf( wxT("%ld"), *m_value.integerPtr );
+      stream.Append( tmp );

       break;
     }
     case wxPropertyValuebool:
     {
       if (m_value.integer)
       break;
     }
     case wxPropertyValuebool:
     {
       if (m_value.integer)

-        stream << "True";
+        stream.Append( wxT("True") );

       else
       else

-        stream << "False";
+        stream.Append( wxT("False") );

       break;
     }
     case wxPropertyValueboolPtr:
     {
       if (*m_value.integerPtr)
       break;
     }
     case wxPropertyValueboolPtr:
     {
       if (*m_value.integerPtr)

-        stream << "True";
+        stream.Append( wxT("True") );

       else
       else

-        stream << "False";
+        stream.Append( wxT("False") );

       break;
     }
     case wxPropertyValueReal:
     {
       break;
     }
     case wxPropertyValueReal:
     {

-      float f = m_value.real;
-      wxSprintf(wxBuffer, _T("%.6g"), (double)f);
-      stream << wxBuffer;
+      double d = m_value.real;
+      tmp.Printf( wxT("%.6g"), d );
+      stream.Append( tmp );

       break;
     }
     case wxPropertyValueRealPtr:
     {
       break;
     }
     case wxPropertyValueRealPtr:
     {

-      float f = *m_value.realPtr;
-/* Now the parser can cope with this.
-      // Prevent printing in 'e' notation. Any better way?
-      if (fabs(f) < 0.00001)
-        f = 0.0;
-*/
-      wxSprintf(wxBuffer, _T("%.6g"), f);
-      stream << wxBuffer;
+      double d = *m_value.realPtr;
+      tmp.Printf( wxT("%.6g"), d );
+      stream.Append( tmp );

       break;
     }
     case wxPropertyValueString:
     {
       break;
     }
     case wxPropertyValueString:
     {

-//      stream << "\"";
-      int i;
-      const wxWX2MBbuf strbuf = wxConv_libc.cWX2MB(m_value.string);
-      int len = strlen(strbuf);
-      for (i = 0; i < len; i++)
-      {
-        char ch = strbuf[i];
-//        if (ch == '"' || ch == '\\')
-//          stream << "\\";
-        stream << ch;
-      }
-
-//      stream << "\"";
+      stream.Append( m_value.string );

       break;
     }
     case wxPropertyValueStringPtr:
     {
       break;
     }
     case wxPropertyValueStringPtr:
     {

-      wxFAIL_MSG( _T("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );
+      wxFAIL_MSG( wxT("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );

       /*
       int i;
       int len = strlen(*(m_value.stringPtr));
       /*
       int i;
       int len = strlen(*(m_value.stringPtr));


@@ -565,19 +553,20 @@ void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any othe
     case wxPropertyValueList:
     {
       if (!m_value.first)
     case wxPropertyValueList:
     {
       if (!m_value.first)

-        stream << "[]";
+        stream.Append( wxT("[]") );

       else
       {
         wxPropertyValue *expr = m_value.first;
 
       else
       {
         wxPropertyValue *expr = m_value.first;
 

-        stream << "[";
+        stream.Append( wxT("[") );

         while (expr)
         {
           expr->WritePropertyType(stream);
           expr = expr->m_next;
         while (expr)
         {
           expr->WritePropertyType(stream);
           expr = expr->m_next;

-          if (expr) stream << ", ";
+          if (expr)
+           stream.Append( wxT(", ") );

         }
         }

-        stream << "]";
+        stream.Append( wxT("]") );

       }
       break;
     }
       }
       break;
     }


@@ -587,16 +576,9 @@ void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any othe
 
 wxString wxPropertyValue::GetStringRepresentation(void)
 {
 
 wxString wxPropertyValue::GetStringRepresentation(void)
 {

-  char buf[500];
-  buf[0] = 0;
-  
-  ostrstream str((char *)buf, (int)500, ios::out);
+  wxString str;

   WritePropertyType(str);
   WritePropertyType(str);

-  str << '\0';
-  str.flush();
-
-  wxString theString(buf);
-  return theString;
+  return str;

 }
 
 void wxPropertyValue::operator=(const wxPropertyValue& val)
 }
 
 void wxPropertyValue::operator=(const wxPropertyValue& val)


@@ -611,6 +593,14 @@ void wxPropertyValue::operator=(const wxString& val1)
   const wxChar *val = (const wxChar *)val1;
 
   m_modifiedFlag = TRUE;
   const wxChar *val = (const wxChar *)val1;
 
   m_modifiedFlag = TRUE;

+
+  wxPropertyValueType oldType = m_type;
+  if (oldType == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }
+

   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueString;
 
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueString;
 


@@ -623,14 +613,13 @@ void wxPropertyValue::operator=(const wxString& val1)
   }
   else if (m_type == wxPropertyValueStringPtr)
   {
   }
   else if (m_type == wxPropertyValueStringPtr)
   {

-    if (*m_value.stringPtr)
-      delete[] *m_value.stringPtr;
+    wxFAIL_MSG( wxT("Shouldn't try to assign a wxString reference to a char* pointer.") );

     if (val)
       *m_value.stringPtr = copystring(val);
     else
       *m_value.stringPtr = NULL;
   }
     if (val)
       *m_value.stringPtr = copystring(val);
     else
       *m_value.stringPtr = NULL;
   }

-  
+

   m_clientData = NULL;
   m_next = NULL;
   m_last = NULL;
   m_clientData = NULL;
   m_next = NULL;
   m_last = NULL;


@@ -639,6 +628,13 @@ void wxPropertyValue::operator=(const wxString& val1)
 
 void wxPropertyValue::operator=(const long val)
 {
 
 void wxPropertyValue::operator=(const long val)
 {

+  wxPropertyValueType oldType = m_type;
+  if (oldType == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }
+

   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueInteger;
   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueInteger;


@@ -658,6 +654,13 @@ void wxPropertyValue::operator=(const long val)
 
 void wxPropertyValue::operator=(const bool val)
 {
 
 void wxPropertyValue::operator=(const bool val)
 {

+  wxPropertyValueType oldType = m_type;
+  if (oldType == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }
+

   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValuebool;
   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValuebool;


@@ -673,6 +676,13 @@ void wxPropertyValue::operator=(const bool val)
 
 void wxPropertyValue::operator=(const float val)
 {
 
 void wxPropertyValue::operator=(const float val)
 {

+  wxPropertyValueType oldType = m_type;
+  if (oldType == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }
+

   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueReal;
   m_modifiedFlag = TRUE;
   if (m_type == wxPropertyValueNull)
     m_type = wxPropertyValueReal;


@@ -692,6 +702,13 @@ void wxPropertyValue::operator=(const float val)
 
 void wxPropertyValue::operator=(const wxChar **val)
 {
 
 void wxPropertyValue::operator=(const wxChar **val)
 {

+  wxPropertyValueType oldType = m_type;
+  if (oldType == wxPropertyValueString)
+  {
+    delete[] m_value.string ;
+    m_value.string = NULL;
+  }
+

   m_modifiedFlag = TRUE;
   m_type = wxPropertyValueStringPtr;
 
   m_modifiedFlag = TRUE;
   m_type = wxPropertyValueStringPtr;
 


@@ -804,7 +821,7 @@ wxChar **wxPropertyValue::StringValuePtr(void) const
 /*
  * A property (name plus value)
  */
 /*
  * A property (name plus value)
  */

- 
+

 IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
 
 wxProperty::wxProperty(void)
 IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
 
 wxProperty::wxProperty(void)


@@ -894,7 +911,7 @@ void wxProperty::operator=(const wxPropertyValue& val)
 /*
  * Base property view class
  */
 /*
  * Base property view class
  */

- 
+

 IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
 
 wxPropertyView::wxPropertyView(long flags)
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
 
 wxPropertyView::wxPropertyView(long flags)


@@ -918,7 +935,7 @@ wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property)
 {
   if (property->GetValidator())
     return property->GetValidator();
 {
   if (property->GetValidator())
     return property->GetValidator();

-    
+

   wxNode *node = m_validatorRegistryList.First();
   while (node)
   {
   wxNode *node = m_validatorRegistryList.First();
   while (node)
   {


@@ -952,16 +969,6 @@ wxPropertySheet::~wxPropertySheet(void)
   Clear();
 }
 
   Clear();
 }
 

-bool wxPropertySheet::Save( ostream& WXUNUSED(str) )
-{
-  return FALSE;
-}
-
-bool wxPropertySheet::Load( ostream& WXUNUSED(str) )
-{
-  return FALSE;
-}
-

 void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
 {
 }
 void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
 {
 }


@@ -1005,8 +1012,8 @@ void wxPropertySheet::RemoveProperty(const wxString& name)
 }      
 
 bool wxPropertySheet::HasProperty(const wxString& name) const
 }      
 
 bool wxPropertySheet::HasProperty(const wxString& name) const

-{ 
-       return (GetProperty(name)?TRUE:FALSE); 
+{
+       return (GetProperty(name)?TRUE:FALSE);

 }
 
 // Clear all properties
 }
 
 // Clear all properties


@@ -1032,7 +1039,7 @@ void wxPropertySheet::SetAllModified(bool flag)
     wxProperty *prop = (wxProperty *)node->Data();
     prop->GetValue().SetModified(flag);
     node = node->Next();
     wxProperty *prop = (wxProperty *)node->Data();
     prop->GetValue().SetModified(flag);
     node = node->Next();

-  }  
+  }

 }
 
 /*
 }
 
 /*


@@ -1065,7 +1072,7 @@ void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();
   wxNode *node;
 {
   BeginFind();
   wxNode *node;

-  while ((node = Next()))
+  while ((node = Next()) != NULL)

   {
     delete (wxPropertyValidator *)node->Data();
   }
   {
     delete (wxPropertyValidator *)node->Data();
   }


@@ -1131,13 +1138,13 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
 
 wxChar *wxPropertyValidator::FloatToString (float number) {
        static wxChar buf[20];
 
 wxChar *wxPropertyValidator::FloatToString (float number) {
        static wxChar buf[20];

-       wxSprintf (buf, _T("%.6g"), number);
+       wxSprintf (buf, wxT("%.6g"), number);

        return buf;
 }
 
 wxChar *wxPropertyValidator::DoubleToString (double number) {
        static wxChar buf[20];
        return buf;
 }
 
 wxChar *wxPropertyValidator::DoubleToString (double number) {
        static wxChar buf[20];

-       wxSprintf (buf, _T("%.6g"), number);
+       wxSprintf (buf, wxT("%.6g"), number);

        return buf;
 }
 
        return buf;
 }