Fixed problem with label resize cursor not resetting

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 1af51feba4cce20a5e32cdbb89a2e335622409c3..9322592aa8e761b366e5a470d82fcd9983c1d312 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1656,11 +1656,9 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         }
         else
         {
         }
         else
         {

-            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-            {
-                m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+            m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+            if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor )

                 m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
                 m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );

-            }

         }
     }
 }
         }
     }
 }


@@ -1845,11 +1843,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
         else
         {
         }
         else
         {

-            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-            {
-                m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+            m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+            if ( m_colLabelWin->GetCursor() == m_colResizeCursor )

                 m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
                 m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );

-            }

         }
     }
 }
         }
     }
 }