Fixed compilation if wxUSE_NEW_GRID and wxUSE_GRID are both set to 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 9a87f635ffe70ac066b5f7581764569ebed6d514..1295d5d10b454921b6f0f99e1ab348931dcd237f 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -16,6 +16,8 @@
     #pragma interface "gridctrl.h"
 #endif
 
     #pragma interface "gridctrl.h"
 #endif
 

+#if wxUSE_GRID || wxUSE_NEW_GRID
+

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


@@ -146,5 +148,7 @@ private:
 
 };
 
 
 };
 

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

 #endif //_WX_GENERIC_GRIDCTRL_H_
 
 #endif //_WX_GENERIC_GRIDCTRL_H_
 

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index ddd9793285edccfa34aa6c0a692e0367b160c5ad..12f1c6c6554e3b258d045e695cad362651c05ba6 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+
+#if wxUSE_GRID || wxUSE_NEW_GRID 
+

 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"


@@ -386,3 +389,4 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
     return wxSize(width,height);
 }
 

+#endif