#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>
-#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)
wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
{
+ m_value.string = (wxChar*) NULL;
m_modifiedFlag = FALSE;
Copy((wxPropertyValue& )copyFrom);
}
wxNode *node = the_list->First();
while (node)
{
- char *s = (char *)node->Data();
+ wxChar *s = (wxChar *)node->Data();
Append(new wxPropertyValue(s));
node = node->Next();
}
void wxPropertyValue::Delete(wxPropertyValue *node)
{
wxPropertyValue *expr = GetFirst();
-
+
wxPropertyValue *previous = NULL;
while (expr && (expr != 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)
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;
void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
{
+ if (m_type == wxPropertyValueString)
+ {
+ delete[] m_value.string ;
+ m_value.string = NULL;
+ }
m_type = copyFrom.Type();
switch (m_type)
case wxPropertyValueReal:
(*this) = copyFrom.RealValue();
return ;
-
+
case wxPropertyValueString:
(*this) = wxString(copyFrom.StringValue());
return ;
-
+
case wxPropertyValuebool:
(*this) = copyFrom.BoolValue();
return ;
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
+
+ (*this) = (bool)(s != 0);
+
return ;
}
-
+
case wxPropertyValueList:
{
m_value.first = NULL;
}
return;
}
- case wxPropertyValueNull:
-#ifdef __X__
- cerr << "Should never get here!\n";
-#endif
+ case wxPropertyValueNull:
+ wxFAIL_MSG( wxT("Should never get here!\n" ) );
break;
}
}
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 (node)
{
node->WritePropertyType(stream);
- stream << "(";
+ stream.Append( wxT("(") );
node = node->m_next;
bool first = TRUE;
while (node)
{
if (!first)
- stream << " ";
+ stream.Append( wxT(" ") );
node->WritePropertyType(stream);
node = node->m_next;
- if (node) stream << ",\n";
+ if (node)
+ stream.Append( wxT(",\n" ) );
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:
{
- stream << m_value.integer;
+ tmp.Printf( wxT("%ld"), m_value.integer );
+ stream.Append( tmp );
break;
}
case wxPropertyValueIntegerPtr:
{
- stream << *m_value.integerPtr;
+ tmp.Printf( wxT("%ld"), *m_value.integerPtr );
+ stream.Append( tmp );
break;
}
case wxPropertyValuebool:
{
if (m_value.integer)
- stream << "True";
+ stream.Append( wxT("True") );
else
- stream << "False";
+ stream.Append( wxT("False") );
break;
}
case wxPropertyValueboolPtr:
{
if (*m_value.integerPtr)
- stream << "True";
+ stream.Append( wxT("True") );
else
- stream << "False";
+ stream.Append( wxT("False") );
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:
{
- 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:
{
-// 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:
{
- wxFAIL_MSG( _T("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );
+ wxFAIL_MSG( wxT("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );
/*
int i;
int len = strlen(*(m_value.stringPtr));
case wxPropertyValueList:
{
if (!m_value.first)
- stream << "[]";
+ stream.Append( wxT("[]") );
else
{
wxPropertyValue *expr = m_value.first;
- stream << "[";
+ stream.Append( wxT("[") );
while (expr)
{
expr->WritePropertyType(stream);
expr = expr->m_next;
- if (expr) stream << ", ";
+ if (expr)
+ stream.Append( wxT(", ") );
}
- stream << "]";
+ stream.Append( wxT("]") );
}
break;
}
wxString wxPropertyValue::GetStringRepresentation(void)
{
- char buf[500];
- buf[0] = 0;
-
- ostrstream str((char *)buf, (int)500, ios::out);
+ wxString str;
WritePropertyType(str);
- str << '\0';
- str.flush();
-
- wxString theString(buf);
- return theString;
+ return str;
}
void wxPropertyValue::operator=(const wxPropertyValue& val)
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;
}
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;
}
-
+
m_clientData = NULL;
m_next = NULL;
m_last = NULL;
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;
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;
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;
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;
/*
* A property (name plus value)
*/
-
+
IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
wxProperty::wxProperty(void)
/*
* Base property view class
*/
-
+
IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
wxPropertyView::wxPropertyView(long flags)
{
if (property->GetValidator())
return property->GetValidator();
-
+
wxNode *node = m_validatorRegistryList.First();
while (node)
{
Clear();
}
-bool wxPropertySheet::Save( ostream& WXUNUSED(str) )
-{
- return FALSE;
-}
-
-bool wxPropertySheet::Load( ostream& WXUNUSED(str) )
-{
- return FALSE;
-}
-
void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
{
}
}
bool wxPropertySheet::HasProperty(const wxString& name) const
-{
- return (GetProperty(name)?TRUE:FALSE);
+{
+ return (GetProperty(name)?TRUE:FALSE);
}
// Clear all properties
wxProperty *prop = (wxProperty *)node->Data();
prop->GetValue().SetModified(flag);
node = node->Next();
- }
+ }
}
/*
{
BeginFind();
wxNode *node;
- while ((node = Next()))
+ while ((node = Next()) != NULL)
{
delete (wxPropertyValidator *)node->Data();
}
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];
- wxSprintf (buf, _T("%.6g"), number);
+ wxSprintf (buf, wxT("%.6g"), number);
return buf;
}
projects / wxWidgets.git / blobdiff