Initial check in of wxApplet code to CVS

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 0dae989bc83365c81efc067c6868f0869b8e8453..c47d42f9c8aa04daedfc8488a7d512967481d341 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -96,6 +96,26 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 

+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -354,8 +374,10 @@ wxGridCellCoords wxGridNoCellCoords( -1, -1 );
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size

-// TODO: fixed so far - make configurable later (and also different for x/y)
-static const size_t GRID_SCROLL_LINE = 10;
+// TODO: this doesn't work at all, grid cells have different sizes and approx
+//       calculations don't work as because of the size mismatch scrollbars
+//       sometimes fail to be shown when they should be or vice versa
+static const size_t GRID_SCROLL_LINE = 1;

 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)
 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)


@@ -1390,12 +1412,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_TAB:
             break;
 
         case WXK_TAB:

-            event.Skip( m_grid->ProcessEvent( event ) );
+            event.Skip( m_grid->GetEventHandler()->ProcessEvent( event ) );

             break;
 
             break;
 

-        case WXK_NUMPAD_ENTER:

         case WXK_RETURN:
         case WXK_RETURN:

-            if (!m_grid->ProcessEvent(event))
+        case WXK_NUMPAD_ENTER:
+            if (!m_grid->GetEventHandler()->ProcessEvent(event))

                 m_editor->HandleReturn(event);
             break;
 
                 m_editor->HandleReturn(event);
             break;
 


@@ -2420,16 +2442,16 @@ int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;

-       if (renderer)
-               renderer->IncRef();
+    if (renderer)
+        renderer->IncRef();

     return renderer;
 }
 
 wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
     return renderer;
 }
 
 wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;

-       if (editor)
-               editor->IncRef();
+    if (editor)
+        editor->IncRef();

     return editor;
 }
 
     return editor;
 }
 


@@ -3123,12 +3145,12 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 
 }
 
 


@@ -3182,12 +3204,12 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 
 }
 
 


@@ -3240,12 +3262,12 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 
 }
 
 


@@ -3314,12 +3336,12 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();

 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )


@@ -3659,19 +3681,44 @@ void wxGrid::CalcDimensions()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

-    if ( m_numRows > 0  ||  m_numCols > 0 )
-    {
-        int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
-        int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
+    if ( m_colLabelWin->IsShown() )
+        cw -= m_rowLabelWidth;
+    if ( m_rowLabelWin->IsShown() )
+        ch -= m_colLabelHeight;

 
 

-        // TODO: restore the scroll position that we had before sizing
-        //
-        int x, y;
-        GetViewStart( &x, &y );
-        SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
-                       right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
-                       x, y );
+    // grid total size
+    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+    // preserve (more or less) the previous position
+    int x, y;
+    GetViewStart( &x, &y );
+    // maybe we don't need scrollbars at all? and if we do, transform w and h
+    // from pixels into logical units
+    if ( w <= cw )
+    {
+        w = 0; x= 0;
+    }
+    else
+    {
+       w = (w + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+       if ( x >= w )
+           x = w - 1;
+    }
+    if ( h <= ch )
+    {
+       h = 0; y = 0;
+    }
+    else
+    {
+       h = (h + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+       if ( y >= h )
+           y = h - 1;

     }
     }

+
+    // do set scrollbar parameters
+    SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
+                  w, h, x, y, (GetBatchCount() != 0));

 }
 
 
 }
 
 


@@ -3988,13 +4035,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 CalcDimensions();
                 m_colLabelWin->Refresh();
             }
                 CalcDimensions();
                 m_colLabelWin->Refresh();
             }

-            return TRUE;

         }
         }

-#if 0
-// There is no path to this code !!!!!!
-       result = TRUE;
+        result = TRUE;

         break;
         break;

-#endif

     }
 
     if (result && !GetBatchCount() )
     }
 
     if (result && !GetBatchCount() )


