Enable better build-time flexibility over which WinSock to include

[u/mdw/putty] / windlg.c

diff --git a/windlg.c b/windlg.c
index 9db775f..77db051 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -1,7 +1,13 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <commdlg.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
 #include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -478,6 +484,7 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg,
            DialogBox (hinst, MAKEINTRESOURCE(IDD_LICENCEBOX),
                       NULL, LicenceProc);
            EnableWindow(hwnd, 1);
+            SetActiveWindow(hwnd);
            return 0;
        }
        return 0;
@@ -1467,6 +1474,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
        DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
                  GetParent(hwnd), AboutProc);
        EnableWindow(hwnd, 1);
+        SetActiveWindow(hwnd);
     }
     return GenericMainDlgProc (hwnd, msg, wParam, lParam,
                               MAIN_NPANELS, mainp, &page);