From bb4549de8f731378d169faec928ec4e0c64536e8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 10 Dec 1998 13:33:11 +0000 Subject: [PATCH] Fix for radiobutton git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/radiobut.h | 2 ++ include/wx/gtk1/radiobut.h | 2 ++ src/gtk/radiobut.cpp | 24 ++++++++++++++++++++---- src/gtk1/radiobut.cpp | 24 ++++++++++++++++++++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 1bf88485a8..f86495364f 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -65,6 +65,8 @@ class wxRadioButton: public wxControl // implementation void ApplyWidgetStyle(); + + bool m_blockFirstEvent; }; #endif // __GTKRADIOBUTTONH__ diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h index 1bf88485a8..f86495364f 100644 --- a/include/wx/gtk1/radiobut.h +++ b/include/wx/gtk1/radiobut.h @@ -65,6 +65,8 @@ class wxRadioButton: public wxControl // implementation void ApplyWidgetStyle(); + + bool m_blockFirstEvent; }; #endif // __GTKRADIOBUTTONH__ diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index e42dcfd56b..a0a40eb861 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -21,14 +21,20 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxRadioButton +// "clicked" //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) - -static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) +static +void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) { if (!rb->HasVMT()) return; + + if (rb->m_blockFirstEvent) + { + rb->m_blockFirstEvent = FALSE; + return; + } + if (g_blockEventsOnDrag) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); @@ -37,6 +43,12 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad rb->GetEventHandler()->ProcessEvent( event ); } +//----------------------------------------------------------------------------- +// wxRadioButton +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) + bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name ) @@ -53,6 +65,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab SetLabel(label); + m_blockFirstEvent = FALSE; + if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label ); if (newSize.y == -1) newSize.y = 26; SetSize( newSize.x, newSize.y ); @@ -89,6 +103,8 @@ void wxRadioButton::SetValue( bool val ) wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val ); + + m_blockFirstEvent = TRUE; } bool wxRadioButton::GetValue(void) const diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index e42dcfd56b..a0a40eb861 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -21,14 +21,20 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxRadioButton +// "clicked" //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) - -static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) +static +void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) { if (!rb->HasVMT()) return; + + if (rb->m_blockFirstEvent) + { + rb->m_blockFirstEvent = FALSE; + return; + } + if (g_blockEventsOnDrag) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); @@ -37,6 +43,12 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad rb->GetEventHandler()->ProcessEvent( event ); } +//----------------------------------------------------------------------------- +// wxRadioButton +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) + bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name ) @@ -53,6 +65,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab SetLabel(label); + m_blockFirstEvent = FALSE; + if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label ); if (newSize.y == -1) newSize.y = 26; SetSize( newSize.x, newSize.y ); @@ -89,6 +103,8 @@ void wxRadioButton::SetValue( bool val ) wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val ); + + m_blockFirstEvent = TRUE; } bool wxRadioButton::GetValue(void) const -- 2.45.2