X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cba2db0c2969f9b83e8a1736e260d22200e99a99..259d1674f293dcb7bbc0fa1c38392d899ce71bc0:/src/generic/prop.cpp?ds=sidebyside diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp index a353201fcc..00e5364606 100644 --- a/src/generic/prop.cpp +++ b/src/generic/prop.cpp @@ -24,26 +24,14 @@ #include "wx/wx.h" #endif +#include "wx/debug.h" +#include "wx/prop.h" + #include #include #include #include -#if wxUSE_IOSTREAMH -#if defined(__WXMSW__) && !defined(__GNUWIN32__) -#include -#else -#include -#endif -#else -#include -#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) @@ -63,7 +51,7 @@ wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom) Copy((wxPropertyValue& )copyFrom); } -wxPropertyValue::wxPropertyValue(const char *val) +wxPropertyValue::wxPropertyValue(const wxChar *val) { m_modifiedFlag = FALSE; m_type = wxPropertyValueString; @@ -79,7 +67,7 @@ wxPropertyValue::wxPropertyValue(const wxString& val) m_modifiedFlag = FALSE; m_type = wxPropertyValueString; - m_value.string = copystring((const char *)val); + m_value.string = copystring((const wxChar *)val); m_clientData = NULL; m_next = NULL; m_last = NULL; @@ -122,7 +110,7 @@ wxPropertyValue::wxPropertyValue(double the_real) } // Pointer versions: we have a pointer to the real C++ value. -wxPropertyValue::wxPropertyValue(char **val) +wxPropertyValue::wxPropertyValue(wxChar **val) { m_modifiedFlag = FALSE; m_type = wxPropertyValueStringPtr; @@ -382,8 +370,8 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom) return ; case wxPropertyValueStringPtr: { - char** s = copyFrom.StringValuePtr(); - (*this) = s; + wxChar** s = copyFrom.StringValuePtr(); + (*this) = s != 0; return ; } @@ -457,7 +445,7 @@ int wxPropertyValue::Number(void) const 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; @@ -466,90 +454,78 @@ void wxPropertyValue::WritePropertyClause(ostream& stream) // Write this expres if (node) { node->WritePropertyType(stream); - stream << "("; + stream.Append( _T("(") ); node = node->m_next; bool first = TRUE; while (node) { if (!first) - stream << " "; + stream.Append( _T(" ") ); node->WritePropertyType(stream); node = node->m_next; - if (node) stream << ",\n"; + if (node) + stream.Append( _T(",\n" ) ); first = FALSE; } - stream << ").\n\n"; + stream.Append( _T(").\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( _T("%ld"), m_value.integer ); + stream.Append( tmp ); break; } case wxPropertyValueIntegerPtr: { - stream << *m_value.integerPtr; + tmp.Printf( _T("%ld"), *m_value.integerPtr ); + stream.Append( tmp ); break; } case wxPropertyValuebool: { if (m_value.integer) - stream << "True"; + stream.Append( _T("True") ); else - stream << "False"; + stream.Append( _T("False") ); break; } case wxPropertyValueboolPtr: { if (*m_value.integerPtr) - stream << "True"; + stream.Append( _T("True") ); else - stream << "False"; + stream.Append( _T("False") ); break; } case wxPropertyValueReal: { - float f = m_value.real; - sprintf(wxBuffer, "%.6g", (double)f); - stream << wxBuffer; + double d = m_value.real; + tmp.Printf( _T("%.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; -*/ - sprintf(wxBuffer, "%.6g", f); - stream << wxBuffer; + double d = *m_value.realPtr; + tmp.Printf( _T("%.6g"), d ); + stream.Append( tmp ); break; } case wxPropertyValueString: { -// stream << "\""; - int i; - int len = strlen(m_value.string); - for (i = 0; i < len; i++) - { - char ch = m_value.string[i]; -// if (ch == '"' || ch == '\\') -// stream << "\\"; - stream << ch; - } - -// stream << "\""; + stream.Append( m_value.string ); break; } case wxPropertyValueStringPtr: { - wxFAIL_MSG( "wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented" ); + wxFAIL_MSG( _T("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") ); /* int i; int len = strlen(*(m_value.stringPtr)); @@ -564,19 +540,20 @@ void wxPropertyValue::WritePropertyType(ostream& stream) // Write as any othe case wxPropertyValueList: { if (!m_value.first) - stream << "[]"; + stream.Append( _T("[]") ); else { wxPropertyValue *expr = m_value.first; - stream << "["; + stream.Append( _T("[") ); while (expr) { expr->WritePropertyType(stream); expr = expr->m_next; - if (expr) stream << ", "; + if (expr) + stream.Append( _T(", ") ); } - stream << "]"; + stream.Append( _T("]") ); } break; } @@ -586,16 +563,9 @@ void wxPropertyValue::WritePropertyType(ostream& stream) // Write as any othe 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) @@ -607,7 +577,7 @@ void wxPropertyValue::operator=(const wxPropertyValue& val) // void wxPropertyValue::operator=(const char *val) void wxPropertyValue::operator=(const wxString& val1) { - const char *val = (const char *)val1; + const wxChar *val = (const wxChar *)val1; m_modifiedFlag = TRUE; if (m_type == wxPropertyValueNull) @@ -689,13 +659,13 @@ void wxPropertyValue::operator=(const float val) m_next = NULL; } -void wxPropertyValue::operator=(const char **val) +void wxPropertyValue::operator=(const wxChar **val) { m_modifiedFlag = TRUE; m_type = wxPropertyValueStringPtr; if (val) - m_value.stringPtr = (char **)val; + m_value.stringPtr = (wxChar **)val; else m_value.stringPtr = NULL; m_clientData = NULL; @@ -787,7 +757,7 @@ bool *wxPropertyValue::BoolValuePtr(void) const return m_value.boolPtr; } -char *wxPropertyValue::StringValue(void) const { +wxChar *wxPropertyValue::StringValue(void) const { if (m_type == wxPropertyValueString) return m_value.string; else if (m_type == wxPropertyValueStringPtr) @@ -795,7 +765,7 @@ char *wxPropertyValue::StringValue(void) const { else return NULL; } -char **wxPropertyValue::StringValuePtr(void) const +wxChar **wxPropertyValue::StringValuePtr(void) const { return m_value.stringPtr; } @@ -951,16 +921,6 @@ wxPropertySheet::~wxPropertySheet(void) Clear(); } -bool wxPropertySheet::Save( ostream& WXUNUSED(str) ) -{ - return FALSE; -} - -bool wxPropertySheet::Load( ostream& WXUNUSED(str) ) -{ - return FALSE; -} - void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) ) { } @@ -968,13 +928,13 @@ void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) ) // Add a property void wxPropertySheet::AddProperty(wxProperty *property) { - m_properties.Append((const char*) property->GetName(), property); + m_properties.Append((const wxChar*) property->GetName(), property); } // Get property by name wxProperty *wxPropertySheet::GetProperty(const wxString& name) const { - wxNode *node = m_properties.Find((const char*) name); + wxNode *node = m_properties.Find((const wxChar*) name); if (!node) return NULL; else @@ -1052,19 +1012,19 @@ wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void) void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator) { - Put((const char*) typeName, validator); + Put((const wxChar*) typeName, validator); } wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName) { - return (wxPropertyValidator *)Get((const char*) typeName); + return (wxPropertyValidator *)Get((const wxChar*) typeName); } void wxPropertyValidatorRegistry::ClearRegistry(void) { BeginFind(); wxNode *node; - while ((node = Next())) + while ((node = Next()) != NULL) { delete (wxPropertyValidator *)node->Data(); } @@ -1086,66 +1046,64 @@ wxPropertyValidator::wxPropertyValidator(long flags) wxPropertyValidator::~wxPropertyValidator(void) {} -bool wxPropertyValidator::StringToFloat (char *s, float *number) { +bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) { double num; bool ok = StringToDouble (s, &num); *number = (float) num; return ok; } -bool wxPropertyValidator::StringToDouble (char *s, double *number) { +bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) { bool ok = TRUE; - char *value_ptr; - *number = strtod (s, &value_ptr); + wxChar *value_ptr; + *number = wxStrtod (s, &value_ptr); if (value_ptr) { - int len = strlen (value_ptr); + int len = wxStrlen (value_ptr); for (int i = 0; i < len; i++) { - ok = (isspace (value_ptr[i]) != 0); + ok = (wxIsspace (value_ptr[i]) != 0); if (!ok) return FALSE; } } return ok; } -bool wxPropertyValidator::StringToInt (char *s, int *number) { +bool wxPropertyValidator::StringToInt (wxChar *s, int *number) { long num; bool ok = StringToLong (s, &num); *number = (int) num; return ok; } -bool wxPropertyValidator::StringToLong (char *s, long *number) { +bool wxPropertyValidator::StringToLong (wxChar *s, long *number) { bool ok = TRUE; - char *value_ptr; - *number = strtol (s, &value_ptr, 10); + wxChar *value_ptr; + *number = wxStrtol (s, &value_ptr, 10); if (value_ptr) { - int len = strlen (value_ptr); + int len = wxStrlen (value_ptr); for (int i = 0; i < len; i++) { - ok = (isspace (value_ptr[i]) != 0); + ok = (wxIsspace (value_ptr[i]) != 0); if (!ok) return FALSE; } } return ok; } -char *wxPropertyValidator::FloatToString (float number) { - static char buf[20]; - sprintf (buf, "%.6g", number); +wxChar *wxPropertyValidator::FloatToString (float number) { + static wxChar buf[20]; + wxSprintf (buf, _T("%.6g"), number); return buf; } -char *wxPropertyValidator::DoubleToString (double number) { - static char buf[20]; - sprintf (buf, "%.6g", number); +wxChar *wxPropertyValidator::DoubleToString (double number) { + static wxChar buf[20]; + wxSprintf (buf, _T("%.6g"), number); return buf; } -char *wxPropertyValidator::IntToString (int number) { +wxChar *wxPropertyValidator::IntToString (int number) { return ::IntToString (number); } -char *wxPropertyValidator::LongToString (long number) { +wxChar *wxPropertyValidator::LongToString (long number) { return ::LongToString (number); } - -