Changeset 9524 for trunk/src/user32/combo.c

Timestamp:

Dec 18, 2002, 2:10:08 PM (23 years ago)

Author:

sandervl

Message:

Merged our changes/fixes

File:

• trunk/src/user32/combo.c (modified) (2 diffs)

trunk/src/user32/combo.c

@@ -1252 +1252 @@
        }
    }
+#ifdef __WIN32OS2__
+   //@PF Of course when we rollup box it is time to sync it with listview.
+   //Obvious Wine bug and even not fixed in latest versions.
+   if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
+   {
+       lphc->droppedIndex = CBUpdateLBox( lphc,TRUE );
+   }
+   else
+   {
+       lphc->droppedIndex = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
+
+       if( lphc->droppedIndex == LB_ERR )
+         lphc->droppedIndex = 0;
+   }
+#endif
 }
 
@@ -1270 +1285 @@
    return TRUE;
 }
+
+#ifdef __WIN32OS2__
+/***********************************************************************
+ *           COMBO_RollupListbox
+ *
+ * @@PF Odin specific function. 
+ */
+BOOL COMBO_RollupListbox( LPHEADCOMBO lphc)
+{
+   if(lphc->wState & CBF_DROPPED)
+   {
+       CBRollUp( lphc, FALSE, FALSE);
+       return TRUE;
+   }
+   return FALSE;
+}
+#endif
 
 /***********************************************************************