fixed bug with redoing the command when there was nothing to redo

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

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 545d3072e8ac97fc88100b531750748ebef1d7a7..48ada3a8140cd9f5d8bb1597cadb73c3ae9fa04c 100644 (file)
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -2,8 +2,8 @@
 // Name:        dbgrid.cpp
 // Purpose:     Displays a wxDbTable in a wxGrid.
 // Author:      Roger Gammans, Paul Gammans
 // Name:        dbgrid.cpp
 // Purpose:     Displays a wxDbTable in a wxGrid.
 // Author:      Roger Gammans, Paul Gammans

-// Modified by: 
-// Created:     
+// Modified by:
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
 // Licence:     wxWindows licence


@@ -113,7 +113,7 @@ wxGridCellAttr *wxDbGridCellAttrProvider::GetAttr(int row, int col,
                 break;
             }
         }
                 break;
             }
         }

-        
+

     }
     return attr;
 }
     }
     return attr;
 }


@@ -125,10 +125,10 @@ void wxDbGridCellAttrProvider::AssignDbTable(wxDbTable *tab)
 
 wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo*  ColInfo,
                      int count, bool takeOwnership)  :
 
 wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo*  ColInfo,
                      int count, bool takeOwnership)  :

-    m_keys(), 
+    m_keys(),

     m_data(tab),
     m_dbowner(takeOwnership),
     m_data(tab),
     m_dbowner(takeOwnership),

-    m_rowmodified(false)
+    m_rowmodified(FALSE)

 {
 
     if (count == wxUSE_QUERY)
 {
 
     if (count == wxUSE_QUERY)


@@ -162,7 +162,7 @@ wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo*  ColInfo,
         if (i < m_nocols)
         {
             wxLogDebug(wxT("NoCols under length after traversing %i items"),i);
         if (i < m_nocols)
         {
             wxLogDebug(wxT("NoCols under length after traversing %i items"),i);

-        } 
+        }

 #endif
     }
 }
 #endif
     }
 }


@@ -171,17 +171,18 @@ wxDbGridTableBase::~wxDbGridTableBase()
 {
     wxDbGridCellAttrProvider *provider;
 
 {
     wxDbGridCellAttrProvider *provider;
 

-    //Can't check for update here as 
+    //Can't check for update here as

 
     //FIXME: should i remove m_ColInfo and m_data from m_attrProvider if a wxDbGridAttrProvider
 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *>(GetAttrProvider())))
      // Using C casting for now until we can support dynamic_cast with wxWindows
 
     //FIXME: should i remove m_ColInfo and m_data from m_attrProvider if a wxDbGridAttrProvider
 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *>(GetAttrProvider())))
      // Using C casting for now until we can support dynamic_cast with wxWindows

-    if ((provider = (wxDbGridCellAttrProvider *)(GetAttrProvider())))
+    provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
+    if (provider)

     {
         provider->AssignDbTable(NULL);
     }
     delete [] m_ColInfo;
     {
         provider->AssignDbTable(NULL);
     }
     delete [] m_ColInfo;

-    
+

     Writeback();
     if (m_dbowner)
     {
     Writeback();
     if (m_dbowner)
     {


@@ -196,7 +197,7 @@ bool wxDbGridTableBase::CanHaveAttributes()
         // use the default attr provider by default
         SetAttrProvider(new wxDbGridCellAttrProvider(m_data, m_ColInfo));
     }
         // use the default attr provider by default
         SetAttrProvider(new wxDbGridCellAttrProvider(m_data, m_ColInfo));
     }

-    return true;
+    return TRUE;

 }
 
 
 }
 
 


@@ -226,14 +227,15 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners
     }
     m_keys.Empty();
     m_data = tab;
     }
     m_keys.Empty();
     m_data = tab;

-    //FIXME: Remove dynamic_cast before sumision to wxwin 
+    //FIXME: Remove dynamic_cast before sumision to wxwin

 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *> (GetAttrProvider())))
      // Using C casting for now until we can support dynamic_cast with wxWindows
 //    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *> (GetAttrProvider())))
      // Using C casting for now until we can support dynamic_cast with wxWindows

