projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, fixed typo breaking iconv constness detection in the previous commit
[wxWidgets.git]
/
src
/
gtk
/
radiobox.cpp
diff --git
a/src/gtk/radiobox.cpp
b/src/gtk/radiobox.cpp
index 64881d7cfc6ab1252c43d387104097a91f27290b..20d1af4563e1f1c85b5aa662e26d433176c9ec59 100644
(file)
--- a/
src/gtk/radiobox.cpp
+++ b/
src/gtk/radiobox.cpp
@@
-44,20
+44,14
@@
extern bool g_blockEventsOnDrag;
// "clicked"
//-----------------------------------------------------------------------------
// "clicked"
//-----------------------------------------------------------------------------
-static void gtk_radiobutton_clicked_callback( Gtk
Widget *WXUNUSED(widget)
, wxRadioBox *rb )
+static void gtk_radiobutton_clicked_callback( Gtk
ToggleButton *button
, wxRadioBox *rb )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
- if (rb->m_alreadySent)
- {
- rb->m_alreadySent = FALSE;
- return;
- }
-
- rb->m_alreadySent = TRUE;
+ if (!button->active) return;
wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
event.SetInt( rb->GetSelection() );
wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
event.SetInt( rb->GetSelection() );
@@
-166,7
+160,6
@@
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
void wxRadioBox::Init()
{
void wxRadioBox::Init()
{
- m_alreadySent = FALSE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
@@
-184,7
+177,7
@@
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxRadioBox creation failed") );
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxRadioBox creation failed") );
- return FALSE;
+
return FALSE;
}
m_widget = gtk_frame_new( title.mbc_str() );
}
m_widget = gtk_frame_new( title.mbc_str() );
@@
-478,7
+471,7
@@
void wxRadioBox::SetSelection( int n )
GtkDisableEvents();
GtkDisableEvents();
- gtk_toggle_button_set_
stat
e( button, 1 );
+ gtk_toggle_button_set_
activ
e( button, 1 );
GtkEnableEvents();
}
GtkEnableEvents();
}