X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a144affed28cbd6828dfbe8c17b4cac989e7a6b3..68698f0308f5c46966b7de12b34f68ec23dd3ec8:/src/common/dbgrid.cpp?ds=inline diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index 261a098eb7..83e673a918 100644 --- a/src/common/dbgrid.cpp +++ b/src/common/dbgrid.cpp @@ -261,9 +261,6 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners wxString wxDbGridTableBase::GetTypeName(int row, int col) { - if (col == 8) - int breakpoint = 1; - if (GetNumberCols() > col) { if (m_ColInfo[col].wxtypename == wxGRID_VALUE_DBAUTO) @@ -276,37 +273,26 @@ wxString wxDbGridTableBase::GetTypeName(int row, int col) { case SQL_C_CHAR: return wxGRID_VALUE_STRING; - break; case SQL_C_SSHORT: return wxGRID_VALUE_NUMBER; - break; case SQL_C_USHORT: return wxGRID_VALUE_NUMBER; - break; case SQL_C_SLONG: return wxGRID_VALUE_NUMBER; - break; case SQL_C_ULONG: return wxGRID_VALUE_NUMBER; - break; case SQL_C_FLOAT: return wxGRID_VALUE_FLOAT; - break; case SQL_C_DOUBLE: return wxGRID_VALUE_FLOAT; - break; case SQL_C_DATE: return wxGRID_VALUE_DATETIME; - break; case SQL_C_TIME: return wxGRID_VALUE_DATETIME; - break; case SQL_C_TIMESTAMP: return wxGRID_VALUE_DATETIME; - break; default: return wxGRID_VALUE_STRING; - break; } } else @@ -382,14 +368,6 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName) { - //Is this needed? As will be validated on SetValueAsXXXX - ValidateRow(row); - - if (m_data->IsColNull(m_ColInfo[col].DbCol)) - { - return FALSE; - } - if (typeName == wxGRID_VALUE_STRING) { //FIXME ummm What about blob field etc. @@ -738,9 +716,9 @@ bool wxDbGridTableBase::Writeback() const return result; } -#include +#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(keyarray); +WX_DEFINE_EXPORTED_OBJARRAY(keyarray); #endif // #if wxUSE_NEW_GRID #endif // #if wxUSE_ODBC