#include "wx/gtk/private.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
extern "C" {
-static
+static
void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->m_hasVMT) return;
-
+
if (g_blockEventsOnDrag) return;
-
+
if (!button->active) return;
-
+
if (rb->m_blockEvent) return;
-
+
wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
event.SetInt( rb->GetValue() );
event.SetEventObject( rb );
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-
+
bool wxRadioButton::Create( wxWindow *parent,
wxWindowID id,
const wxString& label,
{
m_acceptsFocus = TRUE;
m_needParent = TRUE;
-
+
m_blockEvent = FALSE;
if (!PreCreation( parent, pos, size ) ||
if (chief)
{
// we are part of the group started by chief
- radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
+ radioButtonGroup = gtk_radio_button_get_group( GTK_RADIO_BUTTON(chief->m_widget) );
}
}
m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
-
+
SetLabel(label);
- gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
- GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-
+ g_signal_connect (m_widget, "clicked",
+ G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+
m_parent->DoAddChild( this );
-
+
PostCreation(size);
return TRUE;
void wxRadioButton::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
-
- wxControl::SetLabel( label );
- GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
-#ifdef __WXGTK20__
- wxString label2 = PrepareLabelMnemonics( label );
- gtk_label_set_text_with_mnemonic( g_label, wxGTK_CONV( label2 ) );
-#else
- gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );
-#endif
+
+ GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label);
}
void wxRadioButton::SetValue( bool val )
bool wxRadioButton::GetValue() const
{
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") );
-
+
return GTK_TOGGLE_BUTTON(m_widget)->active;
}
{
if ( !wxControl::Enable( enable ) )
return FALSE;
-
- gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
return TRUE;
}
void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
- gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+ gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
{
- return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ return window == GTK_BUTTON(m_widget)->event_window;
}
void wxRadioButton::OnInternalIdle()
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
- GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
if ( win && cursor.Ok())
{
/* I now set the cursor the anew in every OnInternalIdle call
as setting the cursor in a parent window also effects the
windows above so that checking for the current cursor is
not possible. */
-
+
gdk_window_set_cursor( win, cursor.GetCursor() );
}