X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e81a301cbdc8729b0a71fa5dfd7124bf59368673..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index 7914d43ca4..ccf2a0548f 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -5,27 +5,33 @@ // 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_ -#ifdef __GNUG__ - #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" +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; + // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration // ---------------------------------------------------------------------------- #if defined(__WIN32__) && !defined(__WXUNIVERSAL__) #include "wx/msw/listctrl.h" +#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON + #include "wx/osx/listctrl.h" #else #include "wx/generic/listctrl.h" #endif @@ -34,26 +40,26 @@ // wxListView: a class which provides a better API for list control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListView : public wxListCtrl +class WXDLLIMPEXP_CORE wxListView : public wxListCtrl { 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 wxString &name = "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 - void Select(long n, bool on = TRUE) + void Select(long n, bool on = true) { SetItemState(n, on ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED); } @@ -77,8 +83,8 @@ public: 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 @@ -95,7 +101,7 @@ public: void ClearColumnImage(int col) { SetColumnImage(col, -1); } private: - DECLARE_DYNAMIC_CLASS(wxListView) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxListView) }; #endif // wxUSE_LISTCTRL