1. applied (heavily modified) patch for reading CUR files by Chris

[wxWidgets.git] / src / mac / carbon / checkbox.cpp

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index aa589bd32db9d517554e6c59f95c79e9f9bbe3e3..d6d532e5388f85f7f4e91389c9b04cc0567bd78f 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -13,12 +13,16 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/checkbox.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+#endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
@@ -32,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlCheckBoxProc , (long) this ) ;
        
        MacPostControlCreate() ;
@@ -43,6 +47,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 void wxCheckBox::SetValue(bool val)
 {
    ::SetControlValue( m_macControl , val ) ;
+   MacRedrawControl() ;
 }
 
 bool wxCheckBox::GetValue() const
@@ -59,6 +64,10 @@ void wxCheckBox::Command (wxCommandEvent & event)
 void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
        SetValue( !GetValue() ) ;
+    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    ProcessCommand(event);
 }
 
 // Bitmap checkbox