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
This commit is contained in:
@@ -276,7 +276,7 @@ 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__
|
#ifdef SQL_C_WCHAR
|
||||||
case SQL_C_WCHAR:
|
case SQL_C_WCHAR:
|
||||||
#endif
|
#endif
|
||||||
return wxGRID_VALUE_STRING;
|
return wxGRID_VALUE_STRING;
|
||||||
|
@@ -1308,7 +1308,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
|
|||||||
switch(colDefs[colNumber].SqlCtype)
|
switch(colDefs[colNumber].SqlCtype)
|
||||||
{
|
{
|
||||||
case SQL_C_CHAR:
|
case SQL_C_CHAR:
|
||||||
#ifndef __UNIX__
|
#ifdef SQL_C_WCHAR
|
||||||
case SQL_C_WCHAR:
|
case SQL_C_WCHAR:
|
||||||
#endif
|
#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
|
||||||
@@ -2201,7 +2201,7 @@ void wxDbTable::ClearMemberVar(UWORD colNumber, bool setToNull)
|
|||||||
switch(colDefs[colNumber].SqlCtype)
|
switch(colDefs[colNumber].SqlCtype)
|
||||||
{
|
{
|
||||||
case SQL_C_CHAR:
|
case SQL_C_CHAR:
|
||||||
#ifndef __UNIX__
|
#ifdef SQL_C_WCHAR
|
||||||
case SQL_C_WCHAR:
|
case SQL_C_WCHAR:
|
||||||
#endif
|
#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
|
||||||
|
Reference in New Issue
Block a user