Added the ability to use built-in bullet styles, currently standard/circle or standar...

[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 cd02fd737fff2165766a391af6d176389b17f986..6330ba6be86473d38d426d59b0b6dea137f0e695 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -12,15 +12,10 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#include "wx/control.h"
-#include "wx/event.h"
-#include "wx/imaglist.h"

 #include "wx/generic/listctrl.h"
 
 class wxMacDataBrowserListCtrlControl;
 #include "wx/generic/listctrl.h"
 
 class wxMacDataBrowserListCtrlControl;

-
-// type of compare function for wxListCtrl sort operation
-typedef int (*wxListCtrlCompare)(long item1, long item2, long sortData);
+class wxMacListControl;

 
 class WXDLLEXPORT wxListCtrl: public wxControl
 {
 
 class WXDLLEXPORT wxListCtrl: public wxControl
 {


@@ -137,6 +132,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // Gets the number of columns in the list control
   int GetColumnCount() const;
 
   // Gets the number of columns in the list control
   int GetColumnCount() const;
 

+  void SetItemSpacing( int spacing, bool isSmall = false );

   wxSize GetItemSpacing() const;
 
   // Gets the number of selected items in the list control
   wxSize GetItemSpacing() const;
 
   // Gets the number of selected items in the list control


@@ -154,6 +150,9 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // list or report view
   long GetTopItem() const ;
 
   // list or report view
   long GetTopItem() const ;
 

+  // are we in report mode?
+  bool InReportView() const { return HasFlag(wxLC_REPORT); }
+

   bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
   // Add or remove a single window style
   bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
   // Add or remove a single window style


@@ -307,6 +306,9 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   void Command(wxCommandEvent& event) { ProcessCommand(event); };
 
 
   void Command(wxCommandEvent& event) { ProcessCommand(event); };
 

+  wxListCtrlCompare GetCompareFunc() { return m_compareFunc; };
+  long GetCompareFuncData() { return m_compareFuncData; };
+

 protected:
   // overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,
 protected:
   // overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,


@@ -318,7 +320,10 @@ protected:
   
   wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
   wxMacDataBrowserListCtrlControl* m_dbImpl;
   
   wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
   wxMacDataBrowserListCtrlControl* m_dbImpl;

-    
+  void* /*EventHandlerRef*/   m_macListCtrlEventHandler;
+  wxListCtrlCompare m_compareFunc;
+  long m_compareFuncData;
+  

   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
   wxImageList *     m_imageListNormal; // The image list for normal icons
   wxImageList *     m_imageListSmall;  // The image list for small icons
   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
   wxImageList *     m_imageListNormal; // The image list for normal icons
   wxImageList *     m_imageListSmall;  // The image list for small icons


@@ -338,7 +343,5 @@ protected:
   int               m_count; // for virtual lists, store item count
 };
 
   int               m_count; // for virtual lists, store item count
 };
 

-typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
-

 #endif
     // _WX_LISTCTRL_H_
 #endif
     // _WX_LISTCTRL_H_