Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK2: gtk_radio_button_group -> _set_group; A missed gtk_label_set to set_text. Add a FIXME note for wxStaticText

Browse Source 
probably not honoring SetBackgroundColour


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-04 00:09:16 +00:00
parent 2e14a11616
commit 78e017d8f3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/radiobox.cpp
View File

@@ -222,7 +222,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if ( i != 0 ) 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(); label.Empty();
for ( const wxChar *pc = choices[i]; *pc; pc++ ) for ( const wxChar *pc = choices[i]; *pc; pc++ )

2
src/gtk/radiobut.cpp
View File

@@ -103,7 +103,7 @@ bool wxRadioButton::Create( wxWindow *parent,
if (chief) if (chief)
{ {
// we are part of the group started by 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) );
} }
} }

3
src/gtk/stattext.cpp
View File

@@ -119,6 +119,7 @@ void wxStaticText::SetLabel( const wxString &label )
// Build the colorized version of the label (markup only allowed // Build the colorized version of the label (markup only allowed
// under GTK2): // under GTK2):
// FIXME: Does this handle background correct? I recall bug reports - MR
if (m_foregroundColour.Ok()) if (m_foregroundColour.Ok())
{ {
// If the color has been set, create a markup string to pass to // 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 ) ); gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
} }
else 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 // adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE)) if (!HasFlag(wxST_NO_AUTORESIZE))