Fix #17

katahiromz · Aug 23, 2021 · ff43811 · ff43811
1 parent cba3220
commit ff43811
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/GUI.cpp b/GUI.cpp
@@ -9043,6 +9043,14 @@ void __fastcall MainWnd_OnCommand(HWND hwnd, int id, HWND /*hwndCtl*/, UINT /*co
     case ID_FILLBYWHITES:
         XgNewCells(hwnd, ZEN_SPACE, xg_nRows, xg_nCols);
         break;
+    case ID_ERASESOLUTIONANDUNLOCKEDIT:
+        {
+            std::wstring str;
+            XG_Board *pxw = (xg_bSolved && xg_bShowAnswer) ? &xg_solution : &xg_xword;
+            pxw->GetString(str);
+            XgPasteBoard(hwnd, str);
+        }
+        break;
     default:
         if (!MainWnd_OnCommand2(hwnd, id)) {
             ::MessageBeep(0xFFFFFFFF);

diff --git a/HISTORY.txt b/HISTORY.txt
@@ -384,6 +384,7 @@
 	数字入力を受け入れる。
 	番号を消すことが可能に。
 	キャレットを消すことが可能に。
+	「解」メニューに「解を削除して編集ロックを解除」を追加。
 
 ## History of XWordGiver (English)
 
@@ -403,3 +404,4 @@
     - Accepted digits input.
     - Able to hide numbering.
     - Able to hide caret.
+    - Added menu item "Delete solution and &unlock edit" to "Solution" menu.
diff --git a/lang/en_US.rc b/lang/en_US.rc
@@ -115,6 +115,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
         MENUITEM "&Previous double-frame word\tCtrl+K", ID_MARKSPREV
         MENUITEM SEPARATOR
         MENUITEM "Reset all the double-frames\tCtrl+R", ID_KILLMARKS
+        MENUITEM "Delete solution and &unlock edit", ID_ERASESOLUTIONANDUNLOCKEDIT
     }
     POPUP "&View"
     {

diff --git a/lang/ja_JP.rc b/lang/ja_JP.rc
@@ -115,6 +115,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
         MENUITEM "前の二重マス単語(&P)\tCtrl+K", ID_MARKSPREV
         MENUITEM SEPARATOR
         MENUITEM "二重マスをすべて解除する(&K)\tCtrl+R", ID_KILLMARKS
+        MENUITEM "解を削除して編集ロックを解除(&U)", ID_ERASESOLUTIONANDUNLOCKEDIT
     }
     POPUP "表示(&V)"
     {

diff --git a/resource.h b/resource.h
@@ -329,6 +329,7 @@
 #define ID_DIGITINPUT                       271
 #define ID_SHOWHIDENUMBERING                272
 #define ID_SHOWHIDECARET                    273
+#define ID_ERASESOLUTIONANDUNLOCKEDIT       274
 #define ID_TT_BASE                          10000
 
 #define ctl2                                1185