X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..0fb731b8bf830e2b495b2038200ab1d2444d748d:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index fbf05abb9c..ccf2a0548f 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -12,10 +12,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,7 +22,7 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration @@ -34,6 +30,8 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr; #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 @@ -42,7 +40,7 @@ extern WXDLLEXPORT_DATA(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 +84,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