Wrappers for *ToText

[wxWidgets.git] / src / cocoa / checkbox.mm

diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm
index 8fe756b40d0d8e3b3702c26ec7979bb4386ac3d1..07f7332b90507ca3c3fb1e8438dd4093d43acd38 100644 (file)
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -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,14 +105,15 @@ 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;
     }
 }
 
 void wxCheckBox::Cocoa_wxNSButtonAction(void)
 {
-    wxLogDebug(wxT("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