X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/027d45e8fc3cbb7a1efa91c727bcee6c52c4519c..24377c46813426a325a209c45bbca0a9e8da054b:/src/mac/carbon/treectrl.cpp diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp index 164b37af75..82a90b0854 100644 --- a/src/mac/carbon/treectrl.cpp +++ b/src/mac/carbon/treectrl.cpp @@ -29,14 +29,17 @@ wxTreeCtrl::wxTreeCtrl() bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name) + long style, const wxValidator& wxVALIDATOR_PARAM(validator), + const wxString& name) { m_imageListNormal = NULL; m_imageListState = NULL; m_textCtrl = NULL; SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); +#endif SetParent(parent); m_windowStyle = style; @@ -305,13 +308,13 @@ bool wxTreeCtrl::ExpandItem(long item, int action) bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDING : wxEVT_COMMAND_TREE_ITEM_COLLAPSING); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); event.SetEventType( bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDED : wxEVT_COMMAND_TREE_ITEM_COLLAPSED); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } return bOk;