Don't interpret '&' specially in wxTextWrapper.

[wxWidgets.git] / include / wx / osx / listctrl.h

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 88520f0376011e7e51551d74de17c85f5e4897f4..46b876f3b4a27ff02892945541a6c7ced531eb9f 100644 (file)
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listctrl.h
+// Name:        wx/osx/listctrl.h

 // Purpose:     wxListCtrl class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListCtrl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -103,7 +103,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
   bool SetItemColumnImage(long item, long column, int image);
 
   // Gets the item text
   bool SetItemColumnImage(long item, long column, int image);
 
   // Gets the item text

-  wxString GetItemText(long item) const ;
+  wxString GetItemText(long item, int col = 0) const ;

 
   // Sets the item text
   void SetItemText(long item, const wxString& str) ;
 
   // Sets the item text
   void SetItemText(long item, const wxString& str) ;


@@ -217,7 +217,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
   void ClearAll();
 
   // Edit the label
   void ClearAll();
 
   // Edit the label

-  wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+  wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));

 
   // End label editing, optionally cancelling the edit
   bool EndEditLabel(bool cancel);
 
   // End label editing, optionally cancelling the edit
   bool EndEditLabel(bool cancel);


@@ -326,6 +326,10 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour() const;
 
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour() const;
 

+  virtual void Freeze ();
+  virtual void Thaw ();
+  virtual void Update ();
+

   // functions for editing/timer
   void OnRenameTimer();
   bool OnRenameAccept(long itemEdit, const wxString& value);
   // functions for editing/timer
   void OnRenameTimer();
   bool OnRenameAccept(long itemEdit, const wxString& value);


@@ -416,7 +420,6 @@ protected:
 private:
   int CalcColumnAutoWidth(int col) const;
 
 private:
   int CalcColumnAutoWidth(int col) const;
 

-  DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif