X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eae630f13910282c8da1dced8c15c2b478bab759..b6a20a20d010d643e52914f51aa0700df0da925f:/src/common/dbgrid.cpp diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index e541773ef2..feecae05dc 100644 --- a/src/common/dbgrid.cpp +++ b/src/common/dbgrid.cpp @@ -11,7 +11,7 @@ // Branched From : dbgrid.cpp,v 1.18 2000/12/19 13:00:58 /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dbgrid.h" #endif @@ -23,7 +23,7 @@ #if wxUSE_ODBC -#if wxUSE_NEW_GRID +#if wxUSE_GRID #ifndef WX_PRECOMP #include "wx/textctrl.h" @@ -33,6 +33,10 @@ #include "wx/generic/gridctrl.h" #include "wx/dbgrid.h" +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxDbGrid") + wxDbGridCellAttrProvider::wxDbGridCellAttrProvider() { @@ -128,7 +132,7 @@ wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo* ColInfo, m_keys(), m_data(tab), m_dbowner(takeOwnership), - m_rowmodified(false) + m_rowmodified(FALSE) { if (count == wxUSE_QUERY) @@ -175,7 +179,7 @@ wxDbGridTableBase::~wxDbGridTableBase() //FIXME: should i remove m_ColInfo and m_data from m_attrProvider if a wxDbGridAttrProvider // if ((provider = dynamic_cast(GetAttrProvider()))) - // Using C casting for now until we can support dynamic_cast with wxWindows + // Using C casting for now until we can support dynamic_cast with wxWidgets provider = (wxDbGridCellAttrProvider *)(GetAttrProvider()); if (provider) { @@ -197,7 +201,7 @@ bool wxDbGridTableBase::CanHaveAttributes() // use the default attr provider by default SetAttrProvider(new wxDbGridCellAttrProvider(m_data, m_ColInfo)); } - return true; + return TRUE; } @@ -229,7 +233,7 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners m_data = tab; //FIXME: Remove dynamic_cast before sumision to wxwin // if ((provider = dynamic_cast (GetAttrProvider()))) - // Using C casting for now until we can support dynamic_cast with wxWindows + // Using C casting for now until we can support dynamic_cast with wxWidgets provider = (wxDbGridCellAttrProvider *)(GetAttrProvider()); if (provider) { @@ -255,15 +259,12 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners grid->EndBatch(); } m_dbowner = takeOwnership; - m_rowmodified = false; - return true; + m_rowmodified = FALSE; + return TRUE; } -wxString wxDbGridTableBase::GetTypeName(int row, int col) +wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col) { - if (col == 8) - int breakpoint = 1; - if (GetNumberCols() > col) { if (m_ColInfo[col].wxtypename == wxGRID_VALUE_DBAUTO) @@ -276,37 +277,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 @@ -327,19 +317,19 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName if (typeName == wxGRID_VALUE_STRING) { //FIXME ummm What about blob field etc. - return true; + return TRUE; } if (m_data->IsColNull(m_ColInfo[col].DbCol)) { - return false; + return FALSE; } if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol) { //If a virtual column then we can't find it's type. we have to - // return false to get using wxVariant. - return false; + // return FALSE to get using wxVariant. + return FALSE; } int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype; @@ -349,9 +339,9 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_TIME) || (sqltype == SQL_C_TIMESTAMP)) { - return true; + return TRUE; } - return false; + return FALSE; } if (typeName == wxGRID_VALUE_NUMBER) { @@ -360,9 +350,9 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_SLONG) || (sqltype == SQL_C_ULONG)) { - return true; + return TRUE; } - return false; + return FALSE; } if (typeName == wxGRID_VALUE_FLOAT) { @@ -373,39 +363,31 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_FLOAT) || (sqltype == SQL_C_DOUBLE)) { - return true; + return TRUE; } - return false; + return FALSE; } - return false; + return FALSE; } -bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName) +bool wxDbGridTableBase::CanSetValueAs(int WXUNUSED(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. - return true; + return TRUE; } if (!(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].Updateable)) { - return false; + return FALSE; } if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol) { //If a virtual column then we can't find it's type. we have to faulse to //get using wxVairent. - return false; + return FALSE; } int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype; @@ -415,9 +397,9 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_TIME) || (sqltype == SQL_C_TIMESTAMP)) { - return true; + return TRUE; } - return false; + return FALSE; } if (typeName == wxGRID_VALUE_NUMBER) { @@ -426,9 +408,9 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_SLONG) || (sqltype == SQL_C_ULONG)) { - return true; + return TRUE; } - return false; + return FALSE; } if (typeName == wxGRID_VALUE_FLOAT) { @@ -439,11 +421,11 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName (sqltype == SQL_C_FLOAT) || (sqltype == SQL_C_DOUBLE)) { - return true; + return TRUE; } - return false; + return FALSE; } - return false; + return FALSE; } long wxDbGridTableBase::GetValueAsLong(int row, int col) @@ -574,7 +556,7 @@ void wxDbGridTableBase::SetValueAsCustom(int row, int col, const wxString& typeN return; } wxVariant val(date); - m_rowmodified = true; + m_rowmodified = TRUE; m_data->SetCol(m_ColInfo[col].DbCol,val); } } @@ -621,7 +603,7 @@ void wxDbGridTableBase::SetValue(int row, int col,const wxString& value) ValidateRow(row); wxVariant val(value); - m_rowmodified = true; + m_rowmodified = TRUE; m_data->SetCol(m_ColInfo[col].DbCol,val); } @@ -633,7 +615,7 @@ void wxDbGridTableBase::SetValueAsLong(int row, int col, long value) ValidateRow(row); wxVariant val(value); - m_rowmodified = true; + m_rowmodified = TRUE; m_data->SetCol(m_ColInfo[col].DbCol,val); } @@ -645,7 +627,7 @@ void wxDbGridTableBase::SetValueAsDouble(int row, int col, double value) ValidateRow(row); wxVariant val(value); - m_rowmodified = true; + m_rowmodified = TRUE; m_data->SetCol(m_ColInfo[col].DbCol,val); } @@ -658,7 +640,7 @@ void wxDbGridTableBase::SetValueAsBool(int row, int col, bool value) ValidateRow(row); wxVariant val(value); - m_rowmodified = true; + m_rowmodified = TRUE; m_data->SetCol(m_ColInfo[col].DbCol,val); } @@ -698,24 +680,24 @@ void wxDbGridTableBase::ValidateRow(int row) m_data->SetKey(k); if (!m_data->QueryOnKeyFields()) { - wxDbLogExtendedErrorMsg("ODBC error during Query()\n\n", m_data->GetDb(),__FILE__,__LINE__); + wxDbLogExtendedErrorMsg(_T("ODBC error during Query()\n\n"), m_data->GetDb(),__TFILE__,__LINE__); } m_data->GetNext(); m_row = row; } - m_rowmodified = false; + m_rowmodified = FALSE; } bool wxDbGridTableBase::Writeback() const { if (!m_rowmodified) { - return true; + return TRUE; } - bool result=true; + bool result=TRUE; wxLogDebug(wxT("\trow key unknown")); // FIXME: this code requires dbtable support for record status @@ -738,10 +720,10 @@ 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_GRID #endif // #if wxUSE_ODBC