use std::[w]string for wxString implementation unless wxUSE_STD_STRING==0 but even...

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

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index dc74d9395ec01fcab646efc3c8278c024b17d039..fff21a3684d5d8f6638745e9379c4fb2fcbf4380 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -9,45 +9,43 @@
 // 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"
 
-#ifdef __GNUG__
-#pragma interface "gridsel.h"
-#endif
+#if wxUSE_GRID
 
 #include "wx/grid.h"
 
-class WXDLLEXPORT wxGridSelection{
+class WXDLLIMPEXP_ADV wxGridSelection
+{
 public:
     wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel =
                      wxGrid::wxGridSelectCells );
     bool IsSelection();
     bool IsInSelection ( int row, int col );
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
-    void SelectRow( int row, bool addToSelected = FALSE,
-                    bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                    bool AltDown = FALSE, bool MetaDown = FALSE );
-    void SelectCol( int col, bool addToSelected = FALSE,
-                    bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                    bool AltDown = FALSE, bool MetaDown = 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,
-                      bool ControlDown = FALSE,  bool ShiftDown = FALSE,
-                      bool AltDown = FALSE, bool MetaDown = FALSE,
-                      bool sendEvent = TRUE );
+                      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 );
+                     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 );
+                              bool ControlDown = false,
+                              bool ShiftDown = false,
+                              bool AltDown = false, bool MetaDown = false );
     void ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );
@@ -80,7 +78,11 @@ private:
 
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;
+
+    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_