X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f190b09c5c1e25cfd8a6156d8d43f0b6647521..bae90c4cd512c351cc2b4b663e0ac1a649911746:/include/wx/generic/grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 22c869cd7a..8996aed1bc 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -14,7 +14,7 @@
 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "grid.h"
 #endif
 
@@ -567,6 +567,8 @@ public:
     wxGridCellChoiceEditor(size_t count = 0,
                            const wxString choices[] = NULL,
                            bool allowOthers = FALSE);
+    wxGridCellChoiceEditor(const wxArrayString& choices,
+                           bool allowOthers = FALSE);
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
@@ -937,7 +939,8 @@ private:
 // A 2-dimensional array of strings for data values
 //
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray,
+                              class WXDLLIMPEXP_ADV);
 
 
 
@@ -1051,7 +1054,8 @@ extern WXDLLIMPEXP_ADV wxRect           wxGridNoCellRect;
 
 // An array of cell coords...
 //
-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
+                              class WXDLLIMPEXP_ADV);
 
 // ----------------------------------------------------------------------------
 // wxGrid
@@ -1060,12 +1064,16 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
 class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow
 {
 public:
-    wxGrid()
-        {
-            Create();
-        }
+    wxGrid() ;
 
-    wxGrid( wxWindow *parent,
+        wxGrid( wxWindow *parent,
+            wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxWANTS_CHARS,
+            const wxString& name = wxPanelNameStr );
+
+    bool Create( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,