Implement wxRB_GROUP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3e968053fb
commit
079c842cae
@ -22,8 +22,6 @@ WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
|
||||
|
||||
class WXDLLEXPORT wxRadioButton: public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioButton)
|
||||
protected:
|
||||
public:
|
||||
inline wxRadioButton() {}
|
||||
inline wxRadioButton(wxWindow *parent, wxWindowID id,
|
||||
@ -46,14 +44,21 @@ class WXDLLEXPORT wxRadioButton: public wxControl
|
||||
virtual void SetValue(bool val);
|
||||
virtual bool GetValue() const ;
|
||||
|
||||
// implementation
|
||||
|
||||
virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart );
|
||||
void Command(wxCommandEvent& event);
|
||||
wxRadioButton *AddInCycle(wxRadioButton *cycle);
|
||||
inline wxRadioButton *NextInCycle() {return m_cycle;}
|
||||
|
||||
protected:
|
||||
void OnIdle( wxIdleEvent &event );
|
||||
|
||||
protected:
|
||||
wxRadioButton *m_cycle;
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioButton)
|
||||
};
|
||||
|
||||
// Not implemented
|
||||
|
@ -15,9 +15,12 @@
|
||||
|
||||
#include "wx/radiobut.h"
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
|
||||
#endif
|
||||
|
||||
BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
|
||||
EVT_IDLE( wxRadioButton::OnIdle )
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#include <wx/mac/uma.h>
|
||||
|
||||
@ -43,6 +46,52 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxRadioButton::OnIdle( wxIdleEvent &event )
|
||||
{
|
||||
if (!m_cycle && HasFlag(wxRB_GROUP))
|
||||
{
|
||||
// we are a stand-alone radiobutton and have
|
||||
// the group flag indicating we have to collect
|
||||
// the other radiobuttons belonging to this one
|
||||
|
||||
bool reached_this = FALSE;
|
||||
wxRadioButton *m_radioButtonCycle = NULL;
|
||||
m_radioButtonCycle = AddInCycle( m_radioButtonCycle );
|
||||
|
||||
wxWindow *parent = GetParent();
|
||||
wxNode *node = parent->GetChildren().First();
|
||||
while (node)
|
||||
{
|
||||
wxWindow *child = (wxWindow*) node->Data();
|
||||
|
||||
node = node->Next();
|
||||
|
||||
// start searching behind current radiobutton
|
||||
if (!reached_this)
|
||||
{
|
||||
reached_this = (this == child);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (child->IsKindOf( CLASSINFO ( wxRadioButton ) ))
|
||||
{
|
||||
wxRadioButton *rb = (wxRadioButton*) child;
|
||||
|
||||
// already reached next group
|
||||
if (rb->HasFlag(wxRB_GROUP)) break;
|
||||
|
||||
// part of a radiobox
|
||||
if (rb->NextInCycle()) break;
|
||||
|
||||
m_radioButtonCycle = rb->AddInCycle( m_radioButtonCycle );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
event.Skip( TRUE );
|
||||
}
|
||||
|
||||
void wxRadioButton::SetValue(bool val)
|
||||
{
|
||||
int i;
|
||||
|
@ -15,9 +15,12 @@
|
||||
|
||||
#include "wx/radiobut.h"
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
|
||||
#endif
|
||||
|
||||
BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
|
||||
EVT_IDLE( wxRadioButton::OnIdle )
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#include <wx/mac/uma.h>
|
||||
|
||||
@ -43,6 +46,52 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxRadioButton::OnIdle( wxIdleEvent &event )
|
||||
{
|
||||
if (!m_cycle && HasFlag(wxRB_GROUP))
|
||||
{
|
||||
// we are a stand-alone radiobutton and have
|
||||
// the group flag indicating we have to collect
|
||||
// the other radiobuttons belonging to this one
|
||||
|
||||
bool reached_this = FALSE;
|
||||
wxRadioButton *m_radioButtonCycle = NULL;
|
||||
m_radioButtonCycle = AddInCycle( m_radioButtonCycle );
|
||||
|
||||
wxWindow *parent = GetParent();
|
||||
wxNode *node = parent->GetChildren().First();
|
||||
while (node)
|
||||
{
|
||||
wxWindow *child = (wxWindow*) node->Data();
|
||||
|
||||
node = node->Next();
|
||||
|
||||
// start searching behind current radiobutton
|
||||
if (!reached_this)
|
||||
{
|
||||
reached_this = (this == child);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (child->IsKindOf( CLASSINFO ( wxRadioButton ) ))
|
||||
{
|
||||
wxRadioButton *rb = (wxRadioButton*) child;
|
||||
|
||||
// already reached next group
|
||||
if (rb->HasFlag(wxRB_GROUP)) break;
|
||||
|
||||
// part of a radiobox
|
||||
if (rb->NextInCycle()) break;
|
||||
|
||||
m_radioButtonCycle = rb->AddInCycle( m_radioButtonCycle );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
event.Skip( TRUE );
|
||||
}
|
||||
|
||||
void wxRadioButton::SetValue(bool val)
|
||||
{
|
||||
int i;
|
||||
|
Loading…
Reference in New Issue
Block a user