diff --git a/src/sbbs3/userlist/SBBS_User_ListMain.cpp b/src/sbbs3/userlist/SBBS_User_ListMain.cpp index a870a527eb3744eaa1412a2c995267b6a1aff631..a1f10f23a7065f139d6b728d4f00defc77ed7418 100644 --- a/src/sbbs3/userlist/SBBS_User_ListMain.cpp +++ b/src/sbbs3/userlist/SBBS_User_ListMain.cpp @@ -185,12 +185,12 @@ SBBS_User_ListFrame::SBBS_User_ListFrame(wxWindow* parent,wxWindowID id) StatusBar1->SetFieldsCount(1,__wxStatusBarWidths_1); StatusBar1->SetStatusStyles(1,__wxStatusBarStyles_1); SetStatusBar(StatusBar1); - MenuItem3 = new wxMenuItem((&ContextMenu), ID_EDITUSER, _("Edit User\tE"), wxEmptyString, wxITEM_NORMAL); + MenuItem3 = new wxMenuItem((&ContextMenu), ID_EDITUSER, _("Edit User"), wxEmptyString, wxITEM_NORMAL); ContextMenu.Append(MenuItem3); MenuItem3->Enable(false); - MenuItem4 = new wxMenuItem((&ContextMenu), ID_COPY, _("Copy\tC"), wxEmptyString, wxITEM_NORMAL); + MenuItem4 = new wxMenuItem((&ContextMenu), ID_COPY, _("Copy"), wxEmptyString, wxITEM_NORMAL); ContextMenu.Append(MenuItem4); - MenuItem5 = new wxMenuItem((&ContextMenu), ID_COPYALL, _("Copy All\tA"), wxEmptyString, wxITEM_NORMAL); + MenuItem5 = new wxMenuItem((&ContextMenu), ID_COPYALL, _("Copy All"), wxEmptyString, wxITEM_NORMAL); ContextMenu.Append(MenuItem5); MenuItem6 = new wxMenuItem((&ContextMenu), ID_REFRESH, _("Refresh"), wxEmptyString, wxITEM_NORMAL); ContextMenu.Append(MenuItem6); @@ -458,7 +458,7 @@ int wxCALLBACK SortCallBack(wxIntPtr item1_data, wxIntPtr item2_data, wxIntPtr d v1=dstrtounix(&App->cfg, val1.mb_str(wxConvUTF8)); v2=dstrtounix(&App->cfg, val2.mb_str(wxConvUTF8)); ret = v1-v2; - break; + break;c // Strings default: ret=val1.CmpNoCase(val2); diff --git a/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs b/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs index 9c2d749e486b4ed870fff065d52f862e560f86a1..05d511334f4a72d6932ff3d60332c364f4a65ab2 100644 --- a/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs +++ b/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs @@ -132,17 +132,14 @@ <object class="wxMenu" variable="ContextMenu" member="yes"> <object class="wxMenuItem" name="ID_EDITUSER" variable="MenuItem3" member="yes"> <label>Edit User</label> - <accel>E</accel> <enabled>0</enabled> </object> <object class="wxMenuItem" name="ID_COPY" variable="MenuItem4" member="yes"> <label>Copy</label> - <accel>C</accel> <handler function="CopyMenuItemSelected" entry="EVT_MENU" /> </object> <object class="wxMenuItem" name="ID_COPYALL" variable="MenuItem5" member="yes"> <label>Copy All</label> - <accel>A</accel> <handler function="CopyAllMenuItemSelected" entry="EVT_MENU" /> </object> <object class="wxMenuItem" name="ID_REFRESH" variable="MenuItem6" member="yes">