applied event speed up patch (752928)

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

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 82431d0c0e0cc477731bc310d049b78390ebc481..b607c326075f22117700c49787975048893167c8 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,11 +12,11 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "gridctrl.h"
 #endif
 
-#if wxUSE_GRID || wxUSE_NEW_GRID
+#if wxUSE_GRID
 
 #include "wx/grid.h"
 #include "wx/string.h"
@@ -25,6 +25,8 @@
 #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
 {
@@ -59,6 +61,7 @@ protected:
     wxDateTime::TimeZone m_tz;
 };
 
+#endif // wxUSE_DATETIME
 
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
@@ -110,7 +113,7 @@ private:
 
 #endif // wxUSE_COMBOBOX
 
-class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
 {
 public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
@@ -122,7 +125,7 @@ public:
         { return new wxGridCellAutoWrapStringEditor; }
 };
 
-class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
 {
 public:
     wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
@@ -151,7 +154,7 @@ private:
 
 };
 
-#endif  // #if wxUSE_GRID || wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID
 
 #endif //_WX_GENERIC_GRIDCTRL_H_