wxMessageBox off the main thread lost result code.

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 4926ae4a992c0d782e1877bef711475ca36198d3..31f9297c63ae8deb62c0bd9a136a99a0851342b9 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999

-// RCS-ID:      $Id$

 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -2945,8 +2944,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;

-            if ( m_useNativeHeader )
-                GetGridColHeader()->SetColumnCount(m_numCols);

 
             if ( !m_colAt.IsEmpty() )
             {
 
             if ( !m_colAt.IsEmpty() )
             {


@@ -2978,6 +2975,12 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 }
             }
 
                 }
             }
 

+            // Notice that this must be called after updating m_colWidths above
+            // as the native grid control will check whether the new columns
+            // are shown which results in accessing m_colWidths array.
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_numCols);
+

             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current


@@ -3263,10 +3266,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     if ( event.Dragging() )
     {
         if (!m_isDragging)
     if ( event.Dragging() )
     {
         if (!m_isDragging)

-        {

             m_isDragging = true;
             m_isDragging = true;

-            m_rowLabelWin->CaptureMouse();
-        }

 
         if ( event.LeftIsDown() )
         {
 
         if ( event.LeftIsDown() )
         {


@@ -3316,11 +3316,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         return;
 
     if (m_isDragging)
         return;
 
     if (m_isDragging)

-    {
-        if (m_rowLabelWin->HasCapture())
-            m_rowLabelWin->ReleaseMouse();

         m_isDragging = false;
         m_isDragging = false;

-    }

 
     // ------------ Entering or leaving the window
     //
 
     // ------------ Entering or leaving the window
     //


@@ -3547,7 +3543,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         if (!m_isDragging)
         {
             m_isDragging = true;
         if (!m_isDragging)
         {
             m_isDragging = true;

-            GetColLabelWindow()->CaptureMouse();

 
             if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
                 DoStartMoveCol(col);
 
             if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
                 DoStartMoveCol(col);


@@ -3638,11 +3633,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         return;
 
     if (m_isDragging)
         return;
 
     if (m_isDragging)

-    {
-        if (GetColLabelWindow()->HasCapture())
-            GetColLabelWindow()->ReleaseMouse();

         m_isDragging = false;
         m_isDragging = false;

-    }

 
     // ------------ Entering or leaving the window
     //
 
     // ------------ Entering or leaving the window
     //


@@ -8407,11 +8398,17 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
     {
         if ( column )
         {
     {
         if ( column )
         {

+            if ( !IsRowShown(rowOrCol) )
+                continue;
+

             row = rowOrCol;
             col = colOrRow;
         }
         else
         {
             row = rowOrCol;
             col = colOrRow;
         }
         else
         {

+            if ( !IsColShown(rowOrCol) )
+                continue;
+

             row = colOrRow;
             col = rowOrCol;
         }
             row = colOrRow;
             col = rowOrCol;
         }