[1231183] 'cleanup: mismatched indentation' and other cleanings.

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

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 3cc0c7e157679f2df0ffa414fd814f2492b4961c..a61a2f4592fa501c19ecd351db7a8cd0ec1082d4 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,14 +12,15 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#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")
 #include "wx/datetime.h"
 
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")


@@ -28,11 +29,11 @@
 #if wxUSE_DATETIME
 
 // the default renderer for the cells containing Time and dates..
 #if wxUSE_DATETIME
 
 // 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(wxString outformat = wxDefaultDateTimeFormat,
+                               wxString informat = wxDefaultDateTimeFormat);

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


@@ -64,7 +65,7 @@ protected:
 #endif // wxUSE_DATETIME
 
 // the default renderer for the cells containing Time and dates..
 #endif // wxUSE_DATETIME
 
 // 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 );


@@ -96,11 +97,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;
 


@@ -109,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 WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor

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


@@ -123,9 +126,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() { }


@@ -154,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_