Put a humane end to the pathetic flailing over whether this can

[wxWidgets.git] / src / generic / gridctrl.cpp

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a7491003d7f82a970a765215fae0b8d547034cf0..970370bdb5f4a6d337038078e3b7d6463146b197 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -60,7 +60,7 @@ wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col)
 {
     wxGridTableBase *table = grid.GetTable();
 
 {
     wxGridTableBase *table = grid.GetTable();
 

-    bool hasDatetime = FALSE;
+    bool hasDatetime = false;

     wxDateTime val;
     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )
     wxDateTime val;
     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )


@@ -69,7 +69,7 @@ wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col)
 
         if (tempval){
             val = *((wxDateTime *)tempval);
 
         if (tempval){
             val = *((wxDateTime *)tempval);

-            hasDatetime = TRUE;
+            hasDatetime = true;

             delete (wxDateTime *)tempval;
         }
 
             delete (wxDateTime *)tempval;
         }
 


@@ -344,7 +344,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
 
     dc.SetFont(attr.GetFont());
     wxStringTokenizer tk(data , _T(" \n\t\r"));
 
     dc.SetFont(attr.GetFont());
     wxStringTokenizer tk(data , _T(" \n\t\r"));

-    wxString thisline(wxT(""));
+    wxString thisline = wxEmptyString;

 
     while ( tk.HasMoreTokens() )
     {
 
     while ( tk.HasMoreTokens() )
     {


@@ -352,7 +352,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
     //FIXME: this causes us to print an extra unnecesary
     //       space at the end of the line. But it
     //       is invisible , simplifies the size calculation
     //FIXME: this causes us to print an extra unnecesary
     //       space at the end of the line. But it
     //       is invisible , simplifies the size calculation

-    //       and ensures tokens are seperated in the display
+    //       and ensures tokens are separated in the display

     tok += _T(" ");
 
         dc.GetTextExtent(tok, &x, &y);
     tok += _T(" ");
 
         dc.GetTextExtent(tok, &x, &y);