split wxEVT_GRID_CELL_CHANGE into wxEVT_GRID_CELL_CHANGING/ED pair for consistency...

[wxWidgets.git] / include / wx / generic / gridsel.h

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index 87fc640315a85322dbdd6d783cdebae89a81ed3f..ead1d9256a73e58d860c0a72ae912230886db414 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -9,46 +9,64 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
-
-#if defined(wxUSE_NEW_GRID) && (wxUSE_NEW_GRID)
+#ifndef _WX_GENERIC_GRIDSEL_H_
+#define _WX_GENERIC_GRIDSEL_H_

 
 

-#ifndef __WXGRIDSEL_H__
-#define __WXGRIDSEL_H__
+#include "wx/defs.h"

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "gridsel.h"
-#endif
+#if wxUSE_GRID

 
 #include "wx/grid.h"
 
 
 #include "wx/grid.h"
 

-class WXDLLEXPORT wxGridSelection{
+class WXDLLIMPEXP_ADV wxGridSelection
+{

 public:
 public:

-    wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel =
-                     wxGrid::wxGridSelectCells );
+    wxGridSelection(wxGrid *grid,
+                    wxGrid::wxGridSelectionModes sel = wxGrid::wxGridSelectCells);
+

     bool IsSelection();
     bool IsSelection();

-    bool IsInSelection ( int row, int col );
+    bool IsInSelection(int row, int col);
+    bool IsInSelection(const wxGridCellCoords& coords)
+    {
+        return IsInSelection(coords.GetRow(), coords.GetCol());
+    }
+

     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
     wxGrid::wxGridSelectionModes GetSelectionMode() { return m_selectionMode; }
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
     wxGrid::wxGridSelectionModes GetSelectionMode() { return m_selectionMode; }

-    void SelectRow( int row,
-                    bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                    bool AltDown = FALSE, bool MetaDown = FALSE );
-    void SelectCol( int col,
-                    bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                    bool AltDown = FALSE, bool MetaDown = FALSE );
-    void SelectBlock( int topRow, int leftCol,
-                      int bottomRow, int rightCol,
-                      bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                      bool AltDown = FALSE, bool MetaDown = FALSE,
-                      bool sendEvent = TRUE );
-    void SelectCell( int row, int col,
-                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                     bool AltDown = FALSE, bool MetaDown = FALSE,
-                     bool sendEvent = TRUE );
-    void ToggleCellSelection( int row, int col,
-                              bool ControlDown = FALSE, 
-                              bool ShiftDown = FALSE,
-                              bool AltDown = FALSE, bool MetaDown = FALSE );
+    void SelectRow(int row, const wxKeyboardState& kbd = wxKeyboardState());
+    void SelectCol(int col, const wxKeyboardState& kbd = wxKeyboardState());
+    void SelectBlock(int topRow, int leftCol,
+                     int bottomRow, int rightCol,
+                     const wxKeyboardState& kbd = wxKeyboardState(),
+                     bool sendEvent = true );
+    void SelectBlock(const wxGridCellCoords& topLeft,
+                     const wxGridCellCoords& bottomRight,
+                     const wxKeyboardState& kbd = wxKeyboardState(),
+                     bool sendEvent = true )
+    {
+        SelectBlock(topLeft.GetRow(), topLeft.GetCol(),
+                    bottomRight.GetRow(), bottomRight.GetCol(),
+                    kbd, sendEvent);
+    }
+
+    void SelectCell(int row, int col,
+                    const wxKeyboardState& kbd = wxKeyboardState(),
+                    bool sendEvent = true);
+    void SelectCell(const wxGridCellCoords& coords,
+                    const wxKeyboardState& kbd = wxKeyboardState(),
+                    bool sendEvent = true)
+    {
+        SelectCell(coords.GetRow(), coords.GetCol(), kbd, sendEvent);
+    }
+
+    void ToggleCellSelection(int row, int col,
+                             const wxKeyboardState& kbd = wxKeyboardState());
+    void ToggleCellSelection(const wxGridCellCoords& coords,
+                             const wxKeyboardState& kbd = wxKeyboardState())
+    {
+        ToggleCellSelection(coords.GetRow(), coords.GetCol(), kbd);
+    }
+

     void ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );
     void ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );


@@ -73,6 +91,13 @@ private:
                  leftCol <= col && col <= rightCol );
     }
 
                  leftCol <= col && col <= rightCol );
     }
 

+    void SelectBlockNoEvent(int topRow, int leftCol,
+                            int bottomRow, int rightCol)
+    {
+        SelectBlock(topRow, leftCol, bottomRow, rightCol,
+                    wxKeyboardState(), false);
+    }
+

     wxGridCellCoordsArray               m_cellSelection;
     wxGridCellCoordsArray               m_blockSelectionTopLeft;
     wxGridCellCoordsArray               m_blockSelectionBottomRight;
     wxGridCellCoordsArray               m_cellSelection;
     wxGridCellCoordsArray               m_blockSelectionTopLeft;
     wxGridCellCoordsArray               m_blockSelectionBottomRight;


@@ -82,8 +107,10 @@ private:
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;
 
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;
 

-    friend class WXDLLEXPORT wxGrid;
+    friend class WXDLLIMPEXP_FWD_ADV wxGrid;
+
+    DECLARE_NO_COPY_CLASS(wxGridSelection)

 };
 
 };
 

-#endif  // #ifdef __WXGRIDSEL_H__
-#endif  // #ifndef wxUSE_NEW_GRID
+#endif  // wxUSE_GRID
+#endif  // _WX_GENERIC_GRIDSEL_H_