[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 92b78d42235c8f1200cbe60fa23d1a0c905f4b24..9900eb7c898932804bd6ac5686bfdcf7a42d34c8 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -8,11 +8,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "radiobut.h"
 #endif
 
 #pragma implementation "radiobut.h"
 #endif
 

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

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 


@@ -39,6 +40,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 )
 {


@@ -57,6 +59,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


@@ -64,13 +67,17 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
   
 
 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 )
+bool wxRadioButton::Create( wxWindow *parent,
+                            wxWindowID id,
+                            const wxString& label,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name )

 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;

-    m_isRadioButton = TRUE;

     
     m_blockEvent = FALSE;
 
     
     m_blockEvent = FALSE;
 


@@ -90,14 +97,15 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
     {
         // search backward for last group start
         wxRadioButton *chief = (wxRadioButton*) NULL;
     {
         // search backward for last group start
         wxRadioButton *chief = (wxRadioButton*) NULL;

-        wxWindowList::Node *node = parent->GetChildren().GetLast();
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();

         while (node)
         {
             wxWindow *child = node->GetData();
         while (node)
         {
             wxWindow *child = node->GetData();

-            if (child->m_isRadioButton)
+            if (child->IsRadioButton())

             {
                 chief = (wxRadioButton*) child;
             {
                 chief = (wxRadioButton*) child;

-                if (child->HasFlag(wxRB_GROUP)) break;
+                if (child->HasFlag(wxRB_GROUP))
+                    break;

             }
             node = node->GetPrevious();
         }
             }
             node = node->GetPrevious();
         }


@@ -113,7 +121,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
         }
     }
 
         }
     }
 

-    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() );
+    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, wxGTK_CONV( label ) );

       
     SetLabel(label);
 
       
     SetLabel(label);
 


@@ -122,23 +130,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
        
     m_parent->DoAddChild( this );
   
        
     m_parent->DoAddChild( this );
   

-    PostCreation();
-
-    SetFont( parent->GetFont() );
-
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-        
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-  
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -149,7 +141,12 @@ void wxRadioButton::SetLabel( const wxString& label )
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );

-    gtk_label_set( g_label, GetLabel().mbc_str() );
+#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

 }
 
 void wxRadioButton::SetValue( bool val )
 }
 
 void wxRadioButton::SetValue( bool val )


@@ -192,11 +189,10 @@ bool wxRadioButton::Enable( bool enable )
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxRadioButton::ApplyWidgetStyle()
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);

 }
 
 bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
 }
 
 bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )


@@ -229,7 +225,8 @@ void wxRadioButton::OnInternalIdle()
         }
     }
 
         }
     }
 

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 wxSize wxRadioButton::DoGetBestSize() const
 }
 
 wxSize wxRadioButton::DoGetBestSize() const


@@ -237,4 +234,19 @@ wxSize wxRadioButton::DoGetBestSize() const
     return wxControl::DoGetBestSize();
 }
 
     return wxControl::DoGetBestSize();
 }
 

+// 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;
+}
+
+

 #endif
 #endif