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
This commit is contained in:
@@ -16,6 +16,8 @@
|
|||||||
#pragma interface "gridctrl.h"
|
#pragma interface "gridctrl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if wxUSE_GRID || wxUSE_NEW_GRID
|
||||||
|
|
||||||
#include "wx/grid.h"
|
#include "wx/grid.h"
|
||||||
#include "wx/string.h"
|
#include "wx/string.h"
|
||||||
#include "wx/datetime.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_
|
||||||
|
|
||||||
|
@@ -19,6 +19,9 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#if wxUSE_GRID || wxUSE_NEW_GRID
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/textctrl.h"
|
#include "wx/textctrl.h"
|
||||||
#include "wx/dc.h"
|
#include "wx/dc.h"
|
||||||
@@ -386,3 +389,4 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
|
|||||||
return wxSize(width,height);
|
return wxSize(width,height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Reference in New Issue
Block a user