Fix bug in GetTimeZone where timezone wasn't set.

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

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 5fa5720f03c4bebadb95058ce5eee7a4a2c9bdee..31849d7d39b02b58596933119cd1e51a6d4844f6 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,10 +12,6 @@
 #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__)
-    #pragma interface "gridctrl.h"
-#endif
-

 #if wxUSE_GRID
 
 #include "wx/grid.h"
 #if wxUSE_GRID
 
 #include "wx/grid.h"


@@ -32,8 +28,8 @@
 class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 public:
 class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 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,


@@ -54,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;


@@ -89,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;
 };


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


@@ -153,7 +149,7 @@ 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);