X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b38e2a022d97b2afae69cb5f322f96a6a0140f3..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/treectrl.cpp?ds=sidebyside diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp index 729d535a9e..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; @@ -57,7 +60,7 @@ wxTreeCtrl::~wxTreeCtrl() } // Attributes -size_t wxTreeCtrl::GetCount() const +unsigned int wxTreeCtrl::GetCount() const { // TODO return 0; @@ -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;