X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a45c6a892ca8e3dd275138607700ceacd7d2504f..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/radiobut.cpp diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 73aedb99ad..2dbfb916ee 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -14,7 +14,9 @@ #include "wx/radiobut.h" +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -30,13 +32,11 @@ extern "C" { static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb ) { - if (!rb->m_hasVMT) return; - if (g_blockEventsOnDrag) return; if (!gtk_toggle_button_get_active(button)) return; - wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); + wxCommandEvent event( wxEVT_RADIOBUTTON, rb->GetId()); event.SetInt( rb->GetValue() ); event.SetEventObject( rb ); rb->HandleWindowEvent( event ); @@ -167,28 +167,21 @@ bool wxRadioButton::Enable( bool enable ) void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) { - gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); + GTKApplyStyle(m_widget, style); + GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style); } GdkWindow * wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return GTK_BUTTON(m_widget)->event_window; + return gtk_button_get_event_window(GTK_BUTTON(m_widget)); } // static wxVisualAttributes wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - wxVisualAttributes attr; - // NB: we need toplevel window so that GTK+ can find the right style - GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); - GtkWidget* widget = gtk_radio_button_new_with_label(NULL, ""); - gtk_container_add(GTK_CONTAINER(wnd), widget); - attr = GetDefaultAttributesFromGTKWidget(widget); - gtk_widget_destroy(wnd); - return attr; + return GetDefaultAttributesFromGTKWidget(gtk_radio_button_new_with_label(NULL, "")); }