@@ -4594,7 +4637,9 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                cursorModes[m_cursorMode], cursorModes[mode]);
 #endif // __WXDEBUG__
 
                cursorModes[m_cursorMode], cursorModes[mode]);
 #endif // __WXDEBUG__
 

-    if ( mode == m_cursorMode )
+    if ( mode == m_cursorMode &&
+         win == m_winCapture &&
+         captureMouse == (m_winCapture != NULL))

         return;
 
     if ( !win )
         return;
 
     if ( !win )


@@ -5265,13 +5310,12 @@ bool wxGrid::SendEvent( const wxEventType type,
                                  type,
                                  this,
                                  rowOrCol,
                                  type,
                                  this,
                                  rowOrCol,

-                                 mouseEv.GetX() + GetColLabelSize(),
-                                 mouseEv.GetY() + GetRowLabelSize(),
+                                 mouseEv.GetX() + GetRowLabelSize(),
+                                 mouseEv.GetY() + GetColLabelSize(),

                                  mouseEv.ControlDown(),
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );
                                  mouseEv.ControlDown(),
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );

-

         return GetEventHandler()->ProcessEvent(gridEvt);
     }
     else if ( type == wxEVT_GRID_RANGE_SELECT )
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
     else if ( type == wxEVT_GRID_RANGE_SELECT )


@@ -5296,14 +5340,13 @@ bool wxGrid::SendEvent( const wxEventType type,
                              type,
                              this,
                              row, col,
                              type,
                              this,
                              row, col,

-                             mouseEv.GetX() + GetColLabelSize(),
-                             mouseEv.GetY() + GetRowLabelSize(),
+                             mouseEv.GetX() + GetRowLabelSize(),
+                             mouseEv.GetY() + GetColLabelSize(),

                              FALSE,
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );
                              FALSE,
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );

-

         return GetEventHandler()->ProcessEvent(gridEvt);
     }
 }
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
 }


@@ -5772,7 +5815,6 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
     // (old comment from when this was the body of SelectBlock)
 }
 
     // (old comment from when this was the body of SelectBlock)
 }
 

-

 //
 // ------ functions to get/send data (see also public functions)
 //
 //
 // ------ functions to get/send data (see also public functions)
 //


@@ -6001,7 +6043,7 @@ void wxGrid::DrawHighlight(wxDC& dc)
 // This is used to redraw all grid lines e.g. when the grid line colour
 // has been changed
 //
 // This is used to redraw all grid lines e.g. when the grid line colour
 // has been changed
 //

-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )

 {
     if ( !m_gridLinesEnabled ||
          !m_numRows ||
 {
     if ( !m_gridLinesEnabled ||
          !m_numRows ||


@@ -7971,8 +8013,8 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
     if ( resizeExistingRows )
     {
         InitRowHeights();
     if ( resizeExistingRows )
     {
         InitRowHeights();

-
-        CalcDimensions();
+       if ( !GetBatchCount() )
+           CalcDimensions();

     }
 }
 
     }
 }
 


@@ -7995,7 +8037,8 @@ void wxGrid::SetRowSize( int row, int height )
     {
         m_rowBottoms[i] += diff;
     }
     {
         m_rowBottoms[i] += diff;
     }

-    CalcDimensions();
+    if ( !GetBatchCount() )
+        CalcDimensions();

 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )


@@ -8005,8 +8048,8 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
     if ( resizeExistingCols )
     {
         InitColWidths();
     if ( resizeExistingCols )
     {
         InitColWidths();

-
-        CalcDimensions();
+       if ( !GetBatchCount() )
+           CalcDimensions();

     }
 }
 
     }
 }
 


@@ -8031,7 +8074,8 @@ void wxGrid::SetColSize( int col, int width )
     {
         m_colRights[i] += diff;
     }
     {
         m_colRights[i] += diff;
     }

-    CalcDimensions();
+    if ( !GetBatchCount() )
+        CalcDimensions();

 }
 
 
 }
 
 


@@ -8133,11 +8177,34 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         }
     }
 
         }
     }
 

