GTK2: gtk_label_set -> gtk_label_set_text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,7 +93,7 @@ void wxCheckListBox::Check( int index, bool check )
|
||||
|
||||
str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
|
||||
|
||||
gtk_label_set( label, wxGTK_CONV( str ) );
|
||||
gtk_label_set_text( label, wxGTK_CONV( str ) );
|
||||
|
||||
return;
|
||||
}
|
||||
|
@@ -913,7 +913,7 @@ void wxListBox::SetString( int n, const wxString &string )
|
||||
#endif // wxUSE_CHECKLISTBOX
|
||||
str += string;
|
||||
|
||||
gtk_label_set( label, wxGTK_CONV( str ) );
|
||||
gtk_label_set_text( label, wxGTK_CONV( str ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -515,7 +515,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
|
||||
GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
|
||||
|
||||
/* set new text */
|
||||
gtk_label_set( glabel, wxGTK_CONV( str ) );
|
||||
gtk_label_set_text( glabel, wxGTK_CONV( str ) );
|
||||
|
||||
/* reparse key accel */
|
||||
(void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );
|
||||
|
@@ -441,7 +441,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
|
||||
|
||||
nb_page->m_text = text;
|
||||
|
||||
gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
|
||||
gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@@ -406,7 +406,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
|
||||
|
||||
GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
|
||||
|
||||
gtk_label_set( g_label, wxGTK_CONV( label ) );
|
||||
gtk_label_set_text( g_label, wxGTK_CONV( label ) );
|
||||
}
|
||||
|
||||
bool wxRadioBox::Enable( bool enable )
|
||||
|
@@ -289,7 +289,7 @@ void wxToggleButton::SetLabel(const wxString& label)
|
||||
|
||||
wxControl::SetLabel(label);
|
||||
|
||||
gtk_label_set(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
|
||||
gtk_label_set_text(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
|
||||
}
|
||||
|
||||
bool wxToggleButton::Enable(bool enable /*=true*/)
|
||||
|
@@ -222,7 +222,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) {
|
||||
return;
|
||||
|
||||
GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
|
||||
gtk_label_set(l, text);
|
||||
gtk_label_set_text(l, text);
|
||||
}
|
||||
|
||||
void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) {
|
||||
@@ -665,7 +665,7 @@ void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges) {
|
||||
#warning "Need to implement EndEditLabel"
|
||||
/*
|
||||
GtkLabel *m_label = (GtkLabel *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)m_editItem), "w_label");
|
||||
gtk_label_set(m_label, m_textCtrl->GetValue());
|
||||
gtk_label_set_text(m_label, m_textCtrl->GetValue());
|
||||
|
||||
gtk_object_remove_data(GTK_OBJECT((GtkTreeItem *)m_editItem), "w_edit");
|
||||
|
||||
|
Reference in New Issue
Block a user