X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4eb5a0ec0421b3dba1c46c1dcb27a711af4bec36..9914bfbb77f48baf869b63aff58feb2b145ff4d3:/src/osx/tglbtn_osx.cpp diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp index 7ba448c991..a6ec679141 100644 --- a/src/osx/tglbtn_osx.cpp +++ b/src/osx/tglbtn_osx.cpp @@ -24,14 +24,14 @@ #include "wx/tglbtn.h" #include "wx/osx/private.h" -#include "wx/bmpbuttn.h" // for wxDEFAULT_BUTTON_MARGIN +#include "wx/bmpbuttn.h" // for wxDEFAULT_BUTTON_MARGIN // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl) -wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); // ============================================================================ // implementation @@ -48,26 +48,26 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, const wxString& name) { m_macIsUserPane = FALSE ; - + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; - + m_labelOrig = m_label = label ; m_peer = wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ; MacPostControlCreate(pos,size) ; - + return TRUE; } wxSize wxToggleButton::DoGetBestSize() const { - int wBtn = 70 ; + int wBtn = 70 ; int hBtn = 20 ; int lBtn = m_label.Length() * 8 + 12 ; - if (lBtn > wBtn) + if (lBtn > wBtn) wBtn = lBtn; return wxSize ( wBtn , hBtn ) ; @@ -89,7 +89,7 @@ void wxToggleButton::Command(wxCommandEvent & event) ProcessCommand(event); } -bool wxToggleButton::OSXHandleClicked( double timestampsec ) +bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); event.SetInt(GetValue()); @@ -112,19 +112,19 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, const wxString& name) { m_macIsUserPane = FALSE ; - + m_bitmap = label; - + m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; - + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; - + m_peer = wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ; MacPostControlCreate(pos,size) ; - + return TRUE; } @@ -156,7 +156,7 @@ void wxBitmapToggleButton::Command(wxCommandEvent & event) ProcessCommand(event); } -bool wxBitmapToggleButton::OSXHandleClicked( double timestampsec ) +bool wxBitmapToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); event.SetInt(GetValue());