-    if ((provider = (wxDbGridCellAttrProvider *)(GetAttrProvider())))
+    provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
+    if (provider)

     {
         provider->AssignDbTable(m_data);
     }
     {
         provider->AssignDbTable(m_data);
     }

-    
+

     if (count == wxUSE_QUERY)
     {
         m_rowtotal = m_data ? m_data->Count() : 0;
     if (count == wxUSE_QUERY)
     {
         m_rowtotal = m_data ? m_data->Count() : 0;


@@ -253,15 +255,12 @@ bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwners
         grid->EndBatch();
     }
     m_dbowner = takeOwnership;
         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 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)


@@ -274,37 +273,26 @@ wxString wxDbGridTableBase::GetTypeName(int row, int col)
             {
                 case SQL_C_CHAR:
                     return wxGRID_VALUE_STRING;
             {
                 case SQL_C_CHAR:
                     return wxGRID_VALUE_STRING;

-                    break;

                 case SQL_C_SSHORT:
                     return wxGRID_VALUE_NUMBER;
                 case SQL_C_SSHORT:
                     return wxGRID_VALUE_NUMBER;

-                    break;

                 case SQL_C_USHORT:
                     return wxGRID_VALUE_NUMBER;
                 case SQL_C_USHORT:
                     return wxGRID_VALUE_NUMBER;

-                    break;

                 case SQL_C_SLONG:
                     return wxGRID_VALUE_NUMBER;
                 case SQL_C_SLONG:
                     return wxGRID_VALUE_NUMBER;

-                    break;

                 case SQL_C_ULONG:
                     return wxGRID_VALUE_NUMBER;
                 case SQL_C_ULONG:
                     return wxGRID_VALUE_NUMBER;

-                    break;

                 case SQL_C_FLOAT:
                     return wxGRID_VALUE_FLOAT;
                 case SQL_C_FLOAT:
                     return wxGRID_VALUE_FLOAT;

-                    break;

                 case SQL_C_DOUBLE:
                     return wxGRID_VALUE_FLOAT;
                 case SQL_C_DOUBLE:
                     return wxGRID_VALUE_FLOAT;

-                    break;

                 case SQL_C_DATE:
                     return wxGRID_VALUE_DATETIME;
                 case SQL_C_DATE:
                     return wxGRID_VALUE_DATETIME;

-                    break;

                 case SQL_C_TIME:
                     return wxGRID_VALUE_DATETIME;
                 case SQL_C_TIME:
                     return wxGRID_VALUE_DATETIME;

-                    break;

                 case SQL_C_TIMESTAMP:
                     return wxGRID_VALUE_DATETIME;
                 case SQL_C_TIMESTAMP:
                     return wxGRID_VALUE_DATETIME;

-                    break;

                 default:
                     return wxGRID_VALUE_STRING;
                 default:
                     return wxGRID_VALUE_STRING;

-                    break;

             }
         }
         else
             }
         }
         else


