From 5c2cd0f67a6122776a4b9be2849266b8e6e8db2d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 2 Dec 2004 09:42:03 +0000 Subject: [PATCH] Fix compilo on Unix using src/iodbc which has no SQL_C_WCHAR git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dbgrid.cpp | 2 ++ src/common/dbtable.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index bdb5aa196a..ed58753424 100644 --- a/src/common/dbgrid.cpp +++ b/src/common/dbgrid.cpp @@ -276,7 +276,9 @@ wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col) switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype) { case SQL_C_CHAR: +#ifndef __UNIX__ case SQL_C_WCHAR: +#endif return wxGRID_VALUE_STRING; case SQL_C_SHORT: case SQL_C_SSHORT: diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index 3e33499159..50c832a5f2 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -1291,7 +1291,9 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere, switch(colDefs[colNo].SqlCtype) { case SQL_C_CHAR: +#ifndef __UNIX__ case SQL_C_WCHAR: +#endif //case SQL_C_WXCHAR: SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNo].PtrDataObj); break; @@ -2177,7 +2179,9 @@ void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull) switch(colDefs[colNo].SqlCtype) { case SQL_C_CHAR: +#ifndef __UNIX__ case SQL_C_WCHAR: +#endif //case SQL_C_WXCHAR: SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR ((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] = 0; break; -- 2.45.2