added wxHtmlWindow::LoadFile

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

diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index b521834cc7310299bfb9a9409aec183f1a29471c..cae07fe7ef123fe07aef8a5843226c4250a15321 100644 (file)
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -16,7 +16,7 @@
 #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,6 +29,7 @@ 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);

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

     void SelectRow( int row,
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );
     void SelectRow( int row,
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );


@@ -80,6 +81,10 @@ 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__