The Unicode handling fixes my app seemed to need.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 1af816532741f3dd53775dfd52c12eb9f196a681..7f95b4c3ac67a1dae4cccd6149a5e6c3d4383062 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -662,6 +662,8 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
+    if (!wxOKlibc()) wxConv_current = &wxConv_local;
+
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 57bd258ee11ba70c260ecab7dded8fbc5c1923b8..046020c6e09ca8e46a1cfb002d953ba349c80105 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -50,9 +50,9 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = label->label;
+        wxString str = wxString(label->label,*wxConv_current);
 
-        return (str[1] == 'X');
+        return (str[1] == _T('X'));
     }
 
     wxFAIL_MSG(_T("wrong checklistbox index"));
@@ -69,7 +69,7 @@ void wxCheckListBox::Check( int index, bool check )
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = label->label;
+        wxString str = wxString(label->label,*wxConv_current);
 
         if (check == (str[1] == _T('X'))) return;
 

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index f13d20eae3f0582dc56a25c149a4588c1534ead6..742c29ecb748fe66eb1ccdcc2c77f13a73abc1d8 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -251,7 +251,7 @@ int wxChoice::FindString( const wxString &string ) const
 
         wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-       if (string == label->label)
+       if (string == wxString(label->label,*wxConv_current))
            return count;
 
        child = child->next;
@@ -304,7 +304,7 @@ wxString wxChoice::GetString( int n ) const
 
             wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-            return label->label;
+            return wxString(label->label,*wxConv_current);
         }
         child = child->next;
         count++;
@@ -312,7 +312,7 @@ wxString wxChoice::GetString( int n ) const
 
     wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
 
-    return "";
+    return _T("");
 }
 
 wxString wxChoice::GetStringSelection() const
@@ -323,7 +323,7 @@ wxString wxChoice::GetStringSelection() const
 
     wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-    return label->label;
+    return wxString(label->label,*wxConv_current);
 }
 
 int wxChoice::Number() const

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index d529cd166943726e9d019fffdc58e592c1629bc6..5fa2491aee4255c42c3d7d478efa664749d0cf66 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -387,7 +387,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str(GET_REAL_LABEL(label->label));
+        wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent);
         deletedLabels.Add(str);
 
         // save data
@@ -649,7 +649,7 @@ int wxListBox::FindString( const wxString &item ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         if (str == item)
             return count;
@@ -718,7 +718,7 @@ wxString wxListBox::GetString( int n ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         return str;
     }
@@ -738,7 +738,7 @@ wxString wxListBox::GetStringSelection() const
         GtkBin *bin = GTK_BIN( selection->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         return str;
     }

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 1af816532741f3dd53775dfd52c12eb9f196a681..7f95b4c3ac67a1dae4cccd6149a5e6c3d4383062 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -662,6 +662,8 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
+    if (!wxOKlibc()) wxConv_current = &wxConv_local;
+
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 57bd258ee11ba70c260ecab7dded8fbc5c1923b8..046020c6e09ca8e46a1cfb002d953ba349c80105 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -50,9 +50,9 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = label->label;
+        wxString str = wxString(label->label,*wxConv_current);
 
-        return (str[1] == 'X');
+        return (str[1] == _T('X'));
     }
 
     wxFAIL_MSG(_T("wrong checklistbox index"));
@@ -69,7 +69,7 @@ void wxCheckListBox::Check( int index, bool check )
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = label->label;
+        wxString str = wxString(label->label,*wxConv_current);
 
         if (check == (str[1] == _T('X'))) return;
 

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index f13d20eae3f0582dc56a25c149a4588c1534ead6..742c29ecb748fe66eb1ccdcc2c77f13a73abc1d8 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -251,7 +251,7 @@ int wxChoice::FindString( const wxString &string ) const
 
         wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-       if (string == label->label)
+       if (string == wxString(label->label,*wxConv_current))
            return count;
 
        child = child->next;
@@ -304,7 +304,7 @@ wxString wxChoice::GetString( int n ) const
 
             wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-            return label->label;
+            return wxString(label->label,*wxConv_current);
         }
         child = child->next;
         count++;
@@ -312,7 +312,7 @@ wxString wxChoice::GetString( int n ) const
 
     wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
 
-    return "";
+    return _T("");
 }
 
 wxString wxChoice::GetStringSelection() const
@@ -323,7 +323,7 @@ wxString wxChoice::GetStringSelection() const
 
     wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
-    return label->label;
+    return wxString(label->label,*wxConv_current);
 }
 
 int wxChoice::Number() const

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index d529cd166943726e9d019fffdc58e592c1629bc6..5fa2491aee4255c42c3d7d478efa664749d0cf66 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -387,7 +387,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str(GET_REAL_LABEL(label->label));
+        wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent);
         deletedLabels.Add(str);
 
         // save data
@@ -649,7 +649,7 @@ int wxListBox::FindString( const wxString &item ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         if (str == item)
             return count;
@@ -718,7 +718,7 @@ wxString wxListBox::GetString( int n ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         return str;
     }
@@ -738,7 +738,7 @@ wxString wxListBox::GetStringSelection() const
         GtkBin *bin = GTK_BIN( selection->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         return str;
     }