X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/570aaadf1ff3f8c3f8ecfea44dbeae64532c82c4..5a1e0e91a1ca5ec98b0eeb335cda757d1261ed08:/src/cocoa/checkbox.mm diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm index 71fb5d4dc4..c17d1152fc 100644 --- a/src/cocoa/checkbox.mm +++ b/src/cocoa/checkbox.mm @@ -1,17 +1,27 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/checkbox.mm +// Name: src/cocoa/checkbox.mm // Purpose: wxCheckBox // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" +#include "wx/wxprec.h" + +#if wxUSE_CHECKBOX + #include "wx/checkbox.h" -#include "wx/log.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif //WX_PRECOMP + +#include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import #import @@ -29,37 +39,115 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID winid, const wxValidator& validator, const wxString& name) { + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; m_cocoaNSView = NULL; - NSRect cocoaRect = NSMakeRect(10,10,20,20); - SetNSButton([[NSButton alloc] initWithFrame: cocoaRect]); + SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; [GetNSButton() setButtonType: NSSwitchButton]; - [GetNSButton() setTitle:[NSString stringWithCString: label.c_str()]]; + [GetNSButton() setAllowsMixedState: Is3State()]; + [GetNSButton() setTitle:wxNSStringWithWxString(GetLabelText(label))]; [GetNSControl() sizeToFit]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); + return true; } wxCheckBox::~wxCheckBox() { - DisassociateNSButton(m_cocoaNSView); + DisassociateNSButton(GetNSButton()); } -void wxCheckBox::SetValue(bool) +void wxCheckBox::SetValue(bool value) { + [GetNSButton() setState: value?NSOnState:NSOffState]; +} + +void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) +{ + int cocoaState; + switch(state) + { + case wxCHK_UNCHECKED: + cocoaState = NSOffState; + break; + case wxCHK_CHECKED: + cocoaState = NSOnState; + break; + case wxCHK_UNDETERMINED: + // Base class would have already set state to wxCHK_UNCHECKED +// wxASSERT_MSG(Is3State(),"Use the wxCHK_3STATE style flag"); + cocoaState = NSMixedState; + break; + default: + wxFAIL_MSG(wxT("Invalid state in wxCheckBox::DoSet3StateValue")); + return; + } + [GetNSButton() setState:cocoaState]; } bool wxCheckBox::GetValue() const { - return false; + int state = [GetNSButton() state]; + wxASSERT_MSG(state!=NSMixedState || Is3State(), + wxT("NSMixedState returned from a 2-state checkbox")); + return state!=NSOffState; +} + +wxCheckBoxState wxCheckBox::DoGet3StateValue() const +{ + switch([GetNSButton() state]) + { + case NSOffState: + return wxCHK_UNCHECKED; + case NSOnState: + return wxCHK_CHECKED; + default: + wxFAIL_MSG(wxT("[NSButton -state] returned an invalid state!")); + case NSMixedState: + // Base class handles this assertion for us +// wxASSERT_MSG(Is3State(),wxT("NSMixedState returned from a 2-state checkbox")); + return wxCHK_UNDETERMINED; + } } void wxCheckBox::Cocoa_wxNSButtonAction(void) { - wxLogDebug("Checkbox"); + wxLogTrace(wxTRACE_COCOA,wxT("Checkbox")); + // What we really want to do is override [NSCell -nextState] to return + // NSOnState in lieu of NSMixedState but this works (aside from the + // very slightly noticeable drawing of - and then a check) -DE + + // Cocoa always allows a 3-state button to transition into + // the mixed/undetermined state by clicking, we don't + if ( !Is3rdStateAllowedForUser() + && [GetNSButton() state] == NSMixedState ) + { + // Cocoa's sequence is on/off/mixed + // skip mixed, go right back to on + [GetNSButton() setState: NSOnState]; + } + wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId()); + InitCommandEvent(event); // event.SetEventObject(this); + event.SetInt(Get3StateValue()); + Command(event); +} + +void wxCheckBox::SetLabel(const wxString& s) +{ + wxAutoNSAutoreleasePool pool; + [GetNSButton() setTitle:wxNSStringWithWxString(s)]; +} + +wxString wxCheckBox::GetLabel() const +{ + wxAutoNSAutoreleasePool pool; + return wxStringWithNSString([GetNSButton() title]); + } +#endif // wxUSE_CHECKBOX