// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma hdrstop
#endif
+#if wxUSE_PROPSHEET
+
#ifndef WX_PRECOMP
-#include "wx/wx.h"
#endif
#include "wx/debug.h"
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;
}
}
if (node)
{
node->WritePropertyType(stream);
- stream.Append( _T("(") );
+ stream.Append( wxT("(") );
node = node->m_next;
bool first = TRUE;
while (node)
{
if (!first)
- stream.Append( _T(" ") );
+ stream.Append( wxT(" ") );
node->WritePropertyType(stream);
node = node->m_next;
- if (node)
- stream.Append( _T(",\n" ) );
+ if (node)
+ stream.Append( wxT(",\n" ) );
first = FALSE;
}
- stream.Append( _T(").\n\n") );
+ stream.Append( wxT(").\n\n") );
}
}
{
case wxPropertyValueInteger:
{
- tmp.Printf( _T("%ld"), m_value.integer );
+ tmp.Printf( wxT("%ld"), m_value.integer );
stream.Append( tmp );
break;
}
case wxPropertyValueIntegerPtr:
{
- tmp.Printf( _T("%ld"), *m_value.integerPtr );
+ tmp.Printf( wxT("%ld"), *m_value.integerPtr );
stream.Append( tmp );
break;
}
case wxPropertyValuebool:
{
if (m_value.integer)
- stream.Append( _T("True") );
+ stream.Append( wxT("True") );
else
- stream.Append( _T("False") );
+ stream.Append( wxT("False") );
break;
}
case wxPropertyValueboolPtr:
{
if (*m_value.integerPtr)
- stream.Append( _T("True") );
+ stream.Append( wxT("True") );
else
- stream.Append( _T("False") );
+ stream.Append( wxT("False") );
break;
}
case wxPropertyValueReal:
{
double d = m_value.real;
- tmp.Printf( _T("%.6g"), d );
+ tmp.Printf( wxT("%.6g"), d );
stream.Append( tmp );
break;
}
case wxPropertyValueRealPtr:
{
double d = *m_value.realPtr;
- tmp.Printf( _T("%.6g"), d );
+ tmp.Printf( wxT("%.6g"), d );
stream.Append( tmp );
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.Append( _T("[]") );
+ stream.Append( wxT("[]") );
else
{
wxPropertyValue *expr = m_value.first;
- stream.Append( _T("[") );
+ stream.Append( wxT("[") );
while (expr)
{
expr->WritePropertyType(stream);
expr = expr->m_next;
- if (expr)
- stream.Append( _T(", ") );
+ if (expr)
+ stream.Append( wxT(", ") );
}
- stream.Append( _T("]") );
+ stream.Append( wxT("]") );
}
break;
}
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)
{
if(node)
{
wxProperty *prop = (wxProperty *)node->Data();
- delete prop;
+ delete prop;
m_properties.DeleteNode(node);
}
-}
+}
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();
- }
+ }
}
/*
{}
bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) {
- double num;
- bool ok = StringToDouble (s, &num);
- *number = (float) num;
- return ok;
+ double num;
+ bool ok = StringToDouble (s, &num);
+ *number = (float) num;
+ return ok;
}
bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) {
wxChar *value_ptr;
*number = wxStrtod (s, &value_ptr);
if (value_ptr) {
- int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
- ok = (wxIsspace (value_ptr[i]) != 0);
- if (!ok) return FALSE;
- }
+ int len = wxStrlen (value_ptr);
+ for (int i = 0; i < len; i++) {
+ ok = (wxIsspace (value_ptr[i]) != 0);
+ if (!ok) return FALSE;
+ }
}
return ok;
}
bool wxPropertyValidator::StringToInt (wxChar *s, int *number) {
- long num;
- bool ok = StringToLong (s, &num);
- *number = (int) num;
- return ok;
+ long num;
+ bool ok = StringToLong (s, &num);
+ *number = (int) num;
+ return ok;
}
bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
wxChar *value_ptr;
*number = wxStrtol (s, &value_ptr, 10);
if (value_ptr) {
- int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
- ok = (wxIsspace (value_ptr[i]) != 0);
- if (!ok) return FALSE;
- }
+ int len = wxStrlen (value_ptr);
+ for (int i = 0; i < len; i++) {
+ ok = (wxIsspace (value_ptr[i]) != 0);
+ if (!ok) return FALSE;
+ }
}
return ok;
}
wxChar *wxPropertyValidator::FloatToString (float number) {
- static wxChar buf[20];
- wxSprintf (buf, _T("%.6g"), number);
- return buf;
+ static wxChar buf[20];
+ wxSprintf (buf, wxT("%.6g"), number);
+ return buf;
}
wxChar *wxPropertyValidator::DoubleToString (double number) {
- static wxChar buf[20];
- wxSprintf (buf, _T("%.6g"), number);
- return buf;
+ static wxChar buf[20];
+ wxSprintf (buf, wxT("%.6g"), number);
+ return buf;
}
wxChar *wxPropertyValidator::IntToString (int number) {
- return ::IntToString (number);
+ return ::IntToString (number);
}
wxChar *wxPropertyValidator::LongToString (long number) {
- return ::LongToString (number);
+ return ::LongToString (number);
}
+
+#endif // wxUSE_PROPSHEET
projects / wxWidgets.git / blobdiff