AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for radiobutton

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-12-10 13:33:11 +00:00
parent 2faf15a189
commit bb4549de8f
4 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,8 @@ class wxRadioButton: public wxControl
// implementation // implementation
void ApplyWidgetStyle(); void ApplyWidgetStyle();
bool m_blockFirstEvent;
}; };
#endif // __GTKRADIOBUTTONH__ #endif // __GTKRADIOBUTTONH__

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

@ -65,6 +65,8 @@ class wxRadioButton: public wxControl
// implementation // implementation
void ApplyWidgetStyle(); void ApplyWidgetStyle();
bool m_blockFirstEvent;
}; };
#endif // __GTKRADIOBUTTONH__ #endif // __GTKRADIOBUTTONH__

24
src/gtk/radiobut.cpp
View File

@ -21,14 +21,20 @@
extern bool g_blockEventsOnDrag; 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->HasVMT()) return;
if (rb->m_blockFirstEvent)
{
rb->m_blockFirstEvent = FALSE;
return;
}
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); 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 ); rb->GetEventHandler()->ProcessEvent( event );
} }
//-----------------------------------------------------------------------------
// wxRadioButton
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxSize& size, long style, const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name ) const wxValidator& validator, const wxString& name )
@ -53,6 +65,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
SetLabel(label); SetLabel(label);
m_blockFirstEvent = FALSE;
if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label ); if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
@ -89,6 +103,8 @@ void wxRadioButton::SetValue( bool val )
wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val ); gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
m_blockFirstEvent = TRUE;
} }
bool wxRadioButton::GetValue(void) const bool wxRadioButton::GetValue(void) const

24
src/gtk1/radiobut.cpp
View File

@ -21,14 +21,20 @@
extern bool g_blockEventsOnDrag; 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->HasVMT()) return;
if (rb->m_blockFirstEvent)
{
rb->m_blockFirstEvent = FALSE;
return;
}
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); 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 ); rb->GetEventHandler()->ProcessEvent( event );
} }
//-----------------------------------------------------------------------------
// wxRadioButton
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxSize& size, long style, const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name ) const wxValidator& validator, const wxString& name )
@ -53,6 +65,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
SetLabel(label); SetLabel(label);
m_blockFirstEvent = FALSE;
if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label ); if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
@ -89,6 +103,8 @@ void wxRadioButton::SetValue( bool val )
wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val ); gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
m_blockFirstEvent = TRUE;
} }
bool wxRadioButton::GetValue(void) const bool wxRadioButton::GetValue(void) const