Compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index dd06aeda0b1d453f97319b3dbf3acc7b566479cd..777c2b46b3a059e64df74eef71482a64a3d99427 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -483,7 +483,7 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
 #if defined(__WXGTK__)
     rect.Inflate(rect.x ? 1 : 0, rect.y ? 1 : 0);
 #else // !GTK
-    int extra = row && col ? 2 : 1;
+    int extra = rect.x && rect.y ? 2 : 1;
 #if defined(__WXMOTIF__)
     extra *= 2;
 #endif
@@ -618,7 +618,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent,
         wxGridCellTextEditor::Create(parent, id, evtHandler);
 
 #if wxUSE_VALIDATORS
-        Text()->SetValidator(new wxTextValidator(wxFILTER_NUMERIC));
+        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
 #endif // wxUSE_VALIDATORS
     }
 }
@@ -711,7 +711,7 @@ void wxGridCellFloatEditor::Create(wxWindow* parent,
     wxGridCellTextEditor::Create(parent, id, evtHandler);
 
 #if wxUSE_VALIDATORS
-    Text()->SetValidator(new wxTextValidator(wxFILTER_NUMERIC));
+    Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
 #endif // wxUSE_VALIDATORS
 }