fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 91ee46b03501d50f8e06a3ff5585102f51bca6cd..f2db368a54db5b8a0fce3db50da2530b26a6623f 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -121,7 +121,7 @@ public:
     void SetItemCount(long count);
 
     wxTextCtrl *EditLabel(long item,
     void SetItemCount(long count);
 
     wxTextCtrl *EditLabel(long item,

-                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+                          wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));

     wxTextCtrl* GetEditControl() const;
     void Edit( long item ) { EditLabel(item); }
 
     wxTextCtrl* GetEditControl() const;
     void Edit( long item ) { EditLabel(item); }
 


@@ -221,7 +221,7 @@ protected:
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
 
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
 

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;

 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;