From 079cc3b670fb1f68f56c71078afd9af765b43512 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 2 Feb 2004 23:09:40 +0000 Subject: [PATCH] * GetValue() now returns true if the state is undetermined * Commented out some assertions that are handled in the base class git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/checkbox.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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; } } -- 2.45.2