Updated Scintilla to 1.52 (on the trunk this time too)

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

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index 295e1fa50652bec12acd68026f765187c11769a0..906fb1199640e474003c0d4f26d8c6e932f9c483 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -11,12 +11,12 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if defined(wxUSE_NEW_GRID) && (wxUSE_NEW_GRID)
+#if wxUSE_GRID

 
 #ifndef __WXGRIDSEL_H__
 #define __WXGRIDSEL_H__
 
 
 #ifndef __WXGRIDSEL_H__
 #define __WXGRIDSEL_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "gridsel.h"
 #endif
 
 #pragma interface "gridsel.h"
 #endif
 


@@ -29,13 +29,26 @@ public:
     bool IsSelection();
     bool IsInSelection ( int row, int col );
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
     bool IsSelection();
     bool IsInSelection ( int row, int col );
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);

-    void SelectRow( int row, bool addToSelected = FALSE );
-    void SelectCol( int col, bool addToSelected = FALSE );
+    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,
     void SelectBlock( int topRow, int leftCol,
                       int bottomRow, int rightCol,

-                      wxMouseEvent* event = 0, bool sendEvent = TRUE );
-    void SelectCell( int row, int col, bool sendEvent = TRUE );
-    void ToggleCellSelection( int row, int col);
+                      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 ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );
     void ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );


@@ -68,7 +81,12 @@ private:
 
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;
 
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;

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

 };
 
 #endif  // #ifdef __WXGRIDSEL_H__
 };
 
 #endif  // #ifdef __WXGRIDSEL_H__

-#endif  // #ifndef wxUSE_NEW_GRID
+#endif  // #ifndef wxUSE_GRID
+