compilation fix for WXWIN_COMPATIBILITY_2_2 (bug 1252476)

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

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a0c35be0fcd0e6bd290ddc7f3783dbdbf3543234..05d11b19eff3ce3bf01e297568eb4bc0c3ec239c 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "gridctrl.h"
 #endif
 
     #pragma implementation "gridctrl.h"
 #endif
 


@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_GRID || wxUSE_NEW_GRID
+#if wxUSE_GRID

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"


@@ -33,6 +33,8 @@
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 

+#if wxUSE_DATETIME
+

 // Enables a grid cell to display a formated date and or time
 
 wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString outformat, wxString informat)
 // Enables a grid cell to display a formated date and or time
 
 wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString outformat, wxString informat)


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


@@ -67,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;
         }
 


@@ -116,11 +118,14 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid,
     return DoGetBestSize(attr, dc, GetString(grid, row, col));
 }
 
     return DoGetBestSize(attr, dc, GetString(grid, row, col));
 }
 

-void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
-    if (!params.IsEmpty())
+void wxGridCellDateTimeRenderer::SetParameters(const wxString& params)
+{
+    if (!params.empty())

         m_oformat=params;
 }
 
         m_oformat=params;
 }
 

+#endif // wxUSE_DATETIME
+

 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------


@@ -130,7 +135,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {

-    if (!choices.IsEmpty())
+    if (!choices.empty())

         SetParameters(choices);
 }
 
         SetParameters(choices);
 }
 


@@ -218,11 +223,11 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
 // "John","Fred"..."Bob" in the combo choice box
 
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
 // "John","Fred"..."Bob" in the combo choice box
 
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)

-                    : wxGridCellChoiceEditor()
+                     :wxGridCellChoiceEditor()

 {
     m_startint = -1;
 
 {
     m_startint = -1;
 

-    if (!choices.IsEmpty())
+    if (!choices.empty())

         SetParameters(choices);
 }
 
         SetParameters(choices);
 }
 


@@ -247,7 +252,7 @@ void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid)
     else
     {
         wxString startValue = table->GetValue(row, col);
     else
     {
         wxString startValue = table->GetValue(row, col);

-        if (startValue.IsNumber() && !startValue.IsEmpty())
+        if (startValue.IsNumber() && !startValue.empty())

         {
             startValue.ToLong(&m_startint);
         }
         {
             startValue.ToLong(&m_startint);
         }


@@ -340,27 +345,29 @@ 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("");
+    wxString thisline = wxEmptyString;

 
     while ( tk.HasMoreTokens() )
     {
         wxString tok = tk.GetNextToken();
 
     while ( tk.HasMoreTokens() )
     {
         wxString tok = tk.GetNextToken();

-    //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
-    tok += _T(" ");
+        //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 separated in the display
+        tok += _T(" ");

 
         dc.GetTextExtent(tok, &x, &y);
 
         dc.GetTextExtent(tok, &x, &y);

-        if ( curr_x + x > max_x) {
+        if ( curr_x + x > max_x)
+        {

             lines.Add( wxString(thisline) );
             lines.Add( wxString(thisline) );

-        thisline = tok;
-        curr_x=x;
-    } else {
+            thisline = tok;
+            curr_x=x;
+        }
+        else
+        {

             thisline+= tok;
             thisline+= tok;

-        curr_x += x;
-    }
-
+            curr_x += x;
+        }

     }
     //Add last line
     lines.Add( wxString(thisline) );
     }
     //Add last line
     lines.Add( wxString(thisline) );


@@ -381,7 +388,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.

-    dc.GetTextExtent("My", &x, &y);
+    dc.GetTextExtent(wxT("My"), &x, &y);

 
     do
     {
 
     do
     {