From c4e2fc7980d0474bfeef029110d507bb606c619d Mon Sep 17 00:00:00 2001
From: dcherepanov <unknown>
Date: Fri, 26 Nov 2010 15:07:53 +0300
Subject: [PATCH] 6770017: PIT :
 java/awt/Choice/BlockedWin32Choice/BlockedWin32Choice.java fails on 6u12 b01
 pit build Reviewed-by: art

---
 src/windows/native/sun/windows/awt_Choice.cpp | 8 +++++---
 src/windows/native/sun/windows/awt_Choice.h   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/windows/native/sun/windows/awt_Choice.cpp b/src/windows/native/sun/windows/awt_Choice.cpp
index 8c1621afe..e8296d4c5 100644
--- a/src/windows/native/sun/windows/awt_Choice.cpp
+++ b/src/windows/native/sun/windows/awt_Choice.cpp
@@ -86,6 +86,7 @@ static const UINT MINIMUM_NUMBER_OF_VISIBLE_ITEMS = 8;
 AwtChoice::AwtChoice() {
     m_hList = NULL;
     m_listDefWindowProc = NULL;
+    m_selectedItem = -1;
 }
 
 LPCTSTR AwtChoice::GetClassName() {
@@ -437,9 +438,10 @@ LRESULT CALLBACK AwtChoice::ListWindowProc(HWND hwnd, UINT message,
 MsgRouting AwtChoice::WmNotify(UINT notifyCode)
 {
     if (notifyCode == CBN_SELCHANGE) {
-        int itemSelect = (int)SendMessage(CB_GETCURSEL);
-        if (itemSelect != CB_ERR){
-            DoCallback("handleAction", "(I)V", itemSelect);
+        int selectedItem = (int)SendMessage(CB_GETCURSEL);
+        if (selectedItem != CB_ERR && m_selectedItem != selectedItem){
+            m_selectedItem = selectedItem;
+            DoCallback("handleAction", "(I)V", selectedItem);
         }
     } else if (notifyCode == CBN_DROPDOWN) {
 
diff --git a/src/windows/native/sun/windows/awt_Choice.h b/src/windows/native/sun/windows/awt_Choice.h
index 4852301bb..ad0a21d23 100644
--- a/src/windows/native/sun/windows/awt_Choice.h
+++ b/src/windows/native/sun/windows/awt_Choice.h
@@ -94,6 +94,7 @@ private:
     static BOOL sm_isMouseMoveInList;
     HWND m_hList;
     WNDPROC m_listDefWindowProc;
+    int m_selectedItem;
     static LRESULT CALLBACK ListWindowProc(HWND hwnd, UINT message,
                                            WPARAM wParam, LPARAM lParam);
 };
-- 
GitLab