pull up r19468 from trunk

 r19468@cathode-dark-space:  jaltman | 2007-04-13 16:42:08 -0400
 ticket: new
 subject: Add vertical scrollbars to realm fields in dialogs
 component: windows
 tags: pullup

 The obtain new credentials dialog and the change password
 dialog provide a "Realm" combo-box.  These controls were
 not configured to display a vertical scroll bar if there
 were more than five realms in the list.

 Version number remains 1.2.0.2

ticket: 5528
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19482 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/identity/plugins/krb5/krb5identpro.c b/src/windows/identity/plugins/krb5/krb5identpro.c
index 834d94296c9aa4b3a23d4e890d4e40557c4f3aab..0072b967d27c873a6ecfacb397ee547e624077fa 100644 (file)
--- a/src/windows/identity/plugins/krb5/krb5identpro.c
+++ b/src/windows/identity/plugins/krb5/krb5identpro.c
@@ -461,7 +461,7 @@ ui_cb(khui_new_creds * nc,
                 (L"COMBOBOX",\r
                  L"",\r
                  CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | \r
-                 WS_CHILD | WS_VISIBLE | WS_TABSTOP,\r
+                 WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL,\r
                  0, 0, 100, 100, /* bogus values */\r
                  hw_parent,\r
                  (HMENU) K5_NCID_UN,\r
@@ -502,7 +502,7 @@ ui_cb(khui_new_creds * nc,
                 (L"COMBOBOX",\r
                  L"",\r
                  CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | \r
-                 WS_CHILD | WS_VISIBLE | WS_TABSTOP,\r
+                 WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL,\r
                  0, 0, 100, 100, /* bogus */\r
                  hw_parent,\r
                  (HMENU) K5_NCID_REALM,\r