projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use wxFputs(), not fputs(), in Unicode mode under Unix too (modified patch 1017940)
[wxWidgets.git]
/
include
/
wx
/
generic
/
gridctrl.h
diff --git
a/include/wx/generic/gridctrl.h
b/include/wx/generic/gridctrl.h
index 5a852c6bd5f6635d8d93980299b34937bf64f048..3a717e2fd82150ed1178890f9318add1ef1a52b3 100644
(file)
--- a/
include/wx/generic/gridctrl.h
+++ b/
include/wx/generic/gridctrl.h
@@
-12,21
+12,24
@@
#ifndef _WX_GENERIC_GRIDCTRL_H_
#define _WX_GENERIC_GRIDCTRL_H_
#ifndef _WX_GENERIC_GRIDCTRL_H_
#define _WX_GENERIC_GRIDCTRL_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "gridctrl.h"
#endif
#pragma interface "gridctrl.h"
#endif
-#if wxUSE_GRID
|| wxUSE_NEW_GRID
+#if wxUSE_GRID
#include "wx/grid.h"
#include "wx/string.h"
#include "wx/grid.h"
#include "wx/string.h"
+#include "wx/arrstr.h"
#include "wx/datetime.h"
#define wxGRID_VALUE_CHOICEINT _T("choiceint")
#define wxGRID_VALUE_DATETIME _T("datetime")
#include "wx/datetime.h"
#define wxGRID_VALUE_CHOICEINT _T("choiceint")
#define wxGRID_VALUE_DATETIME _T("datetime")
+#if wxUSE_DATETIME
+
// the default renderer for the cells containing Time and dates..
// the default renderer for the cells containing Time and dates..
-class WXDLL
EXPORT
wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
+class WXDLL
IMPEXP_ADV
wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellDateTimeRenderer(wxString outformat = _T("%c"),
{
public:
wxGridCellDateTimeRenderer(wxString outformat = _T("%c"),
@@
-59,9
+62,10
@@
protected:
wxDateTime::TimeZone m_tz;
};
wxDateTime::TimeZone m_tz;
};
+#endif // wxUSE_DATETIME
// the default renderer for the cells containing Time and dates..
// the default renderer for the cells containing Time and dates..
-class WXDLL
EXPORT
wxGridCellEnumRenderer : public wxGridCellStringRenderer
+class WXDLL
IMPEXP_ADV
wxGridCellEnumRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );
{
public:
wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );
@@
-93,7
+97,7
@@
protected:
#if wxUSE_COMBOBOX
#if wxUSE_COMBOBOX
-class WXDLL
EXPORT
wxGridCellEnumEditor : public wxGridCellChoiceEditor
+class WXDLL
IMPEXP_ADV
wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
{
public:
wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
@@
-106,11
+110,13
@@
public:
private:
long int m_startint;
private:
long int m_startint;
+
+ DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
};
#endif // wxUSE_COMBOBOX
};
#endif // wxUSE_COMBOBOX
-class WXDLL
EXPORT
wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLL
IMPEXP_ADV
wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{
public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
{
public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
@@
-120,9
+126,11
@@
public:
virtual wxGridCellEditor *Clone() const
{ return new wxGridCellAutoWrapStringEditor; }
virtual wxGridCellEditor *Clone() const
{ return new wxGridCellAutoWrapStringEditor; }
+
+ DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
};
};
-class WXDLL
EXPORT
wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLL
IMPEXP_ADV
wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
@@
-151,7
+159,7
@@
private:
};
};
-#endif // #if wxUSE_GRID
|| wxUSE_NEW_GRID
+#endif // #if wxUSE_GRID
#endif //_WX_GENERIC_GRIDCTRL_H_
#endif //_WX_GENERIC_GRIDCTRL_H_