From: George Tasker Date: Sun, 10 Jun 2001 23:20:31 +0000 (+0000) Subject: Fixed compilation if wxUSE_NEW_GRID and wxUSE_GRID are both set to 0 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b53dc7d661f662f0ed09c938ae4c32a0accd6350 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 9a87f635ff..1295d5d10b 100644 --- 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" @@ -146,5 +148,7 @@ private: }; +#endif // #if wxUSE_GRID || wxUSE_NEW_GRID + #endif //_WX_GENERIC_GRIDCTRL_H_ diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index ddd9793285..12f1c6c655 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -19,6 +19,9 @@ #pragma hdrstop #endif + +#if wxUSE_GRID || wxUSE_NEW_GRID + #ifndef WX_PRECOMP #include "wx/textctrl.h" #include "wx/dc.h" @@ -386,3 +389,4 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, return wxSize(width,height); } +#endif