signed/unsigned comparison warning (and probably even error) fixed

[wxWidgets.git] / src / gtk1 / stattext.cpp

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index e57480771477c32fae0096240239b6f9926c968f..255ecb25f8f30cd0e4d1b14dd3b144f0eac1cc72 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -65,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent,
     // because the label is not yet created and because SetLabel() has a side
     // effect of changing the control size which might not be desirable
     wxControl::SetLabel(label);
-    m_widget = gtk_label_new( m_label.mbc_str() );
+    m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
     
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
@@ -109,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
 
 wxString wxStaticText::GetLabel() const
 {
-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
+    GtkLabel *label = GTK_LABEL(m_widget);
+
+#ifdef __WXGTK20__
+    wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    wxString str = wxString( label->label );
+#endif
 
     return wxString(str);
 }
@@ -119,7 +124,7 @@ void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(label);
 
-    gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))