X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ea105e0ba20c15e4d83f829e1c4faeb0a4952f0..1d37e644007e676b82e75426daa1d5118bb76780:/src/generic/proplist.cpp diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp index c571468482..4a44094a8e 100644 --- a/src/generic/proplist.cpp +++ b/src/generic/proplist.cpp @@ -24,26 +24,14 @@ #include "wx/wx.h" #endif +#include "wx/colordlg.h" +#include "wx/proplist.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/colordlg.h" -#include "wx/proplist.h" /* * Property text edit control @@ -158,7 +146,7 @@ bool wxPropertyListView::UpdatePropertyList(bool clearEditArea) wxString stringValueRepr(property->GetValue().GetStringRepresentation()); wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr)); - m_propertyScrollingList->Append(paddedString.GetData(), (char *)property); + m_propertyScrollingList->Append(paddedString.GetData(), (void *)property); node = node->Next(); } return TRUE; @@ -960,7 +948,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow)) { wxString s(view->GetValueList()->GetStringSelection()); - if (s != "") + if (s != _T("")) { view->GetValueText()->SetValue(s); view->RetrieveProperty(property); @@ -1483,7 +1471,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v m_filenameWildCard.GetData(), 0, parentWindow); - if (s != "") + if (s != _T("")) { property->GetValue() = s; view->DisplayProperty(property); @@ -1896,7 +1884,7 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event)) wxChar *initialText = _T(""); wxNode *node = m_stringList->Add(initialText); - m_listBox->Append(initialText, (wxChar *)node); + m_listBox->Append(initialText, (void *)node); m_currentSelection = m_stringList->Number() - 1; m_listBox->SetSelection(m_currentSelection); ShowCurrentSelection();