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 af7ae488dc5a896883bfbe871e65a87c2a90d905..d1e4b6ed4b3c949ee3ba64859398e414ecf544cd 100644 (file)
--- 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 65fe9e943ddaa93872eff2ab6a44b0144253923b..2506131b06ce6bea2aba30f1286f687a9906292c 100644 (file)
--- 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