use "..." for wx includes instead of <...>

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 4c33a1a32ad2b7d1be9294b9912ad6fab3580f94..9611d4f61ff8dff4a6cafc89e170cf57edb35b5e 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -25,7 +25,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_GRID
+#if wxUSE_GRID && !(wxUSE_NEW_GRID)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -1538,7 +1538,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
           HighlightCell(dc, TRUE);
 #endif
     }
-  else
+  else if (!wxIPE_HIGHLIGHT)
     {
       // 1) Why isn't this needed for Windows??
       // Probably because of the SetValue?? JS.
@@ -1547,10 +1547,11 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
       //
       // 3) It *is* needed for Motif - michael
       //
-#if defined(__WXMOTIF__)
-      if ((wxIPE_HIGHLIGHT || !(m_editable && m_editInPlace)))
+      // 4) It *seems* to be needed whenever
+      //    wxIPE_HIGHLIGHT is not set (i.e.
+      //    for both wxGTK and wxMOTIF)... SN.
+      if (!(m_editable && m_editInPlace)))
           HighlightCell(dc, TRUE);
-#endif
     }
 
   dc->DestroyClippingRegion();
@@ -2854,4 +2855,4 @@ void *wxGenericGrid::GetCellData(int row, int col)
     return rc;
 }
 
-#endif // wxUSE_GRID
+#endif // wxUSE_GRID && !(wxUSE_NEW_GRID)