X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d43638db10823193952af62215f4c9e900f312a..2aa45cc91981cbf8be5d6c63c3fda99b530cf308:/include/wx/generic/gridg.h diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h index ae1724ad7e..bf05ca26d3 100644 --- a/include/wx/generic/gridg.h +++ b/include/wx/generic/gridg.h @@ -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; }