X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..0cd4552a99bfc8a51a676ee49f1d50ce64f0714b:/src/osx/button_osx.cpp diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp index 526e3a6522..3dc35b6975 100644 --- a/src/osx/button_osx.cpp +++ b/src/osx/button_osx.cpp @@ -35,7 +35,7 @@ bool wxButton::Create(wxWindow *parent, const wxString& name) { wxString label(lbl); - if (label.empty() && wxIsStockID(id)) + if (label.empty() && wxIsStockID(id) && !(id == wxID_HELP)) label = wxGetStockLabel(id); m_macIsUserPane = false ; @@ -66,13 +66,13 @@ wxWindow *wxButton::SetDefault() return btnOldDefault; } -void wxButton::Command (wxCommandEvent & event) +void wxButton::Command (wxCommandEvent & WXUNUSED(event)) { m_peer->PerformClick() ; // ProcessCommand(event); } -bool wxButton::HandleClicked( double timestampsec ) +bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); event.SetEventObject(this); @@ -111,7 +111,7 @@ bool wxDisclosureTriangle::IsOpen() const return m_peer->GetValue() == 1; } -bool wxDisclosureTriangle::HandleClicked( double timestampsec ) +bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) ) { // Just emit button event for now wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); @@ -123,6 +123,6 @@ bool wxDisclosureTriangle::HandleClicked( double timestampsec ) wxSize wxDisclosureTriangle::DoGetBestSize() const { - return wxSize(16,16); + return wxWindow::DoGetBestSize(); }