Font updates

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

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index e541773ef2055ae14f93c33f2fc158814a8216fd..83e673a9183c52e6e5f359f9edfc6b8cc4924fb7 100644 (file)
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -128,7 +128,7 @@ wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo*  ColInfo,
     m_keys(),
     m_data(tab),
     m_dbowner(takeOwnership),
     m_keys(),
     m_data(tab),
     m_dbowner(takeOwnership),

-    m_rowmodified(false)
+    m_rowmodified(FALSE)

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


@@ -197,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;

 }
 
 
 }
 
 


@@ -255,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)


@@ -276,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


@@ -327,19 +313,19 @@ 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 a virtual column then we can't find it's type. we have to
     }
 
     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;
+        // 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;
 


@@ -349,9 +335,9 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
             (sqltype == SQL_C_TIME) ||
             (sqltype == SQL_C_TIMESTAMP))
         {
             (sqltype == SQL_C_TIME) ||
             (sqltype == SQL_C_TIMESTAMP))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {


@@ -360,9 +346,9 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
             (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 (typeName == wxGRID_VALUE_FLOAT)
     {


@@ -373,39 +359,31 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
             (sqltype == SQL_C_FLOAT)  ||
             (sqltype == SQL_C_DOUBLE))
         {
             (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)
 {

-    //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.

-        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 a virtual column then we can't find it's type. we have to faulse to
         //get using wxVairent.
     }
 
     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
         //get using wxVairent.

-        return false;
+        return FALSE;

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


@@ -415,9 +393,9 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName
             (sqltype == SQL_C_TIME) ||
             (sqltype == SQL_C_TIMESTAMP))
         {
             (sqltype == SQL_C_TIME) ||
             (sqltype == SQL_C_TIMESTAMP))
         {

-            return true;
+            return TRUE;

         }
         }

-        return false;
+        return FALSE;

     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {
     }
     if (typeName == wxGRID_VALUE_NUMBER)
     {


@@ -426,9 +404,9 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName
             (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 (typeName == wxGRID_VALUE_FLOAT)
     {


@@ -439,11 +417,11 @@ bool wxDbGridTableBase::CanSetValueAs(int row, int col, const wxString& typeName
             (sqltype == SQL_C_FLOAT)  ||
             (sqltype == SQL_C_DOUBLE))
         {
             (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)


@@ -574,7 +552,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);
         }
     }


@@ -621,7 +599,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);
 }
 


@@ -633,7 +611,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);
 }
 


@@ -645,7 +623,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);
 
 }


@@ -658,7 +636,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);
 }
 


@@ -705,17 +683,17 @@ 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"));
 
 // FIXME: this code requires dbtable support for record status
     wxLogDebug(wxT("\trow key unknown"));
 
 // FIXME: this code requires dbtable support for record status


@@ -738,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