header cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-03 14:28:36 +00:00
parent eb7f97f8d6
commit df9fac6d21
4 changed files with 21 additions and 31 deletions

View File

@ -9,20 +9,14 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WXGRID_H__
#define __WXGRID_H__
#ifndef _WX_GENERIC_GRID_H_
#define _WX_GENERIC_GRID_H_
#include "wx/defs.h"
#if wxUSE_GRID
#include "wx/hashmap.h"
#include "wx/panel.h"
#include "wx/scrolwin.h"
#include "wx/string.h"
#include "wx/arrstr.h"
#include "wx/scrolbar.h"
#include "wx/event.h"
#include "wx/combobox.h"
#include "wx/dynarray.h"
#include "wx/timer.h"
#include "wx/clntdata.h"
// ----------------------------------------------------------------------------
// constants
@ -67,7 +61,6 @@ class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
class WXDLLIMPEXP_ADV wxGridColLabelWindow;
class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
class WXDLLIMPEXP_ADV wxGridTableBase;
class WXDLLIMPEXP_ADV wxGridWindow;
class WXDLLIMPEXP_ADV wxGridTypeRegistry;
class WXDLLIMPEXP_ADV wxGridSelection;
@ -2274,5 +2267,5 @@ extern const int wxEVT_GRID_CHANGE_SEL_LABEL;
#endif
#endif // ifndef wxUSE_GRID
#endif // wxUSE_GRID
#endif // _WX_GENERIC_GRID_H_

View File

@ -12,12 +12,9 @@
#ifndef _WX_GENERIC_GRIDCTRL_H_
#define _WX_GENERIC_GRIDCTRL_H_
#if wxUSE_GRID
#include "wx/grid.h"
#include "wx/string.h"
#include "wx/arrstr.h"
#include "wx/datetime.h"
#if wxUSE_GRID
#define wxGRID_VALUE_CHOICEINT _T("choiceint")
#define wxGRID_VALUE_DATETIME _T("datetime")
@ -155,7 +152,5 @@ private:
};
#endif // #if wxUSE_GRID
#endif //_WX_GENERIC_GRIDCTRL_H_
#endif // wxUSE_GRID
#endif // _WX_GENERIC_GRIDCTRL_H_

View File

@ -9,8 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WXGRIDSEL_H__
#define __WXGRIDSEL_H__
#ifndef _WX_GENERIC_GRIDSEL_H_
#define _WX_GENERIC_GRIDSEL_H_
#include "wx/defs.h"
@ -18,7 +18,8 @@
#include "wx/grid.h"
class WXDLLIMPEXP_ADV wxGridSelection{
class WXDLLIMPEXP_ADV wxGridSelection
{
public:
wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel =
wxGrid::wxGridSelectCells );
@ -83,6 +84,5 @@ private:
DECLARE_NO_COPY_CLASS(wxGridSelection)
};
#endif // #ifndef wxUSE_GRID
#endif // #ifdef __WXGRIDSEL_H__
#endif // wxUSE_GRID
#endif // _WX_GENERIC_GRIDSEL_H_

View File

@ -17,12 +17,14 @@
#if wxUSE_GRID
#include "wx/generic/gridctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/dc.h"
#include "wx/combobox.h"
#endif // WX_PRECOMP
#include "wx/generic/gridctrl.h"
#include "wx/tokenzr.h"
// ----------------------------------------------------------------------------