X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34fdf76231e5e0adc6f1a0543f19f7ab8fcb91d9..a6de86fa530d95b6f30e0349e81de8b8692b348f:/src/common/dbgrid.cpp diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index 4e41ffcd66..3ded105825 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 @@ -263,7 +263,7 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners return TRUE; } -wxString wxDbGridTableBase::GetTypeName(int row, int col) +wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col) { if (GetNumberCols() > col) { @@ -370,7 +370,7 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName return FALSE; } -bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName) +bool wxDbGridTableBase::CanSetValueAs(int WXUNUSED(row), int col, const wxString& typeName) { if (typeName == wxGRID_VALUE_STRING) { @@ -680,7 +680,7 @@ 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();