made wx[Array]TreeItemId[s] more backwards compatible

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 0576e00126458a157cd61ed5b30fdc906d5cd551..8fd3c330073048fff7bd7b5ee7387054cf118fdc 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -4,25 +4,27 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "listctrl.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #pragma interface "listctrl.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"

-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"
+

 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/dcclient.h"
 #include "wx/scrolwin.h"
 #include "wx/settings.h"
 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/dcclient.h"
 #include "wx/scrolwin.h"
 #include "wx/settings.h"

+#include "wx/listbase.h"

 
 #if wxUSE_DRAG_AND_DROP
 class WXDLLEXPORT wxDropTarget;
 
 #if wxUSE_DRAG_AND_DROP
 class WXDLLEXPORT wxDropTarget;


@@ -34,7 +36,13 @@ class WXDLLEXPORT wxDropTarget;
 
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;
 
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;

+
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)

 class WXDLLEXPORT wxListCtrl;
 class WXDLLEXPORT wxListCtrl;

+#define wxImageListType wxImageList
+#else
+#define wxImageListType wxGenericImageList
+#endif

 
 //-----------------------------------------------------------------------------
 // internal classes
 
 //-----------------------------------------------------------------------------
 // internal classes


@@ -64,7 +72,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString &name = "listctrl" )
+                const wxString &name = wxT("listctrl") )

     {
         Create(parent, id, pos, size, style, validator, name);
     }
     {
         Create(parent, id, pos, size, style, validator, name);
     }


@@ -76,7 +84,7 @@ public:
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,

-                 const wxString &name = "listctrl" );
+                 const wxString &name = wxT("listctrl") );

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


@@ -114,9 +122,9 @@ public:
     void SetWindowStyleFlag( long style );
     void RecreateWindow() {}
     long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
     void SetWindowStyleFlag( long style );
     void RecreateWindow() {}
     long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;

-    wxGenericImageList *GetImageList( int which ) const;
-    void SetImageList( wxGenericImageList *imageList, int which );
-    void AssignImageList( wxGenericImageList *imageList, int which );
+    wxImageListType *GetImageList( int which ) const;
+    void SetImageList( wxImageListType *imageList, int which );
+    void AssignImageList( wxImageListType *imageList, int which );

     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
 
     void ClearAll();
     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
 
     void ClearAll();


@@ -140,8 +148,8 @@ public:
     long InsertItem( long index, int imageIndex );
     long InsertItem( long index, const wxString& label, int imageIndex );
     long InsertColumn( long col, wxListItem& info );
     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 );
+    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, long data );
     bool Update( long item );
     bool ScrollList( int dx, int dy );
     bool SortItems( wxListCtrlCompare fn, long data );
     bool Update( long item );


@@ -156,10 +164,12 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    void OnIdle( wxIdleEvent &event );
+    void OnInternalIdle( );

     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions
     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions

+    virtual void Refresh(bool eraseBackground = TRUE,
+                         const wxRect *rect = NULL);

 
     virtual void Freeze();
     virtual void Thaw();
 
     virtual void Freeze();
     virtual void Thaw();


@@ -183,9 +193,9 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    wxGenericImageList         *m_imageListNormal;
-    wxGenericImageList         *m_imageListSmall;
-    wxGenericImageList         *m_imageListState;  // what's that ?
+    wxImageListType         *m_imageListNormal;
+    wxImageListType         *m_imageListSmall;
+    wxImageListType         *m_imageListState;  // what's that ?

     bool                 m_ownsImageListNormal,
                          m_ownsImageListSmall,
                          m_ownsImageListState;
     bool                 m_ownsImageListNormal,
                          m_ownsImageListSmall,
                          m_ownsImageListState;


@@ -238,7 +248,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator &validator = wxDefaultValidator,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator &validator = wxDefaultValidator,

-               const wxString &name = "listctrl" )
+               const wxString &name = wxT("listctrl") )

     : wxGenericListCtrl(parent, id, pos, size, style, validator, name)
     {
     }
     : wxGenericListCtrl(parent, id, pos, size, style, validator, name)
     {
     }