Merge branch 'upstream'

chrisboyle · Aug 17, 2015 · 4bc3864 · 4bc3864
2 parents 4b46d70 + dd9e24a
commit 4bc3864
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/not-in-use/emccpre.js b/not-in-use/emccpre.js
@@ -333,6 +333,7 @@ function initPuzzle() {
             resize_xbase = null;
             resize_ybase = null;
             onscreen_canvas.focus(); // return focus to the puzzle
+            event.preventDefault();
         } else if (restore_pending) {
             // If you have the puzzle at larger than normal size and
             // then right-click to restore, I haven't found any way to
@@ -345,8 +346,8 @@ function initPuzzle() {
                 restore_puzzle_size();
                 onscreen_canvas.focus();
             }, 20);
+            event.preventDefault();
         }
-        event.preventDefault();
     });
 
     // Run the C setup function, passing argv[1] as the fragment

diff --git a/not-in-use/windows.c b/not-in-use/windows.c
@@ -608,7 +608,7 @@ static void win_draw_text(void *handle, int x, int y, int fonttype,
 	HFONT oldfont;
 	TEXTMETRIC tm;
 	SIZE size;
-	TCHAR wText[256];
+	WCHAR wText[256];
 	MultiByteToWideChar (CP_UTF8, 0, text, -1, wText, 256);
 
 	oldfont = SelectObject(fe->hdc, fe->fonts[i].font);