projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make art provider id of type "char *" instead of "wxChar *".
[wxWidgets.git]
/
src
/
gtk
/
radiobut.cpp
diff --git
a/src/gtk/radiobut.cpp
b/src/gtk/radiobut.cpp
index 649a520830c38758c5cbe62e89db960369cb2aff..d2c5f73cfee57f8bb905d8d363285db4b9521aa7 100644
(file)
--- a/
src/gtk/radiobut.cpp
+++ b/
src/gtk/radiobut.cpp
@@
-66,7
+66,7
@@
bool wxRadioButton::Create( wxWindow *parent,
}
GSList* radioButtonGroup = NULL;
}
GSList* radioButtonGroup = NULL;
- if (!HasFlag(wxRB_GROUP))
+ if (!HasFlag(wxRB_GROUP)
&& !HasFlag(wxRB_SINGLE)
)
{
// search backward for last group start
wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
{
// search backward for last group start
wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
@@
-83,11
+83,12
@@
bool wxRadioButton::Create( wxWindow *parent,
}
m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
}
m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
+ g_object_ref(m_widget);
SetLabel(label);
SetLabel(label);
- g_signal_connect (m_widget, "clicked",
- G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+ g_signal_connect
_after
(m_widget, "clicked",
+
G_CALLBACK (gtk_radiobutton_clicked_callback), this);
m_parent->DoAddChild( this );
m_parent->DoAddChild( this );
@@
-137,11
+138,14
@@
bool wxRadioButton::GetValue() const
bool wxRadioButton::Enable( bool enable )
{
bool wxRadioButton::Enable( bool enable )
{
- if (
!wxControl::Enable( enable )
)
+ if (
!base_type::Enable(enable)
)
return false;
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
return false;
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+ if (enable)
+ GTKFixSensitivity();
+
return true;
}
return true;
}