Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/grid.h b/include/wx/grid.h
index 668f69a3e30e99b72438fc76bc060a5bf96aa89a..a271413e018c34767d3dff0590cab838f25f1d17 100644 (file)
--- a/include/wx/grid.h
+++ b/include/wx/grid.h
@@ -1,11 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/grid.h
+// Purpose:     wxGrid base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_GRID_H_BASE_
 #define _WX_GRID_H_BASE_
 
 #ifndef _WX_GRID_H_BASE_
 #define _WX_GRID_H_BASE_
 

-#include "wx/generic/gridg.h"
+#include "wx/generic/grid.h"

 
 

-#ifndef wxGrid
-#define wxGrid wxGenericGrid
-#endif
+// 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_
+#endif // _WX_GRID_H_BASE_