Applied patch [ 838940 ] notebook labels are not shown when built with GTK2

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 066b7dea5992b21b2bc2c8eb53e05a43f90bc1dd..76baec9d8ea386ce8c9464a2b505bbff5c4d015b 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -649,7 +649,7 @@ bool wxNotebook::InsertPage( size_t position,
     nb_page->m_text = text;
     if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
   
-    nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) );
+    nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
     gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
   
     /* show the label */

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 066b7dea5992b21b2bc2c8eb53e05a43f90bc1dd..76baec9d8ea386ce8c9464a2b505bbff5c4d015b 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -649,7 +649,7 @@ bool wxNotebook::InsertPage( size_t position,
     nb_page->m_text = text;
     if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
   
-    nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) );
+    nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
     gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
   
     /* show the label */