override OnAssertFailure(), not OnAssert() which is not called by wxOnAssert() any...

[wxWidgets.git] / include / wx / generic / gridctrl.h

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 5a852c6bd5f6635d8d93980299b34937bf64f048..31849d7d39b02b58596933119cd1e51a6d4844f6 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,25 +12,24 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 

-#ifdef __GNUG__
-    #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 WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer

 {
 public:
 {
 public:

-    wxGridCellDateTimeRenderer(wxString outformat =  _T("%c"),
-                               wxString informat =  _T("%c"));
+    wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat,
+                               const wxString& informat = wxDefaultDateTimeFormat);

 
     // draw the string right aligned
     virtual void Draw(wxGrid& grid,
 
     // draw the string right aligned
     virtual void Draw(wxGrid& grid,


@@ -51,7 +50,7 @@ public:
     virtual void SetParameters(const wxString& params);
 
 protected:
     virtual void SetParameters(const wxString& params);
 
 protected:

-    wxString GetString(wxGrid& grid, int row, int col);
+    wxString GetString(const wxGrid& grid, int row, int col);

 
     wxString m_iformat;
     wxString m_oformat;
 
     wxString m_iformat;
     wxString m_oformat;


@@ -59,9 +58,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 WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellEnumRenderer : public wxGridCellStringRenderer

 {
 public:
     wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );
 {
 public:
     wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );


@@ -85,7 +85,7 @@ public:
     virtual void SetParameters(const wxString& params);
 
 protected:
     virtual void SetParameters(const wxString& params);
 
 protected:

-    wxString GetString(wxGrid& grid, int row, int col);
+    wxString GetString(const wxGrid& grid, int row, int col);

 
     wxArrayString m_choices;
 };
 
     wxArrayString m_choices;
 };


@@ -93,11 +93,11 @@ protected:
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
+class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor

 {
 public:
     wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
 {
 public:
     wxGridCellEnumEditor( const wxString& choices = wxEmptyString );

-    virtual ~wxGridCellEnumEditor() {};
+    virtual ~wxGridCellEnumEditor() {}

 
     virtual wxGridCellEditor*  Clone() const;
 
 
     virtual wxGridCellEditor*  Clone() const;
 


@@ -106,11 +106,13 @@ public:
 
 private:
     long int   m_startint;
 
 private:
     long int   m_startint;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)

 };
 
 #endif // wxUSE_COMBOBOX
 
 };
 
 #endif // wxUSE_COMBOBOX
 

-class WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor

 {
 public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
 {
 public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }


@@ -120,9 +122,11 @@ public:
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellAutoWrapStringEditor; }
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellAutoWrapStringEditor; }

+
+    DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)

 };
 
 };
 

-class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer

 {
 public:
     wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
 {
 public:
     wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }


@@ -145,13 +149,13 @@ public:
 private:
     wxArrayString GetTextLines( wxGrid& grid,
                                 wxDC& dc,
 private:
     wxArrayString GetTextLines( wxGrid& grid,
                                 wxDC& dc,

-                                wxGridCellAttr& attr,
+                                const wxGridCellAttr& attr,

                                 const wxRect& rect,
                                 int row, int col);
 
 };
 
                                 const wxRect& rect,
                                 int row, int col);
 
 };
 

-#endif  // #if wxUSE_GRID || wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID

 
 #endif //_WX_GENERIC_GRIDCTRL_H_
 
 
 #endif //_WX_GENERIC_GRIDCTRL_H_