avoid a bug in Carbon headers

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

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index dc74d9395ec01fcab646efc3c8278c024b17d039..55af91488c3091ae630ea15ea7b498309e28550c 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -11,28 +11,29 @@
 
 #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);

-    void SelectRow( int row, 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 );
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );

-    void SelectCol( int col, bool addToSelected = FALSE,
+    void SelectCol( int col,

                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );
     void SelectBlock( int topRow, int leftCol,
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );
     void SelectBlock( int topRow, int leftCol,


@@ -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
+