X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/045c57efc3c2358eaf3781d9e0b33f7f2e4a036b..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/listctrl.h?ds=inline diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index e52e869167..de43556b2c 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -12,22 +12,26 @@ #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" +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; + // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration // ---------------------------------------------------------------------------- -#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !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 @@ -36,17 +40,17 @@ // 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 winid = -1, + wxWindowID winid = wxID_ANY, 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, winid, pos, size, style, validator, name); } @@ -55,7 +59,7 @@ public: // --------------------- // [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); } @@ -79,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