-    if ( column )
+    if ( column ){

         SetColSize(col, extentMax);
         SetColSize(col, extentMax);

-    else
+        if ( !GetBatchCount() )
+        {
+           int cw, ch, dummy;
+           m_gridWin->GetClientSize( &cw, &ch );
+           wxRect rect ( CellToRect( 0, col ) );
+           rect.y = 0;
+           CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+           rect.width = cw - rect.x;
+           rect.height = m_colLabelHeight;
+           m_colLabelWin->Refresh( TRUE, &rect );
+       }
+    }
+    else{

         SetRowSize(row, extentMax);
         SetRowSize(row, extentMax);

-
+        if ( !GetBatchCount() )
+        {
+           int cw, ch, dummy;
+           m_gridWin->GetClientSize( &cw, &ch );
+           wxRect rect ( CellToRect( row, 0 ) );
+           rect.x = 0;
+           CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+           rect.width = m_rowLabelWidth;
+            rect.height = ch - rect.y;
+           m_rowLabelWin->Refresh( TRUE, &rect );
+       }
+    }

     if ( setAsMin )
     {
         if ( column )
     if ( setAsMin )
     {
         if ( column )


@@ -8151,6 +8218,8 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
     int width = m_rowLabelWidth;
 
 {
     int width = m_rowLabelWidth;
 

+    if ( !calcOnly )
+        BeginBatch();

     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )
     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )


@@ -8160,7 +8229,8 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 
         width += GetColWidth(col);
     }
 
         width += GetColWidth(col);
     }

-
+    if ( !calcOnly )
+        EndBatch();

     return width;
 }
 
     return width;
 }
 


@@ -8168,6 +8238,8 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
     int height = m_colLabelHeight;
 
 {
     int height = m_colLabelHeight;
 

+    if ( !calcOnly )
+        BeginBatch();

     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )
     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )


@@ -8177,14 +8249,15 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 
         height += GetRowHeight(row);
     }
 
         height += GetRowHeight(row);
     }

-
+    if ( !calcOnly )
+        EndBatch();

     return height;
 }
 
 void wxGrid::AutoSize()
 {
     // set the size too
     return height;
 }
 
 void wxGrid::AutoSize()
 {
     // set the size too

-    SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+    SetClientSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));

 }
 
 wxSize wxGrid::DoGetBestSize() const
 }
 
 wxSize wxGrid::DoGetBestSize() const


@@ -8272,7 +8345,54 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
 
 void wxGrid::SelectAll()
 {
 
 void wxGrid::SelectAll()
 {

-    m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+    if ( m_numRows > 0 && m_numCols > 0 )
+        m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+}
+
+//
+// ------ Cell, row and col deselection
+//
+
+void wxGrid::DeselectRow( int row )
+{
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+    {
+        if ( m_selection->IsInSelection(row, 0 ) )
+            m_selection->ToggleCellSelection( row, 0);
+    }
+    else
+    {
+        int nCols = GetNumberCols();
+        for ( int i = 0; i < nCols ; i++ )
+        {
+            if ( m_selection->IsInSelection(row, i ) )
+                m_selection->ToggleCellSelection( row, i);
+        }
+    }
+}
+
+void wxGrid::DeselectCol( int col )
+{
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+    {
+        if ( m_selection->IsInSelection(0, col ) )
+            m_selection->ToggleCellSelection( 0, col);
+    }
+    else
+    {
+        int nRows = GetNumberRows();
+        for ( int i = 0; i < nRows ; i++ )
+        {
+            if ( m_selection->IsInSelection(i, col ) )
+                m_selection->ToggleCellSelection(i, col);
+        }
+    }
+}
+
+void wxGrid::DeselectCell( int row, int col )
+{
+    if ( m_selection->IsInSelection(row, col) )
+        m_selection->ToggleCellSelection(row, col);

 }
 
 bool wxGrid::IsSelection()
 }
 
 bool wxGrid::IsSelection()