X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/467e3168b33200bf6d62317294799363ed7dd50e..987263fe1974dac46a38d6d623557ccf89a25992:/src/mac/checkbox.cpp diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index b595c99c7a..3df5c00d9e 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: checkbox.cpp // Purpose: wxCheckBox -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -31,15 +31,18 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxValidator& validator, const wxString& name) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; + if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) ) + return false; - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, - kControlCheckBoxProc , (long) this ) ; - - MacPostControlCreate() ; + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + kControlCheckBoxProc , (long) this ) ; + + MacPostControlCreate() ; return TRUE; } @@ -61,9 +64,9 @@ void wxCheckBox::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUNUSED(controlpart) ) +void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown) ) { - SetValue( !GetValue() ) ; + SetValue( !GetValue() ) ; wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId ); event.SetInt(GetValue()); event.SetEventObject(this);