X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c51a665c649f7579fb39e62070cef4f66b3210d..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/propgrid/props.h?ds=sidebyside diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 66d625a24d..99c279f7a8 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -564,7 +564,7 @@ public: // helpers size_t GetItemCount() const { return m_choices.GetCount(); } const wxString& GetLabel( size_t ind ) const - { return m_choices.GetLabel(ind); } + { return m_choices.GetLabel(static_cast(ind)); } protected: // Used to detect if choices have been changed @@ -838,7 +838,7 @@ PROPNAME::~PROPNAME() { } \ bool PROPNAME::OnEvent( wxPropertyGrid* propgrid, \ wxWindow* primary, wxEvent& event ) \ { \ - if ( event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED ) \ + if ( event.GetEventType() == wxEVT_BUTTON ) \ return OnButtonClick(propgrid,primary,(const wxChar*) CUSTBUTTXT); \ return false; \ }