--- np2/win9x/dialog/d_about.cpp 2003/10/30 12:45:38 1.3 +++ np2/win9x/dialog/d_about.cpp 2004/01/22 01:10:05 1.6 @@ -5,6 +5,7 @@ #include "np2info.h" #include "dialog.h" #include "dialogs.h" +#include "np2ver.h" #include "pccore.h" @@ -28,24 +29,31 @@ static const char np2infostr[] = static void about_init(HWND hWnd) { char work[128]; - RECT rect; + RECT rectwindow; + RECT rectclient; POINT pt; RECT parent; milstr_ncpy(work, str_np2title, sizeof(work)); milstr_ncat(work, np2version, sizeof(work)); +#if defined(NP2VER_WIN9X) + milstr_ncat(work, NP2VER_WIN9X, sizeof(work)); +#endif SetDlgItemText(hWnd, IDC_NP2VER, work); - GetWindowRect(hWnd, &rect); - aboutsize.cx = rect.right - rect.left; - aboutsize.cy = rect.bottom - rect.top; + GetWindowRect(hWnd, &rectwindow); + GetClientRect(hWnd, &rectclient); + aboutsize.cx = rectwindow.right - rectwindow.left; + aboutsize.cy = rectwindow.bottom - rectwindow.top; pt.x = 0; pt.y = 0; ClientToScreen(GetParent(hWnd), &pt); GetClientRect(GetParent(hWnd), &parent); np2class_move(hWnd, pt.x + ((parent.right - parent.left - aboutsize.cx) / 2), - pt.y + ((parent.bottom - parent.top - 84) / 2), - aboutsize.cx, 84); + pt.y + ((parent.bottom - parent.top - aboutsize.cy) / 2), + aboutsize.cx, + aboutsize.cy + 60 - (rectclient.bottom - rectclient.top)); + SetFocus(GetDlgItem(hWnd, IDOK)); }