projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxGetMultiChoice() (which refuses to work for some reason - will fix
[wxWidgets.git]
/
src
/
mac
/
checkbox.cpp
diff --git
a/src/mac/checkbox.cpp
b/src/mac/checkbox.cpp
index dd2e2abe7ab8f644876b4e370b3ce0e77961ef75..c3d4ce9709f224f7356a82070aa006f3d1e27c50 100644
(file)
--- a/
src/mac/checkbox.cpp
+++ b/
src/mac/checkbox.cpp
@@
-20,6
+20,8
@@
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
+#include <wx/mac/uma.h>
+
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
@@
-27,41
+29,27
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxValidator& validator,
const wxString& name)
{
const wxValidator& validator,
const wxString& name)
{
- SetName(name);
- SetValidator(validator);
- m_windowStyle = style;
-
- if (parent) parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = NewControlId();
- else
- m_windowId = id;
+ Rect bounds ;
+ Str255 title ;
+
+ MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
- // TODO: create checkbox
+ m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1,
+ kControlCheckBoxProc , (long) this ) ;
+
+ MacPostControlCreate() ;
- return FALSE;
-}
-
-void wxCheckBox::SetLabel(const wxString& label)
-{
- // TODO
-}
-
-void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- // TODO
+ return TRUE;
}
void wxCheckBox::SetValue(bool val)
{
}
void wxCheckBox::SetValue(bool val)
{
- // TODO
+ ::SetControlValue( m_macControl , val ) ;
}
bool wxCheckBox::GetValue() const
{
}
bool wxCheckBox::GetValue() const
{
- // TODO
- return FALSE;
+ return ::GetControlValue( m_macControl ) ;
}
void wxCheckBox::Command (wxCommandEvent & event)
}
void wxCheckBox::Command (wxCommandEvent & event)
@@
-70,6
+58,15
@@
void wxCheckBox::Command (wxCommandEvent & event)
ProcessCommand (event);
}
ProcessCommand (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
bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos,
// Bitmap checkbox
bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos,
@@
-100,7
+97,7
@@
void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
- // TODO
+ wxControl::SetSize( x , y , width , height , sizeFlags ) ;
}
void wxBitmapCheckBox::SetValue(bool val)
}
void wxBitmapCheckBox::SetValue(bool val)