/////////////////////////////////////////////////////////////////////////////
-// Name: checkbox.cpp
+// Name: src/mac/carbon/checkbox.cpp
// Purpose: wxCheckBox
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
+#include "wx/wxprec.h"
-#include "wx/defs.h"
+#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
+#include "wx/mac/uma.h"
+
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif
-#include "wx/mac/uma.h"
-
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
// Single check box item
-bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
- const wxPoint& pos,
- const wxSize& size, long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxCheckBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& label,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
+ m_macIsUserPane = false ;
+
if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
return false;
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
+ m_labelOrig = m_label = label ;
- 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 ) ;
-
- MacPostControlCreate() ;
+ 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() ) );
- return TRUE;
+ m_peer->SetMaximum( maxValue ) ;
+
+ MacPostControlCreate(pos, size) ;
+
+ return true;
}
void wxCheckBox::SetValue(bool val)
{
if (val)
- {
Set3StateValue(wxCHK_CHECKED);
- }
else
- {
Set3StateValue(wxCHK_UNCHECKED);
- }
}
bool wxCheckBox::GetValue() const
return (DoGet3StateValue() != 0);
}
-void wxCheckBox::Command (wxCommandEvent & event)
+void wxCheckBox::Command(wxCommandEvent & event)
{
int state = event.GetInt();
|| (state == wxCHK_UNDETERMINED),
wxT("event.GetInt() returned an invalid checkbox state") );
- Set3StateValue((wxCheckBoxState) state);
+ Set3StateValue((wxCheckBoxState)state);
ProcessCommand(event);
}
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();
+ wxCheckBoxState origState, newState;
- if (state == wxCHK_UNCHECKED)
- {
- state = wxCHK_CHECKED;
- }
- else if (state == wxCHK_CHECKED)
+ newState = origState = Get3StateValue();
+
+ switch (origState)
{
- // 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.
- if ( Is3rdStateAllowedForUser() )
- {
- state = wxCHK_UNDETERMINED;
- }
- else
- {
- state = wxCHK_UNCHECKED;
- }
+ 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;
}
- else if (state == wxCHK_UNDETERMINED)
+
+ if (newState != origState)
{
- state = wxCHK_UNCHECKED;
+ Set3StateValue( newState );
+
+ wxCommandEvent event( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+ event.SetInt( newState );
+ event.SetEventObject( this );
+ ProcessCommand( event );
}
- Set3StateValue(state);
- event.SetInt(state);
- event.SetEventObject(this);
- ProcessCommand(event);
+ return noErr;
}
// Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
- const wxBitmap *label,
- const wxPoint& pos,
- const wxSize& size, long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxBitmapCheckBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxBitmap *WXUNUSED(label),
+ const wxPoint& WXUNUSED(pos),
+ const wxSize& WXUNUSED(size),
+ long style,
+ const wxValidator& wxVALIDATOR_PARAM(validator),
+ const wxString& name)
{
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif
m_windowStyle = style;
- if (parent) parent->AddChild(this);
+ if (parent)
+ parent->AddChild(this);
if ( id == -1 )
m_windowId = NewControlId();
// TODO: Create the bitmap checkbox
- return FALSE;
+ return false;
}
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap))
{
// TODO
wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));
wxControl::SetSize( x , y , width , height , sizeFlags ) ;
}
-void wxBitmapCheckBox::SetValue(bool val)
+void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))
{
// TODO
wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented"));
{
// TODO
wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));
- return FALSE;
-}
+ return false;
+}
+#endif