correct access for virtuals

[wxWidgets.git] / include / wx / mac / carbon / listctrl.h

diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index 196f97add182c0fab79d2351e82cb97774c90d9a..a83e843e4ad2899b3219bec12fa044d23b3c3d2e 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "listctrl.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/imaglist.h"
@@ -57,7 +53,7 @@
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 
-    Notifications are passed via the wxWindows 2.0 event system.
+    Notifications are passed via the wxWidgets 2.0 event system.
 
     See the sample wxListCtrl app for API usage.
 
@@ -176,14 +172,14 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = "listCtrl")
+            const wxString& name = wxListCtrlNameStr)
   {
     Create(parent, id, pos, size, style, validator, name);
   }
   ~wxListCtrl();
 
   bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
+            long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr);
 
 
   // Attributes
@@ -227,6 +223,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Sets the item image
   bool SetItemImage(long item, int image, int selImage) ;
+  bool SetItemColumnImage(long item, long column, int image);
 
   // Gets the item text
   wxString GetItemText(long item) const ;
@@ -256,7 +253,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   int GetColumnCount() const;
 
   // Retrieves the spacing between icons in pixels.
-  // If small is TRUE, gets the spacing for the small icon
+  // If isSmall is true, gets the spacing for the small icon
   // view, otherwise the large icon view.
   int GetItemSpacing(bool isSmall) const;
 
@@ -274,7 +271,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   long GetTopItem() const ;
 
   // Add or remove a single window style
-  void SetSingleStyle(long style, bool add = TRUE) ;
+  void SetSingleStyle(long style, bool add = true) ;
 
   // Set the whole window style
   void SetWindowStyleFlag(long style) ;
@@ -285,7 +282,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // Returns the item or -1 if unsuccessful.
   long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
 
-  // Implementation: converts wxWindows style to MSW style.
+  // Implementation: converts wxWidgets style to MSW style.
   // Can be a single style flag or a bit list.
   // oldStyle is 'normalised' so that it doesn't contain
   // conflicting styles.
@@ -335,7 +332,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Find an item whose label matches this string, starting from the item after 'start'
   // or the beginning if 'start' is -1.
-  long FindItem(long start, const wxString& str, bool partial = FALSE);
+  long FindItem(long start, const wxString& str, bool partial = false);
 
   // Find an item whose data matches this data, starting from the item after 'start'
   // or the beginning if 'start' is -1.