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

Fix compilo on Unix using src/iodbc which has no SQL_C_WCHAR

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-12-02 09:42:03 +00:00
parent ff3d9a3532
commit 5c2cd0f67a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dbgrid.cpp
View File

@@ -276,7 +276,9 @@ wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col)
switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype) switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype)
{ {
case SQL_C_CHAR: case SQL_C_CHAR:
#ifndef __UNIX__
case SQL_C_WCHAR: case SQL_C_WCHAR:
#endif
return wxGRID_VALUE_STRING; return wxGRID_VALUE_STRING;
case SQL_C_SHORT: case SQL_C_SHORT:
case SQL_C_SSHORT: case SQL_C_SSHORT:

4
src/common/dbtable.cpp
View File

@@ -1291,7 +1291,9 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
switch(colDefs[colNo].SqlCtype) switch(colDefs[colNo].SqlCtype)
{ {
case SQL_C_CHAR: case SQL_C_CHAR:
#ifndef __UNIX__
case 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 //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); colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNo].PtrDataObj);
break; break;
@@ -2177,7 +2179,9 @@ void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull)
switch(colDefs[colNo].SqlCtype) switch(colDefs[colNo].SqlCtype)
{ {
case SQL_C_CHAR: case SQL_C_CHAR:
#ifndef __UNIX__
case 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 //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; ((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] = 0;
break; break;