X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/473d6885debfa318e1e955195242e3aa5a33a83d..1e04d2bf54dcb336e20a27e906dcebdca368790b:/include/wx/generic/listctrl.h diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 47e28583d7..1ecb908b33 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -20,11 +20,6 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; class WXDLLIMPEXP_FWD_CORE wxDropTarget; #endif -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - - //----------------------------------------------------------------------------- // internal classes //----------------------------------------------------------------------------- @@ -45,21 +40,21 @@ public: { Init(); } - + wxGenericListCtrl( wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr) + const wxString &name = wxListCtrlNameStr) : wxScrollHelper(this) { Create(parent, winid, pos, size, style, validator, name); } - + virtual ~wxGenericListCtrl(); - + void Init(); bool Create( wxWindow *parent, @@ -249,8 +244,9 @@ private: // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through -#ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); +#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__) + virtual WXLRESULT + MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); #endif // __WXMSW__ WX_FORWARD_TO_SCROLL_HELPER() @@ -281,7 +277,7 @@ public: : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) { } - + }; #endif // !__WXMSW__ || __WXUNIVERSAL__