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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index ba70c07e7f0af791fbde0118f989a11e3f1c9f31..e3eb5b9e7903dead959030490a2e3733bbc9fefd 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -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;
     }

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 7f0809b59220835d0119462b77fa252b4b174657..cbff2c4f8f7023aa5d5fc843d94b06ae85c9af1d 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -913,7 +913,7 @@ void wxListBox::SetString( int n, const wxString &string )
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 

-        gtk_label_set( label, wxGTK_CONV( str ) );
+        gtk_label_set_text( label, wxGTK_CONV( str ) );

     }
     else
     {
     }
     else
     {

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 711a4f7cb9f86ca1683c80033406df082b2aeeaa..10dfc43511e1f33ab1ca2d4aec362b1f699d7915 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -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 */
         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 ) );
 
         /* reparse key accel */
         (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index a184447c6f3910975370043f6f8575e87638ed7c..e0bb675723879ca58d07b0d670a5d7ebb528fdd4 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -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;
 }

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 2cbdbf456ec096fd54148af22b83ded334515691..eb738696a50aaa5ffbc172567dfe3170d80af209 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -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 )

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 2f88a9757bce8d1cd051d924a98373b2ded127d9..c18160f778257b48cbb326dff6d5a38e8100d217 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -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*/)

diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp
index ffd0f0caf1c0639c516fbfd0a38890d863c61fc2..736d6dd36b1384f48153c2e7c22356a1e3b7b74b 100644 (file)
--- a/src/gtk/treegtk.cpp
+++ b/src/gtk/treegtk.cpp
@@ -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"));
     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) {
 }
 
 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");
 #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");
 
 
   gtk_object_remove_data(GTK_OBJECT((GtkTreeItem *)m_editItem), "w_edit");