projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear the frame statusbar when the mouse leaves the toolbar or enters a tool without...
[wxWidgets.git]
/
src
/
mac
/
radiobut.cpp
diff --git
a/src/mac/radiobut.cpp
b/src/mac/radiobut.cpp
index 196fed3a4bf6b4b3ab7ddb387056c99bdb510770..0d060bdb956755cb2ac482a3fdef6e435153d28b 100644
(file)
--- a/
src/mac/radiobut.cpp
+++ b/
src/mac/radiobut.cpp
@@
-35,7
+35,7
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
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,
kControlRadioButtonProc , (long) this ) ;
MacPostControlCreate() ;
kControlRadioButtonProc , (long) this ) ;
MacPostControlCreate() ;
@@
-70,10
+70,10
@@
void wxRadioButton::SetValue(bool val)
{
int i;
wxRadioButton *cycle;
{
int i;
wxRadioButton *cycle;
- if ( GetControlValue( m_macControl ) == val )
+ if ( GetControlValue(
(ControlHandle)
m_macControl ) == val )
return ;
return ;
- ::SetControlValue( m_macControl , val ) ;
+ ::SetControlValue(
(ControlHandle)
m_macControl , val ) ;
if (val)
{
cycle=this->NextInCycle();
if (val)
{
cycle=this->NextInCycle();
@@
-84,11
+84,12
@@
void wxRadioButton::SetValue(bool val)
}
}
}
}
}
}
+ MacRedrawControl() ;
}
bool wxRadioButton::GetValue() const
{
}
bool wxRadioButton::GetValue() const
{
- return ::GetControlValue( m_macControl ) ;
+ return ::GetControlValue(
(ControlHandle)
m_macControl ) ;
}
void wxRadioButton::Command (wxCommandEvent & event)
}
void wxRadioButton::Command (wxCommandEvent & event)
@@
-97,7
+98,7
@@
void wxRadioButton::Command (wxCommandEvent & event)
ProcessCommand (event);
}
ProcessCommand (event);
}
-void wxRadioButton::MacHandleControlClick(
ControlHandle control , S
Int16 controlpart )
+void wxRadioButton::MacHandleControlClick(
WXWidget control , wx
Int16 controlpart )
{
if ( GetValue() )
return ;
{
if ( GetValue() )
return ;