Use kCGBlendModeExclusion for wxCOMPOSITION_XOR operation.

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 1d02db33890874ba77aa66c42b957f90eaf3634e..81f91472804190c7218bc9363556c24fa93c6feb 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -11,11 +11,10 @@
 #ifndef _WX_GENERIC_LISTCTRL_H_
 #define _WX_GENERIC_LISTCTRL_H_
 
 #ifndef _WX_GENERIC_LISTCTRL_H_
 #define _WX_GENERIC_LISTCTRL_H_
 

+#include "wx/containr.h"

 #include "wx/scrolwin.h"
 #include "wx/textctrl.h"
 
 #include "wx/scrolwin.h"
 #include "wx/textctrl.h"
 

-class WXDLLIMPEXP_FWD_CORE wxImageList;
-

 #if wxUSE_DRAG_AND_DROP
 class WXDLLIMPEXP_FWD_CORE wxDropTarget;
 #endif
 #if wxUSE_DRAG_AND_DROP
 class WXDLLIMPEXP_FWD_CORE wxDropTarget;
 #endif


@@ -31,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
 // wxListCtrl
 //-----------------------------------------------------------------------------
 
 // wxListCtrl
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxControl,
+class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled<wxListCtrlBase>,

                                           public wxScrollHelper
 {
 public:
                                           public wxScrollHelper
 {
 public:


@@ -66,7 +65,7 @@ public:
                  const wxString &name = wxListCtrlNameStr);
 
     bool GetColumn( int col, wxListItem& item ) const;
                  const wxString &name = wxListCtrlNameStr);
 
     bool GetColumn( int col, wxListItem& item ) const;

-    bool SetColumn( int col, wxListItem& item );
+    bool SetColumn( int col, const wxListItem& item );

     int GetColumnWidth( int col ) const;
     bool SetColumnWidth( int col, int width);
     int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
     int GetColumnWidth( int col ) const;
     bool SetColumnWidth( int col, int width);
     int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think


@@ -79,7 +78,7 @@ public:
     bool SetItemState( long item, long state, long stateMask);
     bool SetItemImage( long item, int image, int selImage = -1 );
     bool SetItemColumnImage( long item, long column, int image );
     bool SetItemState( long item, long state, long stateMask);
     bool SetItemImage( long item, int image, int selImage = -1 );
     bool SetItemColumnImage( long item, long column, int image );

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

     void SetItemText( long item, const wxString& str );
     wxUIntPtr GetItemData( long item ) const;
     bool SetItemPtrData(long item, wxUIntPtr data);
     void SetItemText( long item, const wxString& str );
     wxUIntPtr GetItemData( long item ) const;
     bool SetItemPtrData(long item, wxUIntPtr data);


@@ -121,7 +120,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); }
 


@@ -134,18 +133,9 @@ public:
     long InsertItem( long index, const wxString& label );
     long InsertItem( long index, int imageIndex );
     long InsertItem( long index, const wxString& label, int imageIndex );
     long InsertItem( long index, const wxString& label );
     long InsertItem( long index, int imageIndex );
     long InsertItem( long index, const wxString& label, int imageIndex );

-    long InsertColumn( long col, wxListItem& info );
-    long InsertColumn( long col, const wxString& heading,
-                       int format = wxLIST_FORMAT_LEFT, int width = -1 );

     bool ScrollList( int dx, int dy );
     bool SortItems( wxListCtrlCompare fn, wxIntPtr data );
 
     bool ScrollList( int dx, int dy );
     bool SortItems( wxListCtrlCompare fn, wxIntPtr data );
 

-    // are we in report mode?
-    bool InReportView() const { return HasFlag(wxLC_REPORT); }
-
-    // are we in virtual report mode?
-    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-

     // do we have a header window?
     bool HasHeader() const
         { return InReportView() && !HasFlag(wxLC_NO_HEADER); }
     // do we have a header window?
     bool HasHeader() const
         { return InReportView() && !HasFlag(wxLC_NO_HEADER); }


@@ -154,6 +144,8 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 

+    virtual void EnableBellOnNoMatch(bool on = true);
+

 #if WXWIN_COMPATIBILITY_2_6
     // obsolete, don't use
     wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete, don't use
     wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );


@@ -199,7 +191,6 @@ public:
 #endif
 
     virtual bool ShouldInheritColours() const { return false; }
 #endif
 
     virtual bool ShouldInheritColours() const { return false; }

-    virtual void SetFocus();

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -212,9 +203,12 @@ public:
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;

-    wxCoord              m_headerHeight;

 
 protected:
 
 protected:

+    // Implement base class pure virtual methods.
+    long DoInsertColumn(long col, const wxListItem& info);
+
+

     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
     // take into account the coordinates difference between the container
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
     // take into account the coordinates difference between the container


@@ -222,7 +216,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;