X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52f2ad0899c3e625b6ae1449524993ed8be39d7a..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index 9c289e604c..51aca4a1b1 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.12.99 -// RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -12,10 +11,6 @@ #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 @@ -26,14 +21,16 @@ // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxListCtrlNameStr; +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 @@ -42,7 +39,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListCtrlNameStr; // wxListView: a class which provides a better API for list control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListView : public wxListCtrl +class WXDLLIMPEXP_CORE wxListView : public wxListCtrl { public: wxListView() { } @@ -86,7 +83,7 @@ public: { return GetNextSelected(-1); } // return true if the item is selected - bool IsSelected(long index) + bool IsSelected(long index) const { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; } // columns