Fixed doubled-up key effects in wxTextCtrl by resetting m_lastMsg to 0

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 5d2fd50e1fb8eae8e5fc554ba2671f495cf90c1a..9be30909b7adf4c53d3bdb2bd5093471b24d847c 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -222,6 +222,8 @@ bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   m_hScrollBar = new wxScrollBar(this, wxGRID_HSCROLL, wxPoint(0, 0), wxSize(20, 100), wxHORIZONTAL);
   m_vScrollBar = new wxScrollBar(this, wxGRID_VSCROLL, wxPoint(0, 0), wxSize(100, 20), wxVERTICAL);
 
   m_hScrollBar = new wxScrollBar(this, wxGRID_HSCROLL, wxPoint(0, 0), wxSize(20, 100), wxHORIZONTAL);
   m_vScrollBar = new wxScrollBar(this, wxGRID_VSCROLL, wxPoint(0, 0), wxSize(100, 20), wxVERTICAL);
 

+//  SetSize(pos.x, pos.y, size.x, size.y);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -1024,7 +1026,7 @@ void wxGenericGrid::AdjustScrollbars(void)
   if (m_hScrollBar && !m_hScrollBar->IsShown())
     horizScrollBarHeight = 0;
 
   if (m_hScrollBar && !m_hScrollBar->IsShown())
     horizScrollBarHeight = 0;
 

-  if (m_hScrollBar)
+  if (m_hScrollBar && m_hScrollBar->IsShown())

   {
     int nCols = GetCols();
     m_hScrollBar->SetScrollbar(m_hScrollBar->GetThumbPosition(), wxMax(noHorizSteps, 1), (noHorizSteps == 0) ? 1 : nCols, wxMax(noHorizSteps, 1));
   {
     int nCols = GetCols();
     m_hScrollBar->SetScrollbar(m_hScrollBar->GetThumbPosition(), wxMax(noHorizSteps, 1), (noHorizSteps == 0) ? 1 : nCols, wxMax(noHorizSteps, 1));


@@ -1038,7 +1040,7 @@ void wxGenericGrid::AdjustScrollbars(void)
 
   }
 
 
   }
 

-  if (m_vScrollBar)
+  if (m_vScrollBar && m_vScrollBar->IsShown())

   {
     int nRows = GetRows();
 
   {
     int nRows = GetRows();
 


@@ -1415,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);