forgot to commit project file for CW before

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 7d2557692f253918ec960e18e6c11028d53d865e..d22bf804c2544ad1608416276f55cbfd160c3ae8 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -31,8 +31,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
-extern wxCursor   g_globalCursor;
+extern bool           g_blockEventsOnDrag;
+extern wxCursor       g_globalCursor;
+extern wxWindowGTK   *g_delayedFocus;
 
 //-----------------------------------------------------------------------------
 // "clicked"
@@ -63,13 +64,17 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 
 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_isRadioButton = TRUE;
     
     m_blockEvent = FALSE;
 
@@ -93,10 +98,11 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
         while (node)
         {
             wxWindow *child = node->GetData();
-            if (child->m_isRadioButton)
+            if (child->IsRadioButton())
             {
                 chief = (wxRadioButton*) child;
-                if (child->HasFlag(wxRB_GROUP)) break;
+                if (child->HasFlag(wxRB_GROUP))
+                    break;
             }
             node = node->GetPrevious();
         }
@@ -112,7 +118,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);
 
@@ -148,7 +154,12 @@ void wxRadioButton::SetLabel( const wxString& label )
   
     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 )
@@ -219,6 +230,15 @@ void wxRadioButton::OnInternalIdle()
        gdk_window_set_cursor( win, cursor.GetCursor() );
     }
 
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+
     UpdateWindowUI();
 }