Add wxUSE_UNICODE guard around wxDF_UNICODETEXT in the sample.

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

diff --git a/include/wx/grid.h b/include/wx/grid.h
index 6d55e0889b62b09f96ac1187d8b6855f1dff55b9..a271413e018c34767d3dff0590cab838f25f1d17 100644 (file)
--- a/include/wx/grid.h
+++ b/include/wx/grid.h
@@ -1,11 +1,22 @@
-#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__
+// 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_