Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h
index 073d62662b4c60d6ee3d64e648b2acb36f3470a6..a81b17c9d93e88e57d10cc2d98a5bc74e485df86 100644 (file)
--- a/include/wx/generic/grideditors.h
+++ b/include/wx/generic/grideditors.h
@@ -42,7 +42,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)

-    DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler);

 };
 
 
 };
 
 


@@ -63,7 +63,8 @@ public:
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();


@@ -92,7 +93,7 @@ private:
     size_t   m_maxChars;        // max number of chars allowed
     wxString m_value;
 
     size_t   m_maxChars;        // max number of chars allowed
     wxString m_value;
 

-    DECLARE_NO_COPY_CLASS(wxGridCellTextEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellTextEditor);

 };
 
 // the editor for numeric (long) data
 };
 
 // the editor for numeric (long) data


@@ -109,7 +110,8 @@ public:
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();


@@ -141,7 +143,7 @@ protected:
 
     // string representation of our value
     wxString GetString() const
 
     // string representation of our value
     wxString GetString() const

-        { return wxString::Format(_T("%ld"), m_value); }
+        { return wxString::Format(wxT("%ld"), m_value); }

 
 private:
     int m_min,
 
 private:
     int m_min,


@@ -149,7 +151,7 @@ private:
 
     long m_value;
 
 
     long m_value;
 

-    DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellNumberEditor);

 };
 
 // the editor for floating point numbers (double) data
 };
 
 // the editor for floating point numbers (double) data


@@ -164,7 +166,8 @@ public:
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();


@@ -185,7 +188,7 @@ private:
         m_precision;
     double m_value;
 
         m_precision;
     double m_value;
 

-    DECLARE_NO_COPY_CLASS(wxGridCellFloatEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellFloatEditor);

 };
 
 #endif // wxUSE_TEXTCTRL
 };
 
 #endif // wxUSE_TEXTCTRL


@@ -207,7 +210,8 @@ public:
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();


@@ -223,7 +227,7 @@ public:
 
     // set the string values returned by GetValue() for the true and false
     // states, respectively
 
     // set the string values returned by GetValue() for the true and false
     // states, respectively

-    static void UseStringValues(const wxString& valueTrue = _T("1"),
+    static void UseStringValues(const wxString& valueTrue = wxT("1"),

                                 const wxString& valueFalse = wxEmptyString);
 
     // return true if the given string is equal to the string representation of
                                 const wxString& valueFalse = wxEmptyString);
 
     // return true if the given string is equal to the string representation of


@@ -238,7 +242,7 @@ private:
 
     static wxString ms_stringValues[2];
 
 
     static wxString ms_stringValues[2];
 

-    DECLARE_NO_COPY_CLASS(wxGridCellBoolEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellBoolEditor);

 };
 
 #endif // wxUSE_CHECKBOX
 };
 
 #endif // wxUSE_CHECKBOX


@@ -263,7 +267,8 @@ public:
     virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();


@@ -283,7 +288,7 @@ protected:
     wxArrayString   m_choices;
     bool            m_allowOthers;
 
     wxArrayString   m_choices;
     bool            m_allowOthers;
 

-    DECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor);

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


@@ -299,13 +304,14 @@ public:
     virtual wxGridCellEditor*  Clone() const;
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual wxGridCellEditor*  Clone() const;
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual bool EndEdit(int row, int col, const wxGrid* grid,
+                         const wxString& oldval, wxString *newval);

     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
 private:
     long m_index;
 
     virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
 private:
     long m_index;
 

-    DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellEnumEditor);

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


@@ -321,8 +327,9 @@ public:
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellAutoWrapStringEditor; }
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellAutoWrapStringEditor; }
 

-    DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
+    wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor);

 };
 
 #endif // wxUSE_GRID
 };
 
 #endif // wxUSE_GRID

+

 #endif // _WX_GENERIC_GRID_EDITORS_H_
 #endif // _WX_GENERIC_GRID_EDITORS_H_