Changeset 3182 for trunk/src/comctl32/comboex.cpp

Timestamp:

Mar 21, 2000, 6:30:46 PM (25 years ago)

Author:

cbratschi

Message:

bug fixes and improvements

File:

• trunk/src/comctl32/comboex.cpp (modified) (11 diffs)

trunk/src/comctl32/comboex.cpp

@@ -1 @@
-/* $Id: comboex.cpp,v 1.2 2000-02-25 17:00:15 cbratschi Exp $ */
+/* $Id: comboex.cpp,v 1.3 2000-03-21 17:30:40 cbratschi Exp $ */
 /*
  * ComboBoxEx control
@@ -39 +39 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-//    TRACE (comboex, "\n");
-
     return (LRESULT)infoPtr->hwndCombo;
 }
@@ -53 +51 @@
         return 0;
 
-//    TRACE (comboex, "-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
-
     return (LRESULT)GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT);
 }
@@ -73 +69 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
-
     return (LRESULT)infoPtr->himl;
 }
@@ -81 +75 @@
 
 
-static LRESULT
-COMBOEX_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_InsertItem(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL unicode)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
@@ -98 +91 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
     DWORD dwTemp;
-
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
 
     dwTemp = infoPtr->dwExtStyle;
@@ -121 +112 @@
     HIMAGELIST himlTemp;
 
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
-
     himlTemp = infoPtr->himl;
     infoPtr->himl = (HIMAGELIST)lParam;
@@ -130 +119 @@
 
 
-static LRESULT
-COMBOEX_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_SetItem(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL unicode)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
@@ -139 +127 @@
     return TRUE;
 }
-
-
-/* << COMBOEX_SetItem32W >> */
 
 
@@ -242 +227 @@
 /*      case CBEM_GETITEM32A:
         case CBEM_GETITEM32W:
-        case CBEM_GETUNICODEFORMAT:
         case CBEM_HASEDITCHANGED:
 */
 
         case CBEM_INSERTITEMA:
-            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_INSERTITEM32W: */
+            return COMBOEX_InsertItem(hwnd,wParam,lParam,FALSE);
+
+        case CBEM_INSERTITEMW:
+            return COMBOEX_InsertItem(hwnd,wParam,lParam,TRUE);
 
         case CBEM_SETEXTENDEDSTYLE:
@@ -258 +243 @@
 
         case CBEM_SETITEMA:
-            return COMBOEX_SetItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_SETITEM32W:
-        case CBEM_SETUNICODEFORMAT:
-*/
+            return COMBOEX_SetItem(hwnd,wParam,lParam,FALSE);
+
+        case CBEM_SETITEMW:
+            return COMBOEX_SetItem(hwnd,wParam,lParam,TRUE);
 
         case CB_DELETESTRING: