Fix wxOSX warnings about int-to-void* casts.

[wxWidgets.git] / include / wx / grid.h

diff --git a/include/wx/grid.h b/include/wx/grid.h
index 6d55e0889b62b09f96ac1187d8b6855f1dff55b9..02055658edd5abe0a654fadecf935a578673c454 100644 (file)
--- a/include/wx/grid.h
+++ b/include/wx/grid.h
@@ -1,11 +1,21 @@
-#ifndef __GRIDH_BASE__
-#define __GRIDH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/grid.h
+// Purpose:     wxGrid base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
 
-#include "wx/generic/gridg.h"
+#ifndef _WX_GRID_H_BASE_
+#define _WX_GRID_H_BASE_
 
-#ifndef wxGrid
-#define wxGrid wxGenericGrid
-#endif
+#include "wx/generic/grid.h"
 
-#endif
-    // __GRIDH_BASE__
+// these headers used to be included from the above header but isn't any more,
+// still do it from here for compatibility
+#include "wx/generic/grideditors.h"
+#include "wx/generic/gridctrl.h"
+
+#endif // _WX_GRID_H_BASE_