Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/generic/proplist.cpp
View File

@@ -830,7 +830,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 != T(""))
if (s != wxT(""))
{
view->GetValueText()->SetValue(s);
view->RetrieveProperty(property);
@@ -898,8 +898,8 @@ bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
if (!StringToFloat(WXSTRINGCAST value, &val))
{
wxChar buf[200];
wxSprintf(buf, T("Value %s is not a valid real number!"), value.GetData());
wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
@@ -961,15 +961,15 @@ bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxProp
if (!StringToLong(WXSTRINGCAST value, &val))
{
wxChar buf[200];
wxSprintf(buf, T("Value %s is not a valid integer!"), value.GetData());
wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
if (val < m_integerMin || val > m_integerMax)
{
wxChar buf[200];
wxSprintf(buf, T("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
return TRUE;
@@ -1015,9 +1015,9 @@ bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
if (!view->GetValueText())
return FALSE;
wxString value(view->GetValueText()->GetValue());
if (value != T("True") && value != T("False"))
if (value != wxT("True") && value != wxT("False"))
{
wxMessageBox(T("Value must be True or False!"), T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
return TRUE;
@@ -1036,7 +1036,7 @@ bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
wxString value(view->GetValueText()->GetValue());
bool boolValue = FALSE;
if (value == T("True"))
if (value == wxT("True"))
boolValue = TRUE;
else
boolValue = FALSE;
@@ -1079,8 +1079,8 @@ bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property)
view->ShowListBoxControl(TRUE);
view->GetValueList()->Enable(TRUE);
view->GetValueList()->Append(T("True"));
view->GetValueList()->Append(T("False"));
view->GetValueList()->Append(wxT("True"));
view->GetValueList()->Append(wxT("False"));
wxChar *currentString = copystring(view->GetValueText()->GetValue());
view->GetValueList()->SetStringSelection(currentString);
delete[] currentString;
@@ -1353,7 +1353,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
m_filenameWildCard.GetData(),
0,
parentWindow);
if (s != T(""))
if (s != wxT(""))
{
property->GetValue() = s;
view->DisplayProperty(property);
@@ -1546,7 +1546,7 @@ void wxListOfStringsListValidator::OnEdit(wxProperty *property, wxPropertyListVi
expr = expr->GetNext();
}
wxString title(T("Editing "));
wxString title(wxT("Editing "));
title += property->GetName();
if (EditStringList(parentWindow, stringList, title.GetData()))
@@ -1766,7 +1766,7 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
{
SaveCurrentSelection();
wxChar *initialText = T("");
wxChar *initialText = wxT("");
wxNode *node = m_stringList->Add(initialText);
m_listBox->Append(initialText, (void *)node);
m_currentSelection = m_stringList->Number() - 1;