changed Refresh to take Rect as client coordinates not window coordinates

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

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index f1cb66b99b27b8bf3074c523f6da25e8866b2456..12f1c6c6554e3b258d045e695cad362651c05ba6 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,9 @@
     #pragma hdrstop
 #endif
 
+
+#if wxUSE_GRID || wxUSE_NEW_GRID 
+
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
@@ -115,7 +118,7 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid,
 }
 
 void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
-    if(params)
+    if (!params.IsEmpty())
         m_oformat=params;
 }
 
@@ -128,7 +131,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {
-    if(choices)
+    if (!choices.IsEmpty())
         SetParameters(choices);
 }
 
@@ -215,7 +218,9 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {
-    if(choices)
+    m_startint = -1;
+
+    if (!choices.IsEmpty())
         SetParameters(choices);
 }
 
@@ -265,7 +270,7 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid)
         if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
             grid->GetTable()->SetValueAsLong(row, col, pos);
         else
-            grid->GetTable()->SetValue(row, col,wxString::Format("%i",pos));
+            grid->GetTable()->SetValue(row, col,wxString::Format(wxT("%i"),pos));
     }
 
     return changed;
@@ -363,7 +368,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
                                               wxDC& dc,
                                               int row, int col)
 {
-    int x,y, height , width = grid.GetColSize(col) -10;
+    wxCoord x,y, height , width = grid.GetColSize(col) -10;
     int count = 250; //Limit iterations..
 
     wxRect rect(0,0,width,10);
@@ -384,3 +389,4 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
+#endif