removed static methods from wxAppTraitsBase, this doesn't work well in non-monolithic...

[wxWidgets.git] / include / wx / generic / gridctrl.h

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index eedc77cc45a103dc8c4341d06c7c527f431e9f60..b607c326075f22117700c49787975048893167c8 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -16,7 +16,7 @@
     #pragma interface "gridctrl.h"
 #endif
 
     #pragma interface "gridctrl.h"
 #endif
 

-#if wxUSE_GRID || wxUSE_NEW_GRID
+#if wxUSE_GRID

 
 #include "wx/grid.h"
 #include "wx/string.h"
 
 #include "wx/grid.h"
 #include "wx/string.h"


@@ -25,6 +25,8 @@
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")
 #define wxGRID_VALUE_DATETIME     _T("datetime")
 
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")
 #define wxGRID_VALUE_DATETIME     _T("datetime")
 

+#if wxUSE_DATETIME
+

 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {


@@ -59,6 +61,7 @@ protected:
     wxDateTime::TimeZone m_tz;
 };
 
     wxDateTime::TimeZone m_tz;
 };
 

+#endif // wxUSE_DATETIME

 
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
 
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer


@@ -151,7 +154,7 @@ private:
 
 };
 
 
 };
 

-#endif  // #if wxUSE_GRID || wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID

 
 #endif //_WX_GENERIC_GRIDCTRL_H_
 
 
 #endif //_WX_GENERIC_GRIDCTRL_H_