Could of Unicode fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index bda34bb83ade931e08794484154befc9e79d5019..9a9e513763964016b4d532c1069a693e73105ba6 100644 (file)
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -162,7 +162,7 @@ bool wxPropertyFormView::AssociateNames(void)
   while (node)
   {
     wxWindow *win = (wxWindow *)node->Data();
   while (node)
   {
     wxWindow *win = (wxWindow *)node->Data();

-    if (win->GetName() != "")
+    if (win->GetName() != _T(""))

     {
       wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
       if (prop)
     {
       wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
       if (prop)


@@ -219,7 +219,7 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
   if (!m_propertySheet)
     return;
     
   if (!m_propertySheet)
     return;
     

-  if (win.GetName() == "")
+  if (win.GetName() == _T(""))

     return;
 
   if (wxStrcmp(win.GetName(), _T("ok")) == 0)
     return;
 
   if (wxStrcmp(win.GetName(), _T("ok")) == 0)

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index c57146848201c2ff14862583549a8a5ed475c20b..3c0922e09d605e1c8ada45de4a694eb8e69adf9b 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -158,7 +158,7 @@ bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
     wxString stringValueRepr(property->GetValue().GetStringRepresentation());
     wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
 
     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;
     node = node->Next();
   }
   return TRUE;


@@ -960,7 +960,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp
 bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   wxString s(view->GetValueList()->GetStringSelection());
 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);
   {
     view->GetValueText()->SetValue(s);
     view->RetrieveProperty(property);


@@ -1483,7 +1483,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
      m_filenameWildCard.GetData(),
      0,
      parentWindow);
      m_filenameWildCard.GetData(),
      0,
      parentWindow);

-  if (s != "")
+  if (s != _T(""))

   {
     property->GetValue() = s;
     view->DisplayProperty(property);
   {
     property->GetValue() = s;
     view->DisplayProperty(property);


@@ -1896,7 +1896,7 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
 
   wxChar *initialText = _T("");
   wxNode *node = m_stringList->Add(initialText);
 
   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();
   m_currentSelection = m_stringList->Number() - 1;
   m_listBox->SetSelection(m_currentSelection);
   ShowCurrentSelection();