GTK2: gtk_radio_button_group -> _set_group; A missed gtk_label_set to set_text. Add...

probably not honoring SetBackgroundColour

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index eb738696a50aaa5ffbc172567dfe3170d80af209..0e06bba68b73423db4de3e0df1244659f6374ad5 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -222,7 +222,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     for (int i = 0; i < n; i++)
     {
         if ( i != 0 )
     for (int i = 0; i < n; i++)
     {
         if ( i != 0 )

-            radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+            radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(m_radio) );

 
         label.Empty();
         for ( const wxChar *pc = choices[i]; *pc; pc++ )
 
         label.Empty();
         for ( const wxChar *pc = choices[i]; *pc; pc++ )

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 6c8e0b91e3528b7fc32932a67099818263dfcd05..028a84cc8e020e9951df5f9005f465b1733444c4 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -103,7 +103,7 @@ bool wxRadioButton::Create( wxWindow *parent,
         if (chief)
         {
             // we are part of the group started by chief
         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) );

         }
     }
 
         }
     }
 

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 0d7e3dd1d8a076c86eb18ccd67d989687157966f..f896644ff664d4e324b2b13440996510e0afcad4 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -119,6 +119,7 @@ void wxStaticText::SetLabel( const wxString &label )
 
     // Build the colorized version of the label (markup only allowed
     // under GTK2):
 
     // Build the colorized version of the label (markup only allowed
     // under GTK2):

+    // FIXME: Does this handle background correct? I recall bug reports - MR

     if (m_foregroundColour.Ok())
     {
         // If the color has been set, create a markup string to pass to
     if (m_foregroundColour.Ok())
     {
         // If the color has been set, create a markup string to pass to


@@ -131,7 +132,7 @@ void wxStaticText::SetLabel( const wxString &label )
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else

-        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );
+        gtk_label_set_text( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );

 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))