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

GTK2: gtk_label_set -> gtk_label_set_text

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-03 22:58:26 +00:00
parent e343da37ac
commit a7c12d28e6
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/checklst.cpp
View File

@@ -93,7 +93,7 @@ void wxCheckListBox::Check( int index, bool check )
str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED ); str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
gtk_label_set( label, wxGTK_CONV( str ) ); gtk_label_set_text( label, wxGTK_CONV( str ) );
return; return;
} }

2
src/gtk/listbox.cpp
View File

@@ -913,7 +913,7 @@ void wxListBox::SetString( int n, const wxString &string )
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
str += string; str += string;
gtk_label_set( label, wxGTK_CONV( str ) ); gtk_label_set_text( label, wxGTK_CONV( str ) );
} }
else else
{ {

2
src/gtk/menu.cpp
View File

@@ -515,7 +515,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
/* set new text */ /* set new text */
gtk_label_set( glabel, wxGTK_CONV( str ) ); gtk_label_set_text( glabel, wxGTK_CONV( str ) );
/* reparse key accel */ /* reparse key accel */
(void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) ); (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );

2
src/gtk/notebook.cpp
View File

@@ -441,7 +441,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
nb_page->m_text = 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; return TRUE;
} }

2
src/gtk/radiobox.cpp
View File

@@ -406,7 +406,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child); 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 ) bool wxRadioBox::Enable( bool enable )

2
src/gtk/tglbtn.cpp
View File

@@ -289,7 +289,7 @@ void wxToggleButton::SetLabel(const wxString& label)
wxControl::SetLabel(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*/) bool wxToggleButton::Enable(bool enable /*=true*/)

4
src/gtk/treegtk.cpp
View File

@@ -222,7 +222,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) {
return; return;
GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label")); 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) { 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" #warning "Need to implement EndEditLabel"
/* /*
GtkLabel *m_label = (GtkLabel *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)m_editItem), "w_label"); 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"); gtk_object_remove_data(GTK_OBJECT((GtkTreeItem *)m_editItem), "w_edit");