X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/6b12623f922c0fb69ccdc553652984933a6226c4..39bdcaad9141c6fdb49d10d2f2ed2aae4d7acd18:/windows.c

diff --git a/windows.c b/windows.c
index 1117ade..3c2c2f1 100644
--- a/windows.c
+++ b/windows.c
@@ -1312,7 +1312,7 @@ static void get_menu_size(HWND wh, RECT *r)
 
 static int check_window_resize(frontend *fe, int cx, int cy,
                                int *px, int *py,
-                               int *wx, int *wy, int expand)
+                               int *wx, int *wy, int resize)
 {
     RECT r;
     int x, y, sy = get_statusbar_height(fe), changed = 0;
@@ -1325,7 +1325,7 @@ static int check_window_resize(frontend *fe, int cx, int cy,
      * See if we actually got the window size we wanted, and adjust
      * the puzzle size if not.
      */
-    midend_size(fe->me, &x, &y, expand);
+    midend_size(fe->me, &x, &y, resize);
     if (x != cx || y != cy) {
         /*
          * Resize the window, now we know what size we _really_
@@ -1659,7 +1659,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
             if (help_topic) {
                 char *item;
                 assert(thegame.name);
-                item = snewn(9+strlen(thegame.name), char); /*ick*/
+                item = snewn(10+strlen(thegame.name), char); /*ick*/
                 sprintf(item, "&Help on %s", thegame.name);
                 AppendMenu(menu, MF_ENABLED, IDM_GAMEHELP, item);
                 sfree(item);
@@ -2222,7 +2222,7 @@ static void about(frontend *fe)
 
     y += height/2;		       /* extra space before OK */
     mkctrl(fe, width*2, maxwid+width*2, y, y+height*7/4, "BUTTON",
-	   BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
+	   BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
 	   "OK", IDOK);
 
     SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);
@@ -2465,10 +2465,10 @@ static int get_config(frontend *fe, int which)
 
     y += height/2;		       /* extra space before OK and Cancel */
     mkctrl(fe, col1l, (col1l+col2r)/2-width, y, y+height*7/4, "BUTTON",
-	   BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
+	   BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
 	   "OK", IDOK);
     mkctrl(fe, (col1l+col2r)/2+width, col2r, y, y+height*7/4, "BUTTON",
-	   BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP, 0, "Cancel", IDCANCEL);
+	   BS_PUSHBUTTON | WS_TABSTOP, 0, "Cancel", IDCANCEL);
 
     SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);