X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..f29fe16932ede752589ef9ed34a757342387932f:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index a89000e868..86f7d56b01 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -12,7 +12,7 @@ #ifndef _WX_LISTCTRL_H_BASE_ #define _WX_LISTCTRL_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "listctrlbase.h" #endif @@ -39,14 +39,14 @@ class WXDLLEXPORT wxListView : public wxListCtrl public: wxListView() { } wxListView( wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_REPORT, const wxValidator& validator = wxDefaultValidator, - const wxString &name = "listctrl" ) + const wxString &name = wxT("listctrl") ) { - Create(parent, id, pos, size, style, validator, name); + Create(parent, winid, pos, size, style, validator, name); } // focus/selection stuff @@ -95,7 +95,7 @@ public: void ClearColumnImage(int col) { SetColumnImage(col, -1); } private: - DECLARE_DYNAMIC_CLASS(wxListView) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxListView) }; #endif // wxUSE_LISTCTRL