Could of Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ec2ba3aa46
commit
ee0fc54abf
@ -162,7 +162,7 @@ bool wxPropertyFormView::AssociateNames(void)
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxWindow *win = (wxWindow *)node->Data();
|
wxWindow *win = (wxWindow *)node->Data();
|
||||||
if (win->GetName() != "")
|
if (win->GetName() != _T(""))
|
||||||
{
|
{
|
||||||
wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
|
wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
|
||||||
if (prop)
|
if (prop)
|
||||||
@ -219,7 +219,7 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
|
|||||||
if (!m_propertySheet)
|
if (!m_propertySheet)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (win.GetName() == "")
|
if (win.GetName() == _T(""))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (wxStrcmp(win.GetName(), _T("ok")) == 0)
|
if (wxStrcmp(win.GetName(), _T("ok")) == 0)
|
||||||
|
@ -158,7 +158,7 @@ bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
|
|||||||
wxString stringValueRepr(property->GetValue().GetStringRepresentation());
|
wxString stringValueRepr(property->GetValue().GetStringRepresentation());
|
||||||
wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
|
wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
|
||||||
|
|
||||||
m_propertyScrollingList->Append(paddedString.GetData(), (char *)property);
|
m_propertyScrollingList->Append(paddedString.GetData(), (void *)property);
|
||||||
node = node->Next();
|
node = node->Next();
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -960,7 +960,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp
|
|||||||
bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
|
bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
|
||||||
{
|
{
|
||||||
wxString s(view->GetValueList()->GetStringSelection());
|
wxString s(view->GetValueList()->GetStringSelection());
|
||||||
if (s != "")
|
if (s != _T(""))
|
||||||
{
|
{
|
||||||
view->GetValueText()->SetValue(s);
|
view->GetValueText()->SetValue(s);
|
||||||
view->RetrieveProperty(property);
|
view->RetrieveProperty(property);
|
||||||
@ -1483,7 +1483,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
|
|||||||
m_filenameWildCard.GetData(),
|
m_filenameWildCard.GetData(),
|
||||||
0,
|
0,
|
||||||
parentWindow);
|
parentWindow);
|
||||||
if (s != "")
|
if (s != _T(""))
|
||||||
{
|
{
|
||||||
property->GetValue() = s;
|
property->GetValue() = s;
|
||||||
view->DisplayProperty(property);
|
view->DisplayProperty(property);
|
||||||
@ -1896,7 +1896,7 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
wxChar *initialText = _T("");
|
wxChar *initialText = _T("");
|
||||||
wxNode *node = m_stringList->Add(initialText);
|
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_currentSelection = m_stringList->Number() - 1;
|
||||||
m_listBox->SetSelection(m_currentSelection);
|
m_listBox->SetSelection(m_currentSelection);
|
||||||
ShowCurrentSelection();
|
ShowCurrentSelection();
|
||||||
|
Loading…
Reference in New Issue
Block a user