copy item text for app menu items from wx menus

[wxWidgets.git] / src / osx / checkbox_osx.cpp

diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 0e224f15d74b19bdc6bce4c96f8097121cd76bb2..3a7283396173620966edd95d658307ae49493628 100644 (file)
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/checkbox.cpp
+// Name:        src/osx/carbon/checkbox.cpp

 // Purpose:     wxCheckBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // Purpose:     wxCheckBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id: checkbox.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,7 +16,6 @@
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item


@@ -36,6 +35,7 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     m_labelOrig = m_label = label ;
 
 
     m_labelOrig = m_label = label ;
 

+    WXValidateStyle( &style );

     m_peer = wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos, size) ;
     m_peer = wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos, size) ;


@@ -80,33 +80,41 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
     m_peer->SetValue( val ) ;
 }
 
     m_peer->SetValue( val ) ;
 }
 

-bool wxCheckBox::HandleClicked( double timestampsec ) 
+bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
 {

-    wxCheckBoxState origState, newState;
+    bool sendEvent = true;
+    wxCheckBoxState newState = Get3StateValue();

 
 

-    newState = origState = Get3StateValue();
-
-    switch (origState)
+    if ( !m_peer->ButtonClickDidStateChange() )

     {
     {

-        case wxCHK_UNCHECKED:
-            newState = wxCHK_CHECKED;
-            break;
-
-        case wxCHK_CHECKED:
-            // If the style flag to allow the user setting the undetermined state is set,
-            // then set the state to undetermined; otherwise set state to unchecked.
-            newState = Is3rdStateAllowedForUser() ? wxCHK_UNDETERMINED : wxCHK_UNCHECKED;
-            break;
-
-        case wxCHK_UNDETERMINED:
-            newState = wxCHK_UNCHECKED;
-            break;
-
-        default:
-            break;
+        wxCheckBoxState origState ;
+
+        newState = origState = Get3StateValue();
+
+        switch (origState)
+        {
+            case wxCHK_UNCHECKED:
+                newState = wxCHK_CHECKED;
+                break;
+
+            case wxCHK_CHECKED:
+                // If the style flag to allow the user setting the undetermined state is set,
+                // then set the state to undetermined; otherwise set state to unchecked.
+                newState = Is3rdStateAllowedForUser() ? wxCHK_UNDETERMINED : wxCHK_UNCHECKED;
+                break;
+
+            case wxCHK_UNDETERMINED:
+                newState = wxCHK_UNCHECKED;
+                break;
+
+            default:
+                break;
+        }
+        if (newState == origState)
+            sendEvent = false;

     }
 
     }
 

-    if (newState != origState)
+    if (sendEvent)

     {
         Set3StateValue( newState );
 
     {
         Set3StateValue( newState );