Changeset 7815 for trunk/src/comctl32/comboex.c

Timestamp:

Feb 6, 2002, 6:23:21 PM (24 years ago)

Author:

sandervl

Message:

Wine updates

File:

• trunk/src/comctl32/comboex.c (modified) (10 diffs)

trunk/src/comctl32/comboex.c

@@ -52 +52 @@
  *  mod 4
  *   1. Implemented CBN_SELCHANGE, CBN_KILLFOCUS, and CBN_SELENDOK.
- *   2. Fix putting text in CBEN_ENDEDIT notifys for CBN_DROPDOWN case.
+ *   2. Fix putting text in CBEN_ENDEDIT notifies for CBN_DROPDOWN case.
  *   3. Lock image selected status to focus state of edit control if
  *      edit control exists. Mimics native actions.
@@ -87 +87 @@
 #include "debugtools.h"
 #include "wine/unicode.h"
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#define inline
-#endif
 
 DEFAULT_DEBUG_CHANNEL(comboex);
@@ -116 +112 @@
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
     HIMAGELIST   himl;
     HWND         hwndSelf;         /* my own hwnd */
@@ -128 +121 @@
     INT          selected;         /* index of selected item */
     DWORD        flags;            /* WINE internal flags */
-#ifdef __WIN32OS2__
     HFONT        hDefaultFont;
-#endif
     HFONT        font;
-
     INT          nb_items;         /* Number of items */
     BOOL         bUnicode;        /* TRUE if this window is Unicode   */
@@ -543 +533 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    TRACE("-- 0x%p\n", infoPtr->himl);
+    TRACE("-- %p\n", infoPtr->himl);
 
     return (LRESULT)infoPtr->himl;
@@ -1099 +1089 @@
 
     /* allocate memory for info structure */
-#ifdef __WIN32OS2__
-    infoPtr = (COMBOEX_INFO*)initControl(hwnd,sizeof(COMBOEX_INFO));
-#else
     infoPtr = (COMBOEX_INFO *)COMCTL32_Alloc (sizeof(COMBOEX_INFO));
-#endif
     if (infoPtr == NULL) {
         ERR("could not allocate info memory!\n");
@@ -1225 +1211 @@
         SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
                                &mylogfont, 0);
-#ifdef __WIN32OS2__
         infoPtr->font = infoPtr->hDefaultFont = CreateFontIndirectA (&mylogfont);
-#else
-        infoPtr->font = CreateFontIndirectA (&mylogfont);
-#endif
     }
     SendMessageW (infoPtr->hwndCombo, WM_SETFONT, (WPARAM)infoPtr->font, 0);
@@ -1460 +1442 @@
           dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
 
-    if ((dis->itemID >= infoPtr->nb_items) || (dis->itemID < 0)) return FALSE;
+    if (dis->itemID >= infoPtr->nb_items) return FALSE;
 
     olditem = infoPtr->items;
@@ -1770 +1752 @@
     }
 
-#ifdef __WIN32OS2__
-    //NEVER delete the font object received by WM_SETFONT!
     if (infoPtr->hDefaultFont) DeleteObject (infoPtr->hDefaultFont);
-#else
-    DeleteObject (infoPtr->font);
-#endif
 
     /* free comboex info data */
@@ -2474 +2451 @@
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                      uMsg, wParam, lParam);
-#ifdef __WIN32OS2__
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-#else
             return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-#endif
     }
     return 0;