readability cleanup

[wxWidgets.git] / src / gtk1 / radiobut.cpp

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 2c3e1c0d107c9d0f53c74df9c2e45fa47f2b63ca..d6440f577a06ca8c03040aaa2d027e1a58448689 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobut.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -40,6 +35,7 @@ extern wxWindowGTK   *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static 
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
 static 
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {


@@ -58,6 +54,7 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent( event );
 }
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent( event );
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxRadioButton
 
 //-----------------------------------------------------------------------------
 // wxRadioButton


@@ -237,9 +234,12 @@ wxVisualAttributes
 wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     wxVisualAttributes attr;
 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, "");
     GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");

+    gtk_container_add(GTK_CONTAINER(wnd), widget);

     attr = GetDefaultAttributesFromGTKWidget(widget);
     attr = GetDefaultAttributesFromGTKWidget(widget);

-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);

     return attr;
 }
 
     return attr;
 }