compilation fix: wxGenericCollapsiblePane needs wxButton and wxStaticLine

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

diff --git a/include/wx/mac/classic/listctrl.h b/include/wx/mac/classic/listctrl.h
index 4975c279c83088ce44b2c6a84b13724b2b345ab5..503d3ecf53a84c1f9a188912f9a0c432e06e1127 100644 (file)
--- a/include/wx/mac/classic/listctrl.h
+++ b/include/wx/mac/classic/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #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"
 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/imaglist.h"


@@ -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,
 
   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);
   }
   {
     Create(parent, id, pos, size, style, validator, name);
   }

-  ~wxListCtrl();
+  virtual ~wxListCtrl();

 
   bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 
   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
 
 
   // Attributes


@@ -227,6 +223,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Sets the item image
   bool SetItemImage(long item, int image, int selImage) ;
 
   // 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 ;
 
   // 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.
   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;
 
   // 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
   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) ;
 
   // Set the whole window style
   void SetWindowStyleFlag(long style) ;


@@ -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.
 
   // 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.
 
   // Find an item whose data matches this data, starting from the item after 'start'
   // or the beginning if 'start' is -1.