projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxEXEC_NOHIDE flag, modified wxExecute() to take a combination of bit flags...
[wxWidgets.git]
/
src
/
mac
/
carbon
/
checkbox.cpp
diff --git
a/src/mac/carbon/checkbox.cpp
b/src/mac/carbon/checkbox.cpp
index f3eb8eca635db5077488bc79d1bd6ce90e0bd374..85ebcf23914b7798f8ea1db62183f8f38983581c 100644
(file)
--- a/
src/mac/carbon/checkbox.cpp
+++ b/
src/mac/carbon/checkbox.cpp
@@
-13,6
+13,8
@@
#pragma implementation "checkbox.h"
#endif
#pragma implementation "checkbox.h"
#endif
+#include "wx/defs.h"
+
#include "wx/checkbox.h"
#if !USE_SHARED_LIBRARY
#include "wx/checkbox.h"
#if !USE_SHARED_LIBRARY
@@
-20,7
+22,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
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,
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
@@
-34,7
+36,7
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl =
UMANewControl( parent->GetMacRootWindow(
) , &bounds , title , false , 0 , 0 , 1,
+ m_macControl =
::NewControl( MAC_WXHWND(parent->MacGetRootWindow()
) , &bounds , title , false , 0 , 0 , 1,
kControlCheckBoxProc , (long) this ) ;
MacPostControlCreate() ;
kControlCheckBoxProc , (long) this ) ;
MacPostControlCreate() ;
@@
-44,12
+46,13
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
void wxCheckBox::SetValue(bool val)
{
void wxCheckBox::SetValue(bool val)
{
- ::SetControlValue( m_macControl , val ) ;
+ ::SetControlValue( (ControlHandle) m_macControl , val ) ;
+ MacRedrawControl() ;
}
bool wxCheckBox::GetValue() const
{
}
bool wxCheckBox::GetValue() const
{
- return ::GetControlValue( m_macControl ) ;
+ return ::GetControlValue(
(ControlHandle)
m_macControl ) ;
}
void wxCheckBox::Command (wxCommandEvent & event)
}
void wxCheckBox::Command (wxCommandEvent & event)
@@
-58,7
+61,7
@@
void wxCheckBox::Command (wxCommandEvent & event)
ProcessCommand (event);
}
ProcessCommand (event);
}
-void wxCheckBox::MacHandleControlClick(
ControlHandle control , S
Int16 controlpart )
+void wxCheckBox::MacHandleControlClick(
WXWidget control , wx
Int16 controlpart )
{
SetValue( !GetValue() ) ;
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
{
SetValue( !GetValue() ) ;
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );