projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused wxWindow::m_doubleClickAllowed field
[wxWidgets.git]
/
include
/
wx
/
generic
/
gridctrl.h
diff --git
a/include/wx/generic/gridctrl.h
b/include/wx/generic/gridctrl.h
index 9a87f635ffe70ac066b5f7581764569ebed6d514..5a852c6bd5f6635d8d93980299b34937bf64f048 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"
@@
-89,6
+91,8
@@
protected:
};
};
+#if wxUSE_COMBOBOX
+
class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
@@
-104,8
+108,9
@@
private:
long int m_startint;
};
long int m_startint;
};
+#endif // wxUSE_COMBOBOX
-class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class
WXDLLEXPORT
wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{
public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
{
public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
@@
-117,7
+122,7
@@
public:
{ return new wxGridCellAutoWrapStringEditor; }
};
{ return new wxGridCellAutoWrapStringEditor; }
};
-class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class
WXDLLEXPORT
wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
@@
-146,5
+151,7
@@
private:
};
};
+#endif // #if wxUSE_GRID || wxUSE_NEW_GRID
+
#endif //_WX_GENERIC_GRIDCTRL_H_
#endif //_WX_GENERIC_GRIDCTRL_H_