readded back wxUSE_OLE and wxUSE_WXDIB

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

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index b521834cc7310299bfb9a9409aec183f1a29471c..49dc14acf67850c2798acc8f5ff943a240b51f49 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -11,43 +11,44 @@
 
 #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(NO_GCC_PRAGMA)

 #pragma interface "gridsel.h"
 #endif
 
 #include "wx/grid.h"
 
 #pragma interface "gridsel.h"
 #endif
 
 #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);
 public:
     wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel =
                      wxGrid::wxGridSelectCells );
     bool IsSelection();
     bool IsInSelection ( int row, int col );
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);

+    wxGrid::wxGridSelectionModes GetSelectionMode() { return m_selectionMode; }

     void SelectRow( int row,
     void SelectRow( int row,

-                    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 SelectCol( int col,
     void SelectCol( 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 SelectBlock( int topRow, int leftCol,
                       int bottomRow, int rightCol,
     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,
     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,
     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 );
     void ClearSelection();
 
     void UpdateRows( size_t pos, int numRows );


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

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

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

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