replaced wxMoveWindowDeferred() with wxWindow::DoMoveSibling()

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 874499b1e2d4d26ceebda854c1707c9f7f02e21c..eee62d49aba8bd88affed8a2eddcdcd4ebbb3550 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -260,7 +260,7 @@ private:
     // Work around the fact that a focus kill event can be sent to
     // a combobox within a set focus event.
     bool                m_inSetFocus;
     // Work around the fact that a focus kill event can be sent to
     // a combobox within a set focus event.
     bool                m_inSetFocus;

-    
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
     DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
     DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)


@@ -1972,21 +1972,19 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
             {
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
             }
             {
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
             }

-

         }
         }

-                tmp = params.AfterFirst(_T(','));
-                if ( !tmp.empty() )
-                {
-                    long precision;
+        tmp = params.AfterFirst(_T(','));
+        if ( !tmp.empty() )
+        {
+            long precision;

             if ( tmp.ToLong(&precision) )
             if ( tmp.ToLong(&precision) )

-                    {
+            {

                 SetPrecision((int)precision);
                 SetPrecision((int)precision);

-                    }
-                    else
-                    {
+            }
+            else
+            {

                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());

-        }
-
+            }

         }
     }
 }
         }
     }
 }


@@ -7864,11 +7862,7 @@ void wxGrid::HideCellEditControl()
         editor->DecRef();
         attr->DecRef();
 
         editor->DecRef();
         attr->DecRef();
 

-        // if the focus moved completely outside this application, set it to
-        // ourselves so that it's not "lost" when the user switches back to
-        // this app
-        if ( !FindFocus() )
-            m_gridWin->SetFocus();
+        m_gridWin->SetFocus();

 
         // refresh whole row to the right
         wxRect rect( CellToRect(row, col) );
 
         // refresh whole row to the right
         wxRect rect( CellToRect(row, col) );