// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "checkbox.h"
#endif
-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif
#include "wx/mac/uma.h"
const wxValidator& validator,
const wxString& name)
{
+ m_macIsUserPane = FALSE ;
+
if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
return false;
- m_style = style;
+ m_label = label ;
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
-
- SInt16 maxValue = 1 /* kControlCheckboxCheckedValue */;
+ SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
if (style & wxCHK_3STATE)
- {
maxValue = 2 /* kControlCheckboxMixedValue */;
- }
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , maxValue,
- kControlCheckBoxProc , (long) this ) ;
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ m_peer = new wxMacControl(this) ;
+ verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
+ CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
+
+ m_peer->SetMaximum( maxValue ) ;
- MacPostControlCreate() ;
+ MacPostControlCreate(pos,size) ;
return TRUE;
}
wxCheckBoxState wxCheckBox::DoGet3StateValue() const
{
- return (wxCheckBoxState) ::GetControl32BitValue( (ControlHandle) m_macControl );
+ return (wxCheckBoxState) m_peer->GetValue() ;
}
void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
{
- ::SetControl32BitValue( (ControlHandle) m_macControl , (int) val) ;
- MacRedrawControl() ;
+ m_peer->SetValue( val ) ;
}
-void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown) )
+wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
wxCheckBoxState state = Get3StateValue();
{
state = wxCHK_UNCHECKED;
}
- Set3StateValue(state);
+ Set3StateValue(state);
event.SetInt(state);
event.SetEventObject(this);
ProcessCommand(event);
+
+ return noErr ;
}
// Bitmap checkbox
return FALSE;
}
-
+#endif