missing #if's needed for compilation with some wxUSE_XXX set to 0 (patch 728413)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index af23eb352bd6d3099da8f1a262e4a244d2180db6..d0d1412abf771bac13c82e8eedf3b5249b08af38 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -32,10 +32,6 @@
 
 #if wxUSE_GRID
 
 
 #if wxUSE_GRID
 

-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-    #include "gridg.cpp"
-#else // wxUSE_NEW_GRID
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"


@@ -3742,7 +3738,7 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,

-                           bool maxOnOverflow);
+                           bool clipToMinMax);

 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
                                           WXGRID_MIN_COL_WIDTH, \
 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
                                           WXGRID_MIN_COL_WIDTH, \


@@ -4795,7 +4791,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         if ( row < 0 )
         {
             row = YToRow(y);
         if ( row < 0 )
         {
             row = YToRow(y);

-            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+            if ( row >=0 &&
+                !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+           {
+                // no default action at the moment
+           }

         }
         else
         {
         }
         else
         {


@@ -4832,7 +4832,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDown() )
     {
         row = YToRow(y);
     else if ( event.RightDown() )
     {
         row = YToRow(y);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+        if ( row >=0 && 
+           !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -4844,7 +4845,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDClick() )
     {
         row = YToRow(y);
     else if ( event.RightDClick() )
     {
         row = YToRow(y);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+        if ( row >= 0 &&
+            !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5010,7 +5012,11 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         if ( col < 0 )
         {
             col = XToCol(x);
         if ( col < 0 )
         {
             col = XToCol(x);

-            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
+            if ( col >= 0 &&
+                 ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
+            {
+               // no default action at the moment
+            }

         }
         else
         {
         }
         else
         {


@@ -5047,7 +5053,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDown() )
     {
         col = XToCol(x);
     else if ( event.RightDown() )
     {
         col = XToCol(x);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+        if ( col >= 0 &&
+            !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5059,7 +5066,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDClick() )
     {
         col = XToCol(x);
     else if ( event.RightDClick() )
     {
         col = XToCol(x);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+        if ( col >= 0 &&
+            !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5410,15 +5418,15 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     {
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
     {
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {

+            if (m_winCapture)
+            {
+                if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                m_winCapture = NULL;
+            }
+

             if ( m_selectingTopLeft != wxGridNoCellCoords &&
                  m_selectingBottomRight != wxGridNoCellCoords )
             {
             if ( m_selectingTopLeft != wxGridNoCellCoords &&
                  m_selectingBottomRight != wxGridNoCellCoords )
             {

-                if (m_winCapture)
-                {
-                    if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
-                    m_winCapture = NULL;
-                }
-

                 if ( m_selection )
                 {
                     m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
                 if ( m_selection )
                 {
                     m_selection->SelectBlock( m_selectingTopLeft.GetRow(),


@@ -5608,10 +5616,9 @@ void wxGrid::DoEndDragResizeRow()
             {
                 int i, cell_rows, cell_cols, subtract_rows = 0;
                 int leftCol = XToCol(left);
             {
                 int i, cell_rows, cell_cols, subtract_rows = 0;
                 int leftCol = XToCol(left);

-                int rightCol = XToCol(left+cw);
+                int rightCol = internalXToCol(left+cw);

                 if (leftCol >= 0)
                 {
                 if (leftCol >= 0)
                 {

-                    if (rightCol < 0) rightCol = m_numCols;

                     for (i=leftCol; i<rightCol; i++)
                     {
                         GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
                     for (i=leftCol; i<rightCol; i++)
                     {
                         GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);


@@ -5668,10 +5675,9 @@ void wxGrid::DoEndDragResizeCol()
             {
                 int i, cell_rows, cell_cols, subtract_cols = 0;
                 int topRow = YToRow(top);
             {
                 int i, cell_rows, cell_cols, subtract_cols = 0;
                 int topRow = YToRow(top);

-                int bottomRow = YToRow(top+cw);
+                int bottomRow = internalYToRow(top+cw);

                 if (topRow >= 0)
                 {
                 if (topRow >= 0)
                 {

-                    if (bottomRow < 0) bottomRow = m_numRows;

                     for (i=topRow; i<bottomRow; i++)
                     {
                         GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
                     for (i=topRow; i<bottomRow; i++)
                     {
                         GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);


@@ -6917,37 +6923,32 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out

-    int leftCol   = XToCol(left);
-    int topRow    = YToRow(top);
-    int rightCol  = XToCol(right);
-    int bottomRow = YToRow(bottom);
+    int leftCol   = internalXToCol(left);
+    int topRow    = internalYToRow(top);
+    int rightCol  = internalXToCol(right);
+    int bottomRow = internalYToRow(bottom);

     wxRegion clippedcells(0, 0, cw, ch);
 
     wxRegion clippedcells(0, 0, cw, ch);
 

-    if ((leftCol >= 0) && (topRow >= 0))
-    {
-        if (rightCol  < 0) rightCol  = m_numCols;
-        if (bottomRow < 0) bottomRow = m_numRows;

 
 

-        int i, j, cell_rows, cell_cols;
-        wxRect rect;
+    int i, j, cell_rows, cell_cols;
+    wxRect rect;

 
 

-        for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<bottomRow; j++)
+    {
+        for (i=leftCol; i<rightCol; i++)

         {
         {

-            for (i=leftCol; i<rightCol; i++)
+            GetCellSize( j, i, &cell_rows, &cell_cols );
+            if ((cell_rows > 1) || (cell_cols > 1))

             {
             {

-                GetCellSize( j, i, &cell_rows, &cell_cols );
-                if ((cell_rows > 1) || (cell_cols > 1))
-                {
-                    rect = CellToRect(j,i);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
-                else if ((cell_rows < 0) || (cell_cols < 0))
-                {
-                    rect = CellToRect(j+cell_rows, i+cell_cols);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
+                rect = CellToRect(j,i);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);
+            }
+            else if ((cell_rows < 0) || (cell_cols < 0))
+            {
+                rect = CellToRect(j+cell_rows, i+cell_cols);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);

             }
         }
     }
             }
         }
     }


@@ -6957,7 +6958,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
     // horizontal grid lines
     //
 
     // horizontal grid lines
     //

-    int i;
+    // already declared above - int i;

     for ( i = internalYToRow(top); i < m_numRows; i++ )
     {
         int bot = GetRowBottom(i) - 1;
     for ( i = internalYToRow(top); i < m_numRows; i++ )
     {
         int bot = GetRowBottom(i) - 1;


@@ -7102,110 +7103,110 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
                                 int textOrientation )
 {
     wxArrayString lines;
                                 int textOrientation )
 {
     wxArrayString lines;

-
+    

     StringToLines( value, lines );
     StringToLines( value, lines );

-
-
+    
+    

     //Forward to new API.
     DrawTextRectangle(  dc,
     //Forward to new API.
     DrawTextRectangle(  dc,

-                        lines,
-                        rect,
-                        horizAlign,
-                        vertAlign,
-                        textOrientation );
-
+        lines,
+        rect,
+        horizAlign,
+        vertAlign,
+        textOrientation );
+    

 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,
 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,

-                                const wxArrayString& lines,
-                                const wxRect& rect,
-                                int horizAlign,
-                                int vertAlign,
-                                int textOrientation )
+                               const wxArrayString& lines,
+                               const wxRect& rect,
+                               int horizAlign,
+                               int vertAlign,
+                               int textOrientation )

 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;
     int nLines;
 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;
     int nLines;

-
+    

     dc.SetClippingRegion( rect );
     dc.SetClippingRegion( rect );

-
+    

     nLines = lines.GetCount();
     if( nLines > 0 )
     {
     nLines = lines.GetCount();
     if( nLines > 0 )
     {

-      int l;
-      float x, y;
-
-      if( textOrientation == wxHORIZONTAL )
-      GetTextBoxSize(dc, lines, &textWidth, &textHeight);
-      else
-         GetTextBoxSize( dc, lines, &textHeight, &textWidth );
-
-      switch( vertAlign )
-      {
+        int l;
+        float x = 0.0, y = 0.0;
+        
+        if( textOrientation == wxHORIZONTAL )
+            GetTextBoxSize(dc, lines, &textWidth, &textHeight);
+        else
+            GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+        
+        switch( vertAlign )
+        {

         case wxALIGN_BOTTOM:
             if( textOrientation == wxHORIZONTAL )
         case wxALIGN_BOTTOM:
             if( textOrientation == wxHORIZONTAL )

-          y = rect.y + (rect.height - textHeight - 1);
+                y = rect.y + (rect.height - textHeight - 1);

             else
             else

-               x = rect.x + rect.width - textWidth;
-          break;
-
+                x = rect.x + rect.width - textWidth;
+            break;
+            

         case wxALIGN_CENTRE:
             if( textOrientation == wxHORIZONTAL )
         case wxALIGN_CENTRE:
             if( textOrientation == wxHORIZONTAL )

-          y = rect.y + ((rect.height - textHeight)/2);
+                y = rect.y + ((rect.height - textHeight)/2);

             else
             else

-               x = rect.x + ((rect.width - textWidth)/2);
-          break;
-
+                x = rect.x + ((rect.width - textWidth)/2);
+            break;
+            

         case wxALIGN_TOP:
         default:
             if( textOrientation == wxHORIZONTAL )
         case wxALIGN_TOP:
         default:
             if( textOrientation == wxHORIZONTAL )

-          y = rect.y + 1;
+                y = rect.y + 1;

             else
             else

-               x = rect.x + 1;
-          break;
-      }
-
-      // Align each line of a multi-line label
-      for( l = 0; l < nLines; l++ )
-      {
-        dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
-
-        switch( horizAlign )
-        {
-          case wxALIGN_RIGHT:
-               if( textOrientation == wxHORIZONTAL )
-            x = rect.x + (rect.width - lineWidth - 1);
-               else
-                  y = rect.y + lineWidth + 1;
-            break;
-
-          case wxALIGN_CENTRE:
-               if( textOrientation == wxHORIZONTAL )
-            x = rect.x + ((rect.width - lineWidth)/2);
-               else
-                  y = rect.y + rect.height - ((rect.height - lineWidth)/2);
-            break;
-
-          case wxALIGN_LEFT:
-          default:
-               if( textOrientation == wxHORIZONTAL )
-            x = rect.x + 1;
-               else
-                  y = rect.y + rect.height - 1;
+                x = rect.x + 1;

             break;
         }
             break;
         }

-
-         if( textOrientation == wxHORIZONTAL )
-         {
-        dc.DrawText( lines[l], (int)x, (int)y );
-        y += lineHeight;
-      }
-         else
-         {
-            dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
-            x += lineHeight;
-         }
-      }
+        
+        // Align each line of a multi-line label
+        for( l = 0; l < nLines; l++ )
+        {
+            dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+            
+            switch( horizAlign )
+            {
+            case wxALIGN_RIGHT:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + (rect.width - lineWidth - 1);
+                else
+                    y = rect.y + lineWidth + 1;
+                break;
+                
+            case wxALIGN_CENTRE:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + ((rect.width - lineWidth)/2);
+                else
+                    y = rect.y + rect.height - ((rect.height - lineWidth)/2);
+                break;
+                
+            case wxALIGN_LEFT:
+            default:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + 1;
+                else
+                    y = rect.y + rect.height - 1;
+                break;
+            }
+            
+            if( textOrientation == wxHORIZONTAL )
+            {
+                dc.DrawText( lines[l], (int)x, (int)y );
+                y += lineHeight;
+            }
+            else
+            {
+                dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
+                x += lineHeight;
+            }
+        }

     }
     dc.DestroyClippingRegion();
 }
     }
     dc.DestroyClippingRegion();
 }


@@ -7598,10 +7599,16 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,

-                           bool maxOnOverflow)
+                           bool clipToMinMax)

 {
 {

+
+    if (coord < 0)
+        return clipToMinMax && (nMax > 0) ? 0 : -1;
+
+       

     if (!defaultDist)
         defaultDist = 1;
     if (!defaultDist)
         defaultDist = 1;

+

     size_t i_max = coord / defaultDist,
            i_min = 0;
 
     size_t i_max = coord / defaultDist,
            i_min = 0;
 


@@ -7609,7 +7616,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
     {
         if((int) i_max < nMax)
             return i_max;
     {
         if((int) i_max < nMax)
             return i_max;

-        return maxOnOverflow ? nMax - 1 : -1;
+        return clipToMinMax ? nMax - 1 : -1;

     }
 
     if ( i_max >= BorderArray.GetCount())
     }
 
     if ( i_max >= BorderArray.GetCount())


@@ -7625,7 +7632,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])

-        return maxOnOverflow ? (int)i_max : -1;
+        return clipToMinMax ? (int)i_max : -1;

     if ( coord < BorderArray[0] )
         return 0;
 
     if ( coord < BorderArray[0] )
         return 0;
 


@@ -8001,13 +8008,11 @@ bool wxGrid::MovePageUp()
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);

-        int newRow = YToRow( y - ch + 1 );
-        if ( newRow == -1 )
-        {
-            newRow = 0;
-        }
-        else if ( newRow == row )
+        int newRow = internalYToRow( y - ch + 1 );
+        
+        if ( newRow == row )

         {
         {

+           //row > 0 , so newrow can never be less than 0 here. 

             newRow = row - 1;
         }
 
             newRow = row - 1;
         }
 


@@ -8031,14 +8036,11 @@ bool wxGrid::MovePageDown()
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);

-        int newRow = YToRow( y + ch );
-        if ( newRow == -1 )
+        int newRow = internalYToRow( y + ch );
+        if ( newRow == row )

         {
         {

-            newRow = m_numRows - 1;
-        }
-        else if ( newRow == row )
-        {
-            newRow = row + 1;
+            // row < m_numRows , so newrow can't overflow here.        
+           newRow = row + 1;

         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );


@@ -10031,7 +10033,5 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
     m_ctrl = ctrl;
 }
 
     m_ctrl = ctrl;
 }
 

-
-#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID
-

 #endif // wxUSE_GRID
 #endif // wxUSE_GRID

+