Added logic to handle Unicode characters.

Group and station names containing Unicode characters were failing when attempting drag-n-drop operations. Added logic to intentionally convert the strings between wxString and std::string resolves the issue. Fixes #47
ebruck · Jan 3, 2018 · bedc2a6 · bedc2a6
1 parent 2f5392c
commit bedc2a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/radiotray-ng/gui/editor/group_list.cpp b/src/radiotray-ng/gui/editor/group_list.cpp
@@ -562,7 +562,8 @@ GroupList::onBeginDrag(wxListEvent& event)
 
 	this->SetDropTarget(new GroupDropTarget(this));
 
-	wxTextDataObject drag_data(text);
+	wxString tmpstr(text.c_str(), wxConvUTF8);
+	wxTextDataObject drag_data(tmpstr);
 
 	wxVisualAttributes attrs = this->GetDefaultAttributes();
 	wxBitmap drag_image = this->makeDragImage(group.group, &attrs.colBg, &attrs.colFg);
@@ -643,9 +644,11 @@ GroupList::onGroupDrop(wxCoord x, wxCoord y, const wxString& data)
 	long item_id = this->HitTest(wxPoint(x, y), hit_test_flags);
 	if (item_id != wxNOT_FOUND)
 	{
+		std::string tmp_data = std::string(data.mb_str(wxConvUTF8));
+
 		std::string group;
 		long original_item_id;
-		if (GroupDragAndDrop::extractText(data.ToStdString(), group, original_item_id) == false)
+		if (GroupDragAndDrop::extractText(tmp_data, group, original_item_id) == false)
 		{
 			return false;
 		}
@@ -748,10 +751,12 @@ GroupList::onStationDrop(wxCoord x, wxCoord y, const wxString& data)
 	long item_id = this->HitTest(wxPoint(x, y), hit_test_flags);
 	if (item_id != wxNOT_FOUND)
 	{
+		std::string tmp_data = std::string(data.mb_str(wxConvUTF8));
+
 		std::string original_group;
 		std::string station;
 		long original_item_id;
-		if (StationDragAndDrop::extractText(data.ToStdString(), original_group, station, original_item_id) == false)
+		if (StationDragAndDrop::extractText(tmp_data, original_group, station, original_item_id) == false)
 		{
 			return false;
 		}

diff --git a/src/radiotray-ng/gui/editor/station_list.cpp b/src/radiotray-ng/gui/editor/station_list.cpp
@@ -521,7 +521,10 @@ StationList::onBeginDrag(wxListEvent& event)
 		return;
 	}
 
-	wxTextDataObject drag_data(text);
+	this->SetDropTarget(new StationDropTarget(this));
+
+	wxString tmpstr(text.c_str(), wxConvUTF8);
+	wxTextDataObject drag_data(tmpstr);
 
 	wxVisualAttributes attrs = this->GetDefaultAttributes();
 	wxBitmap drag_image = this->makeDragImage(this->stations[data->getStationIndex()].name, &attrs.colBg, &attrs.colFg);
@@ -600,10 +603,12 @@ StationList::onStationDrop(wxCoord x, wxCoord y, const wxString& data)
 	long item_id = this->HitTest(wxPoint(x, y), hit_test_flags);
 	if (item_id != wxNOT_FOUND)
 	{
+		std::string tmp_data = std::string(data.mb_str(wxConvUTF8));
+
 		std::string group;
 		std::string station;
 		long original_item_id;
-		if (this->extractText(data.ToStdString(), group, station, original_item_id) == false)
+		if (this->extractText(tmp_data, group, station, original_item_id) == false)
 		{
 			return false;
 		}