a wxCHECK added

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 624cac6ad1c4be8e6b004c928457d8c1b18d82f2..bfd5c3928bb466bfb92c9e4003c080121b9580df 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -1417,9 +1417,11 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
   // Probably because of the SetValue?? JS.
   // 2) Arrrrrgh. This isn't needed anywhere, 
   // of course. One hour of debugging... RR.
   // Probably because of the SetValue?? JS.
   // 2) Arrrrrgh. This isn't needed anywhere, 
   // of course. One hour of debugging... RR.

-#ifndef __WXMSW__
-//  HighlightCell(dc);
+  // Put back for Motif only on advice of Michael Bedward
+#ifdef __WXMOTIF__
+  HighlightCell(dc);

 #endif
 #endif

+

   dc->DestroyClippingRegion();
 
   //OnSelectCell(row, col);
   dc->DestroyClippingRegion();
 
   //OnSelectCell(row, col);


@@ -1510,7 +1512,7 @@ void wxGenericGrid::DrawCellText(void)
   if (!cell)
     return;
 
   if (!cell)
     return;
 

-  static char szEdit[300];
+  static wxChar szEdit[300];

 
   wxClientDC dc(this);
   dc.BeginDrawing();
 
   wxClientDC dc(this);
   dc.BeginDrawing();


@@ -1520,7 +1522,7 @@ void wxGenericGrid::DrawCellText(void)
   dc.SetBackgroundMode(wxTRANSPARENT);
   dc.SetBrush(cell->GetBackgroundBrush());
 
   dc.SetBackgroundMode(wxTRANSPARENT);
   dc.SetBrush(cell->GetBackgroundBrush());
 

-  strcpy(szEdit, m_textItem->GetValue());
+  wxStrcpy(szEdit, m_textItem->GetValue());

 
   wxRect rect;
   rect = m_currentRect;
 
   wxRect rect;
   rect = m_currentRect;


@@ -1529,7 +1531,7 @@ void wxGenericGrid::DrawCellText(void)
   rect.width -= 5;
   rect.height -= 4;
 
   rect.width -= 5;
   rect.height -= 4;
 

-  DrawTextRect(& dc, "                                    ", &rect, wxLEFT);
+  DrawTextRect(& dc, _T("                                    "), &rect, wxLEFT);

   DrawTextRect(& dc, szEdit, &rect, cell->GetAlignment());
 
   dc.DestroyClippingRegion();
   DrawTextRect(& dc, szEdit, &rect, cell->GetAlignment());
 
   dc.DestroyClippingRegion();