Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* GetValue() now returns true if the state is undetermined

Browse Source 
* 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
This commit is contained in:
David Elliott
2004-02-02 23:09:40 +00:00
parent d8910e4579
commit 079cc3b670
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cocoa/checkbox.mm
View File

@@ -75,7 +75,8 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
cocoaState = NSOnState; cocoaState = NSOnState;
break; break;
case wxCHK_UNDETERMINED: 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; cocoaState = NSMixedState;
break; break;
default: default:
@@ -90,7 +91,7 @@ bool wxCheckBox::GetValue() const
int state = [GetNSButton() state]; int state = [GetNSButton() state];
wxASSERT_MSG(state!=NSMixedState || Is3State(), wxASSERT_MSG(state!=NSMixedState || Is3State(),
wxT("NSMixedState returned from a 2-state checkbox")); wxT("NSMixedState returned from a 2-state checkbox"));
return state==NSOnState; return state!=NSOffState;
} }
wxCheckBoxState wxCheckBox::DoGet3StateValue() const wxCheckBoxState wxCheckBox::DoGet3StateValue() const
@@ -104,7 +105,8 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const
default: default:
wxFAIL_MSG(wxT("[NSButton -state] returned an invalid state!")); wxFAIL_MSG(wxT("[NSButton -state] returned an invalid state!"));
case NSMixedState: 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; return wxCHK_UNDETERMINED;
} }
} }