From: Julian Smart Date: Thu, 10 Feb 2005 16:31:13 +0000 (+0000) Subject: Applied patch [ 1117207 ] changed the test for SQL_C_WCHAR X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/92850d6b2ff6072f4801152fd6bfdb7263715ec0 Applied patch [ 1117207 ] changed the test for SQL_C_WCHAR git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index af7ae488dc..d1e4b6ed4b 100644 --- a/src/common/dbgrid.cpp +++ b/src/common/dbgrid.cpp @@ -276,7 +276,7 @@ wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col) switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype) { case SQL_C_CHAR: -#ifndef __UNIX__ +#ifdef SQL_C_WCHAR case SQL_C_WCHAR: #endif return wxGRID_VALUE_STRING; diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index 65fe9e943d..2506131b06 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -1308,7 +1308,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere, switch(colDefs[colNumber].SqlCtype) { case SQL_C_CHAR: -#ifndef __UNIX__ +#ifdef SQL_C_WCHAR case SQL_C_WCHAR: #endif //case SQL_C_WXCHAR: SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR @@ -2201,7 +2201,7 @@ void wxDbTable::ClearMemberVar(UWORD colNumber, bool setToNull) switch(colDefs[colNumber].SqlCtype) { case SQL_C_CHAR: -#ifndef __UNIX__ +#ifdef SQL_C_WCHAR case SQL_C_WCHAR: #endif //case SQL_C_WXCHAR: SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR