Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 1376506 - remove unneeded member variable from GTK wxRadioButton

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-08 21:44:46 +00:00
parent dc8fbc37b0
commit 739b752912
4 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/gtk/radiobut.h
View File

@@ -51,7 +51,6 @@ public:
virtual bool IsRadioButton() const { return TRUE; } virtual bool IsRadioButton() const { return TRUE; }
GSList *m_radioButtonGroup;
void DoApplyWidgetStyle(GtkRcStyle *style); void DoApplyWidgetStyle(GtkRcStyle *style);
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
void OnInternalIdle(); void OnInternalIdle();

1
include/wx/gtk1/radiobut.h
View File

@@ -51,7 +51,6 @@ public:
virtual bool IsRadioButton() const { return TRUE; } virtual bool IsRadioButton() const { return TRUE; }
GSList *m_radioButtonGroup;
void DoApplyWidgetStyle(GtkRcStyle *style); void DoApplyWidgetStyle(GtkRcStyle *style);
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
void OnInternalIdle(); void OnInternalIdle();

17
src/gtk/radiobut.cpp
View File

@@ -83,12 +83,8 @@ bool wxRadioButton::Create( wxWindow *parent,
return FALSE; return FALSE;
} }
if (HasFlag(wxRB_GROUP)) GSList* radioButtonGroup = NULL;
{ if (!HasFlag(wxRB_GROUP))
// start a new group
m_radioButtonGroup = (GSList*) NULL;
}
else
{ {
// search backward for last group start // search backward for last group start
wxRadioButton *chief = (wxRadioButton*) NULL; wxRadioButton *chief = (wxRadioButton*) NULL;
@@ -107,16 +103,11 @@ bool wxRadioButton::Create( wxWindow *parent,
if (chief) if (chief)
{ {
// we are part of the group started by chief // we are part of the group started by chief
m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
}
else
{
// start a new group
m_radioButtonGroup = (GSList*) NULL;
} }
} }
m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, wxGTK_CONV( label ) ); m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
SetLabel(label); SetLabel(label);

17
src/gtk1/radiobut.cpp
View File

@@ -83,12 +83,8 @@ bool wxRadioButton::Create( wxWindow *parent,
return FALSE; return FALSE;
} }
if (HasFlag(wxRB_GROUP)) GSList* radioButtonGroup = NULL;
{ if (!HasFlag(wxRB_GROUP))
// start a new group
m_radioButtonGroup = (GSList*) NULL;
}
else
{ {
// search backward for last group start // search backward for last group start
wxRadioButton *chief = (wxRadioButton*) NULL; wxRadioButton *chief = (wxRadioButton*) NULL;
@@ -107,16 +103,11 @@ bool wxRadioButton::Create( wxWindow *parent,
if (chief) if (chief)
{ {
// we are part of the group started by chief // we are part of the group started by chief
m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
}
else
{
// start a new group
m_radioButtonGroup = (GSList*) NULL;
} }
} }
m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, wxGTK_CONV( label ) ); m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
SetLabel(label); SetLabel(label);