X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad95e0f64eb7fcd4f056abd5436eb5426b456978..e52f60e65236befe1a509cc3c1823607be0d2b3c:/include/wx/generic/gridg.h

diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h
index 0cdcfd7242..bf05ca26d3 100644
--- a/include/wx/generic/gridg.h
+++ b/include/wx/generic/gridg.h
@@ -23,7 +23,7 @@
 
 #define wxGRID_DEFAULT_EDIT_WIDTH 300
 #define wxGRID_DEFAULT_EDIT_HEIGHT 27
-#define wxGRID_DEFAULT_EDIT_X 5
+#define wxGRID_DEFAULT_EDIT_X 2
 #define wxGRID_DEFAULT_EDIT_Y 1
 #define wxGRID_DEFAULT_SHEET_TOP 31
 #define wxGRID_DEFAULT_SHEET_LEFT 0
@@ -49,7 +49,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
  public:
   wxGenericGrid(void);
 
-  inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, const long style = 0, char *name = "grid")
+  inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, long style = 0, char *name = "grid")
   {
     Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }
@@ -66,7 +66,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
 
   bool Create(wxWindow *parent, wxWindowID, const wxPoint& pos, const wxSize& size, long style = 0, const wxString& name = "grid");
 
-  bool CreateGrid(int nRows, int nCols, wxString **cellValues = NULL, short *widths = NULL,
+  bool CreateGrid(int nRows, int nCols, wxString **cellValues = (wxString **) NULL, short *widths = (short *) NULL,
      short defaultWidth = wxGRID_DEFAULT_CELL_WIDTH, short defaultHeight = wxGRID_DEFAULT_CELL_HEIGHT);
   void PaintGrid(wxDC& dc);
   void ClearGrid(void);
@@ -290,7 +290,7 @@ class WXDLLEXPORT wxGridCell: public wxObject
   wxBitmap *cellBitmap;
   int alignment;
 
-  wxGridCell(wxGenericGrid *window = NULL);
+  wxGridCell(wxGenericGrid *window = (wxGenericGrid *) NULL);
   ~wxGridCell(void);
   
   virtual wxString& GetTextValue(void) { return textValue; }
@@ -302,6 +302,7 @@ class WXDLLEXPORT wxGridCell: public wxObject
   inline wxColour& GetBackgroundColour(void) { return backgroundColour; }
   void SetBackgroundColour(const wxColour& colour);
   inline wxBrush *GetBackgroundBrush(void) { return backgroundBrush; }
+  inline void SetBackgroundBrush(wxBrush *brush) { backgroundBrush = brush; }
   inline int GetAlignment(void) { return alignment; }
   inline void SetAlignment(int align) { alignment = align; }
   inline wxBitmap *GetCellBitmap(void) { return cellBitmap; }