-#ifndef __GRIDH_BASE__
-#define __GRIDH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/grid.h
+// Purpose: wxGrid base header
+// Author: Julian Smart
+// Modified by:
+// Created:
+// Copyright: (c) Julian Smart
+// RCS-ID: $Id$
+// 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__
+// this 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"
+
+#endif // _WX_GRID_H_BASE_