X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f7b69e22002543877b0949b66ac3995a615780c..efe66bbc0e9f463a6dd3ad49717474dd801bebf3:/src/cocoa/checkbox.mm diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm index 8fe756b40d..659025be55 100644 --- a/src/cocoa/checkbox.mm +++ b/src/cocoa/checkbox.mm @@ -75,7 +75,8 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) cocoaState = NSOnState; break; case wxCHK_UNDETERMINED: - wxASSERT_MSG(Is3State(),"Use the wxCHK_3STATE style flag"); + // Base class would have already set state to wxCHK_UNCHECKED +// wxASSERT_MSG(Is3State(),"Use the wxCHK_3STATE style flag"); cocoaState = NSMixedState; break; default: @@ -90,7 +91,7 @@ bool wxCheckBox::GetValue() const int state = [GetNSButton() state]; wxASSERT_MSG(state!=NSMixedState || Is3State(), wxT("NSMixedState returned from a 2-state checkbox")); - return state==NSOnState; + return state!=NSOffState; } wxCheckBoxState wxCheckBox::DoGet3StateValue() const @@ -104,7 +105,8 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const default: wxFAIL_MSG(wxT("[NSButton -state] returned an invalid state!")); case NSMixedState: - wxASSERT_MSG(Is3State(),wxT("NSMixedState returned from a 2-state checkbox")); + // Base class handles this assertion for us +// wxASSERT_MSG(Is3State(),wxT("NSMixedState returned from a 2-state checkbox")); return wxCHK_UNDETERMINED; } }