include wx/object.h now that wxConfigBase derives from wxObject

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 445e448c662c6baac57a0e4cc4b24a0d642d0299..f8385b6ab58216768232a3b64d74b521912167ca 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -5,27 +5,33 @@
 // Modified by:
 // Created:     04.12.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04.12.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listctrlbase.h"
-#endif
+#include "wx/defs.h" // headers should include this before first wxUSE_XXX check

 
 #if wxUSE_LISTCTRL
 
 #include "wx/listbase.h"
 
 
 #if wxUSE_LISTCTRL
 
 #include "wx/listbase.h"
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
+

 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/carbon/listctrl.h"

 #else
     #include "wx/generic/listctrl.h"
 #endif
 #else
     #include "wx/generic/listctrl.h"
 #endif


@@ -39,21 +45,21 @@ class WXDLLEXPORT wxListView : public wxListCtrl
 public:
     wxListView() { }
     wxListView( wxWindow *parent,
 public:
     wxListView() { }
     wxListView( wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID winid = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,

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

     {
     {

-        Create(parent, id, pos, size, style, validator, name);
+        Create(parent, winid, pos, size, style, validator, name);

     }
 
     // focus/selection stuff
     // ---------------------
 
     // [de]select an item
     }
 
     // focus/selection stuff
     // ---------------------
 
     // [de]select an item

-    void Select(long n, bool on = TRUE)
+    void Select(long n, bool on = true)

     {
         SetItemState(n, on ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED);
     }
     {
         SetItemState(n, on ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED);
     }


@@ -77,8 +83,8 @@ public:
     long GetFirstSelected() const
         { return GetNextSelected(-1); }
 
     long GetFirstSelected() const
         { return GetNextSelected(-1); }
 

-    // return TRUE if the item is selected
-    bool IsSelected(long index)
+    // return true if the item is selected
+    bool IsSelected(long index) const

         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns
         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns