Font updates

[wxWidgets.git] / src / common / dbgrid.cpp

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 4eb92f85eb892c142c12ab03271f26e79772bced..83e673a9183c52e6e5f359f9edfc6b8cc4924fb7 100644 (file)
--- 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)
 {
 
 wxString wxDbGridTableBase::GetTypeName(int row, int col)
 {

-    if (col == 8)
-        int breakpoint = 1;
-

     if (GetNumberCols() > col)
     {
         if (m_ColInfo[col].wxtypename == wxGRID_VALUE_DBAUTO)
     if (GetNumberCols() > col)
     {
         if (m_ColInfo[col].wxtypename == wxGRID_VALUE_DBAUTO)


@@ -371,14 +368,6 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
 
 bool wxDbGridTableBase::CanSetValueAs(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.
     if (typeName == wxGRID_VALUE_STRING)
     {
         //FIXME ummm What about blob field etc.


@@ -727,9 +716,9 @@ bool wxDbGridTableBase::Writeback() const
     return result;
 }
 
     return result;
 }
 

-#include <wx/arrimpl.cpp>
+#include "wx/arrimpl.cpp"

 
 

-WX_DEFINE_OBJARRAY(keyarray);
+WX_DEFINE_EXPORTED_OBJARRAY(keyarray);

 
 #endif  // #if wxUSE_NEW_GRID
 #endif  // #if wxUSE_ODBC
 
 #endif  // #if wxUSE_NEW_GRID
 #endif  // #if wxUSE_ODBC