@@ -325,57 +313,57 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
     if (typeName == wxGRID_VALUE_STRING)
     {
         //FIXME ummm What about blob field etc.
     if (typeName == wxGRID_VALUE_STRING)
     {
         //FIXME ummm What about blob field etc.

-        return true;
+        return TRUE;

     }
 
     if (m_data->IsColNull(m_ColInfo[col].DbCol))
     {
     }
 
     if (m_data->IsColNull(m_ColInfo[col].DbCol))
     {

-        return false;
+        return FALSE;

     }
 
     if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
     {
     }
 
     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;
+        //If a virtual column then we can't find it's type. we have to
+        // return FALSE to get using wxVariant.
+        return FALSE;

     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;

-    
+

     if (typeName == wxGRID_VALUE_DATETIME)
     {
         if ((sqltype == SQL_C_DATE) ||
     if (typeName == wxGRID_VALUE_DATETIME)
     {
         if ((sqltype == SQL_C_DATE) ||

-            (sqltype == SQL_C_TIME) || 
+            (sqltype == SQL_C_TIME) ||

             (sqltype == SQL_C_TIMESTAMP))
         {
             (sqltype == SQL_C_TIMESTAMP))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
         if ((sqltype == SQL_C_SSHORT) ||
     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
         if ((sqltype == SQL_C_SSHORT) ||

-            (sqltype == SQL_C_USHORT) || 
+            (sqltype == SQL_C_USHORT) ||

             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG))
         {
             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_FLOAT)
     {
         if ((sqltype == SQL_C_SSHORT) ||
     }
     if (typeName == wxGRID_VALUE_FLOAT)
     {
         if ((sqltype == SQL_C_SSHORT) ||

-            (sqltype == SQL_C_USHORT) || 
+            (sqltype == SQL_C_USHORT) ||

             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG)  ||
             (sqltype == SQL_C_FLOAT)  ||
             (sqltype == SQL_C_DOUBLE))
         {
             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG)  ||
             (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 row, int col, const wxString& typeName)


@@ -385,63 +373,63 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName
 
     if (m_data->IsColNull(m_ColInfo[col].DbCol))
     {
 
     if (m_data->IsColNull(m_ColInfo[col].DbCol))
     {

-        return false;
+        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.

-        return true;
+        return TRUE;

     }
 
     if (!(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].Updateable))
     {
     }
 
     if (!(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].Updateable))
     {

-        return false;
+        return FALSE;

     }
 
     if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
     {
     }
 
     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 
+        //If a virtual column then we can't find it's type. we have to faulse to

         //get using wxVairent.
         //get using wxVairent.

-        return false;
+        return FALSE;

     }
 
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if (typeName == wxGRID_VALUE_DATETIME)
     {
         if ((sqltype == SQL_C_DATE) ||
     }
 
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if (typeName == wxGRID_VALUE_DATETIME)
     {
         if ((sqltype == SQL_C_DATE) ||

-            (sqltype == SQL_C_TIME) || 
+            (sqltype == SQL_C_TIME) ||

             (sqltype == SQL_C_TIMESTAMP))
         {
             (sqltype == SQL_C_TIMESTAMP))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
         if ((sqltype == SQL_C_SSHORT) ||
     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
         if ((sqltype == SQL_C_SSHORT) ||

-            (sqltype == SQL_C_USHORT) || 
+            (sqltype == SQL_C_USHORT) ||

             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG))
         {
             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_FLOAT)
     {
         if ((sqltype == SQL_C_SSHORT) ||
     }
     if (typeName == wxGRID_VALUE_FLOAT)
     {
         if ((sqltype == SQL_C_SSHORT) ||

-            (sqltype == SQL_C_USHORT) || 
+            (sqltype == SQL_C_USHORT) ||

             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG)  ||
             (sqltype == SQL_C_FLOAT)  ||
             (sqltype == SQL_C_DOUBLE))
         {
             (sqltype == SQL_C_SLONG)  ||
             (sqltype == SQL_C_ULONG)  ||
             (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)
 }
 
 long wxDbGridTableBase::GetValueAsLong(int row, int col)


@@ -455,7 +443,7 @@ long wxDbGridTableBase::GetValueAsLong(int row, int col)
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||

-        (sqltype == SQL_C_USHORT) || 
+        (sqltype == SQL_C_USHORT) ||

         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {
         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {


@@ -478,7 +466,7 @@ double wxDbGridTableBase::GetValueAsDouble(int row, int col)
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||

-        (sqltype == SQL_C_USHORT) || 
+        (sqltype == SQL_C_USHORT) ||

         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG) ||
         (sqltype == SQL_C_FLOAT) ||
         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG) ||
         (sqltype == SQL_C_FLOAT) ||


@@ -503,7 +491,7 @@ bool wxDbGridTableBase::GetValueAsBool(int row, int col)
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||
     }
     int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
     if ((sqltype == SQL_C_SSHORT) ||

-        (sqltype == SQL_C_USHORT) || 
+        (sqltype == SQL_C_USHORT) ||

         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {
         (sqltype == SQL_C_SLONG) ||
         (sqltype == SQL_C_ULONG))
     {


@@ -518,7 +506,7 @@ void* wxDbGridTableBase::GetValueAsCustom(int row, int col, const wxString& type
 {
     wxLogDebug(wxT("GetValueAsCustom() on %i,%i"),row,col);
     ValidateRow(row);
 {
     wxLogDebug(wxT("GetValueAsCustom() on %i,%i"),row,col);
     ValidateRow(row);

-    
+

     if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
     {
         wxFAIL_MSG (_T("You can not use GetValueAsCustom for virtual columns"));
     if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
     {
         wxFAIL_MSG (_T("You can not use GetValueAsCustom for virtual columns"));


@@ -572,7 +560,7 @@ void wxDbGridTableBase::SetValueAsCustom(int row, int col, const wxString& typeN
                 return;
             }
             wxVariant val(date);
                 return;
             }
             wxVariant val(date);

-            m_rowmodified = true;
+            m_rowmodified = TRUE;

             m_data->SetCol(m_ColInfo[col].DbCol,val);
         }
     }
             m_data->SetCol(m_ColInfo[col].DbCol,val);
         }
     }


@@ -603,12 +591,12 @@ bool wxDbGridTableBase::IsEmptyCell(int row, int col)
 wxString wxDbGridTableBase::GetValue(int row, int col)
 {
     wxLogDebug(wxT("GetValue() on %i,%i"),row,col);
 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);
     wxLogDebug(wxT("\tReturning \"%s\"\n"),val.GetString().c_str());
     ValidateRow(row);
     wxVariant val = m_data->GetCol(m_ColInfo[col].DbCol);
     wxLogDebug(wxT("\tReturning \"%s\"\n"),val.GetString().c_str());

-    
-    return val.GetString(); 
+
+    return val.GetString();

 }
 
 
 }
 
 


@@ -619,7 +607,7 @@ void wxDbGridTableBase::SetValue(int row, int col,const wxString& value)
     ValidateRow(row);
     wxVariant val(value);
 
     ValidateRow(row);
     wxVariant val(value);
 

-    m_rowmodified = true;
+    m_rowmodified = TRUE;

     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 
     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 


@@ -631,7 +619,7 @@ void wxDbGridTableBase::SetValueAsLong(int row, int col, long value)
     ValidateRow(row);
     wxVariant val(value);
 
     ValidateRow(row);
     wxVariant val(value);
 

-    m_rowmodified = true;
+    m_rowmodified = TRUE;

     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 
     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 


@@ -643,7 +631,7 @@ void wxDbGridTableBase::SetValueAsDouble(int row, int col, double value)
     ValidateRow(row);
     wxVariant val(value);
 
     ValidateRow(row);
     wxVariant val(value);
 

-    m_rowmodified = true;
+    m_rowmodified = TRUE;

     m_data->SetCol(m_ColInfo[col].DbCol,val);
 
 }
     m_data->SetCol(m_ColInfo[col].DbCol,val);
 
 }


@@ -656,7 +644,7 @@ void wxDbGridTableBase::SetValueAsBool(int row, int col, bool value)
     ValidateRow(row);
     wxVariant val(value);
 
     ValidateRow(row);
     wxVariant val(value);
 

-    m_rowmodified = true;
+    m_rowmodified = TRUE;

     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 
     m_data->SetCol(m_ColInfo[col].DbCol,val);
 }
 


@@ -703,20 +691,20 @@ void wxDbGridTableBase::ValidateRow(int row)
 
         m_row = row;
     }
 
         m_row = row;
     }

-    m_rowmodified = false;
+    m_rowmodified = FALSE;

 }
 
 bool wxDbGridTableBase::Writeback() const
 {
     if (!m_rowmodified)
     {
 }
 
 bool wxDbGridTableBase::Writeback() const
 {
     if (!m_rowmodified)
     {

-        return true;
+        return TRUE;

     }
 
     }
 

-    bool result=true;
+    bool result=TRUE;

     wxLogDebug(wxT("\trow key unknown"));
 
     wxLogDebug(wxT("\trow key unknown"));
 

-// FIXME: this code requires dbtable support for record status 
+// FIXME: this code requires dbtable support for record status

 #if 0
     switch (m_data->get_ModifiedStatus())
     {
 #if 0
     switch (m_data->get_ModifiedStatus())
     {