corrected wxGauge to inherit from wxGaugeBase

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

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 9a87f635ffe70ac066b5f7581764569ebed6d514..82431d0c0e0cc477731bc310d049b78390ebc481 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -16,6 +16,8 @@
     #pragma interface "gridctrl.h"
 #endif
 
+#if wxUSE_GRID || wxUSE_NEW_GRID
+
 #include "wx/grid.h"
 #include "wx/string.h"
 #include "wx/datetime.h"
@@ -89,6 +91,8 @@ protected:
 };
 
 
+#if wxUSE_COMBOBOX
+
 class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:
@@ -104,6 +108,7 @@ private:
     long int   m_startint;
 };
 
+#endif // wxUSE_COMBOBOX
 
 class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
 {
@@ -146,5 +151,7 @@ private:
 
 };
 
+#endif  // #if wxUSE_GRID || wxUSE_NEW_GRID
+
 #endif //_WX_GENERIC_GRIDCTRL_H_