X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12353a277fc1bcf4b70745fd02478b9b08b1ec0d..16d54adb37e9578045b2efe78613de8cf1cf9d78:/src/common/dbgrid.cpp

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 713592835d..b7b2218e48 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()
 {
@@ -368,14 +372,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.
@@ -728,6 +724,6 @@ bool wxDbGridTableBase::Writeback() const
 
 WX_DEFINE_EXPORTED_OBJARRAY(keyarray);
 
-#endif  // #if wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID
 #endif  // #if wxUSE_ODBC