Changeset 1402 for trunk/src/comctl32/toolbar.c

Timestamp:

Oct 22, 1999, 8:04:13 PM (26 years ago)

Author:

sandervl

Message:

Fixes + native win32 resources

File:

• trunk/src/comctl32/toolbar.c (modified) (4 diffs)

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.14 1999-10-14 09:21:14 sandervl Exp $ */
+/* $Id: toolbar.c,v 1.15 1999-10-22 18:04:13 sandervl Exp $ */
 /*
  * Toolbar control
@@ -30 +30 @@
   - IMAGELIST_Draw draws a line too at the bottom of the bitmap (toolbar.exe)
     imagelist uses default size values instead of real bitmap values
-  - LoadBitmapA -> use NativeLoadBitmap, is OS/2 bitmap resource
 */
 
@@ -2111 +2110 @@
     SendMessageA (infoPtr->hwndNotify,WM_NOTIFY,(WPARAM)nmhdr.idFrom,(LPARAM)&nmhdr);
 
-    //load OS/2 dialog
-
-    ret = NativeDlgBoxIP(COMCTL32_hModule,
-                         GetWindowLongA(hwnd,GWL_HINSTANCE),
-                         MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
-                         hwnd,
-                         (DLGPROC)TOOLBAR_CustomizeDialogProc,
-                         (LPARAM)infoPtr);
-
-    if (ret == (INT)-1) ret = 0;
-
-/* //original WINE code
     if (!(hRes = FindResourceA (COMCTL32_hModule,
                                 MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
@@ -2136 +2123 @@
                                    (DLGPROC)TOOLBAR_CustomizeDialogProc,
                                    (LPARAM)infoPtr);
-*/
 
     /* send TBN_ENDADJUST notification */