X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a349c39a0d074d586add9c0d61f0ecb11d6acf6..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/common/dbgrid.cpp

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index bdb5aa196a..e41f15105a 100644
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -11,10 +11,6 @@
 // Branched From : dbgrid.cpp,v 1.18 2000/12/19 13:00:58
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dbgrid.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -276,7 +272,9 @@ wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col)
             switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype)
             {
                 case SQL_C_CHAR:
+#ifdef SQL_C_WCHAR
                 case SQL_C_WCHAR:
+#endif                 
                     return wxGRID_VALUE_STRING;
                 case SQL_C_SHORT:
                 case SQL_C_SSHORT:
@@ -446,7 +444,7 @@ long wxDbGridTableBase::GetValueAsLong(int row, int col)
         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {
-        wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
+        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
         return val.GetLong();
     }
     wxFAIL_MSG (_T("unknown column, "));
@@ -471,7 +469,7 @@ double wxDbGridTableBase::GetValueAsDouble(int row, int col)
         (sqltype == SQL_C_FLOAT) ||
         (sqltype == SQL_C_DOUBLE))
     {
-        wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
+        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
         return val.GetDouble();
     }
     wxFAIL_MSG (_T("unknown column"));
@@ -494,7 +492,7 @@ bool wxDbGridTableBase::GetValueAsBool(int row, int col)
         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {
-        wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
+        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
         return val.GetBool();
     }
     wxFAIL_MSG (_T("unknown column, "));
@@ -523,7 +521,7 @@ void* wxDbGridTableBase::GetValueAsCustom(int row, int col, const wxString& type
             (sqltype == SQL_C_TIME) ||
             (sqltype == SQL_C_TIMESTAMP))
         {
-            wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
+            wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
             return new wxDateTime(val.GetDateTime());
         }
     }
@@ -560,7 +558,7 @@ void wxDbGridTableBase::SetValueAsCustom(int row, int col, const wxString& typeN
             }
             wxVariant val(date);
             m_rowmodified = true;
-            m_data->SetCol(m_ColInfo[col].DbCol,val);
+            m_data->SetColumn(m_ColInfo[col].DbCol,val);
         }
     }
     wxFAIL_MSG (_T("unknown column data type"));
@@ -592,7 +590,7 @@ wxString wxDbGridTableBase::GetValue(int row, int col)
     wxLogDebug(wxT("GetValue() on %i,%i"),row,col);
 
     ValidateRow(row);
-    wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
+    wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
     wxLogDebug(wxT("\tReturning \"%s\"\n"),val.GetString().c_str());
 
     return val.GetString();
@@ -607,7 +605,7 @@ void wxDbGridTableBase::SetValue(int row, int col,const wxString& value)
     wxVariant val(value);
 
     m_rowmodified = true;
-    m_data->SetCol(m_ColInfo[col].DbCol,val);
+    m_data->SetColumn(m_ColInfo[col].DbCol,val);
 }
 
 
@@ -619,7 +617,7 @@ void wxDbGridTableBase::SetValueAsLong(int row, int col, long value)
     wxVariant val(value);
 
     m_rowmodified = true;
-    m_data->SetCol(m_ColInfo[col].DbCol,val);
+    m_data->SetColumn(m_ColInfo[col].DbCol,val);
 }
 
 
@@ -631,7 +629,7 @@ void wxDbGridTableBase::SetValueAsDouble(int row, int col, double value)
     wxVariant val(value);
 
     m_rowmodified = true;
-    m_data->SetCol(m_ColInfo[col].DbCol,val);
+    m_data->SetColumn(m_ColInfo[col].DbCol,val);
 
 }
 
@@ -644,7 +642,7 @@ void wxDbGridTableBase::SetValueAsBool(int row, int col, bool value)
     wxVariant val(value);
 
     m_rowmodified = true;
-    m_data->SetCol(m_ColInfo[col].DbCol,val);
+    m_data->SetColumn(m_ColInfo[col].DbCol,val);
 }
 
 
@@ -725,7 +723,7 @@ bool wxDbGridTableBase::Writeback() const
 
 #include "wx/arrimpl.cpp"
 
-WX_DEFINE_EXPORTED_OBJARRAY(keyarray);
+WX_DEFINE_EXPORTED_OBJARRAY(keyarray)
 
 #endif  // #if wxUSE_GRID
 #endif  // #if wxUSE_ODBC