]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix compilo on Unix using src/iodbc which has no SQL_C_WCHAR
authorJulian Smart <julian@anthemion.co.uk>
Thu, 2 Dec 2004 09:42:03 +0000 (09:42 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Thu, 2 Dec 2004 09:42:03 +0000 (09:42 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/dbgrid.cpp
src/common/dbtable.cpp

index bdb5aa196a9486cfc4a4fcdeb724b54df5635d4d..ed58753424166cd86fa0168fe2bf785a308db5d7 100644 (file)
@@ -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:
index 3e3349915935a9a01bbc9c11e866c314818a3ee7..50c832a5f2303b2cb3a863d87d26d70d3a936581 100644 (file)
@@ -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;