X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..465eba14839fd5c8752d0642f77d525a3407ebca:/src/osx/choice_osx.cpp diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp index 1481b1419c..d9b3932dee 100644 --- a/src/osx/choice_osx.cpp +++ b/src/osx/choice_osx.cpp @@ -169,12 +169,12 @@ void wxChoice::DoClear() // ---------------------------------------------------------------------------- int wxChoice::GetSelection() const { - return m_peer->GetValue() ; + return m_peer->GetValue(); } void wxChoice::SetSelection( int n ) { - m_peer->SetValue( n ) ; + m_peer->SetValue( n ); } // ---------------------------------------------------------------------------- @@ -230,7 +230,7 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const return (void *)m_datas[n]; } -bool wxChoice::HandleClicked( double timestampsec ) +bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); @@ -241,7 +241,7 @@ bool wxChoice::HandleClicked( double timestampsec ) event.SetInt( n ); event.SetString( GetStringSelection() ); event.SetEventObject( this ); - + if ( HasClientObjectData() ) event.SetClientObject( GetClientObject( n ) ); else if ( HasClientUntypedData() ) @@ -280,7 +280,6 @@ wxSize wxChoice::DoGetBestSize() const wxCoord width, height ; dc.GetTextExtent( wxT("X"), &width, &height); int cx = width ; - lbHeight += 4; lbWidth += cx ; }