Changeset 3250 for trunk/src/shell32/shell32_main.cpp

Timestamp:

Mar 27, 2000, 5:09:22 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/shell32/shell32_main.cpp (modified) (10 diffs)

trunk/src/shell32/shell32_main.cpp

@@ -1 @@
-/* $Id: shell32_main.cpp,v 1.9 2000-03-26 16:34:49 cbratschi Exp $ */
+/* $Id: shell32_main.cpp,v 1.10 2000-03-27 15:09:21 cbratschi Exp $ */
 
 /*
@@ -420 +420 @@
 #define     IDC_STATIC_TEXT                 100
 #define     IDC_LISTBOX                     99
-#define     IDC_WINE_TEXT                   98
+#define     IDC_ODIN_TEXT                   98
 
 #define     DROP_FIELD_TOP                  (-15)
@@ -430 +430 @@
 
 static BOOL __get_dropline( HWND hWnd, LPRECT lprect )
-{ HWND hWndCtl = GetDlgItem(hWnd, IDC_WINE_TEXT);
+{ HWND hWndCtl = GetDlgItem(hWnd, IDC_ODIN_TEXT);
     if( hWndCtl )
   { GetWindowRect( hWndCtl, lprect );
@@ -705 +705 @@
             hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
             SendMessageA( hWndCtl, WM_SETREDRAW, 0, 0 );
-#if 0 //CB: not used
+#if 0 //CB: not used (hIconTitleFont not valid!!!), default font is ok
             SendMessageA( hWndCtl, WM_SETFONT, hIconTitleFont, 0 );
 #endif
@@ -733 +733 @@
    }
 
-#if 0
-// @@@PH turned off
     case WM_LBTRACKPOINT:
    hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
@@ -750 +748 @@
          SendMessageA( hWndCtl, LB_DELETESTRING, (WPARAM)idx, 0 );
          UpdateWindow( hWndCtl );
-   //@@@PH DragObject16 experimentally replaced by DragObject
+
          if( !DragObject(hWnd, hWnd, DRAGOBJ_DATA, hMemObj, hCursor) )
              SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)pstr );
@@ -763 +761 @@
     case WM_QUERYDROPOBJECT:
    if( wParam == 0 )
-      { LPDRAGINFO lpDragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN((SEGPTR)lParam);
+      { LPDRAGINFO lpDragInfo = (LPDRAGINFO)lParam;
        if( lpDragInfo && lpDragInfo->wFlags == DRAGOBJ_DATA )
         { RECT rect;
@@ -782 +780 @@
     case WM_DROPOBJECT:
    if( wParam == hWnd )
-      { LPDRAGINFO lpDragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN((SEGPTR)lParam);
+      { LPDRAGINFO lpDragInfo = (LPDRAGINFO)lParam;
        if( lpDragInfo && lpDragInfo->wFlags == DRAGOBJ_DATA && lpDragInfo->hList )
         { char* pstr = (char*)GlobalLock( (HGLOBAL)(lpDragInfo->hList) );
@@ -788 +786 @@
           { static char __appendix_str[] = " with";
 
-          hWndCtl = GetDlgItem( hWnd, IDC_WINE_TEXT );
+          hWndCtl = GetDlgItem( hWnd, IDC_ODIN_TEXT );
           SendMessageA( hWndCtl, WM_GETTEXT, 512, (LPARAM)Template );
-          if( !strncmp( Template, "WINE", 4 ) )
+          if( !strncmp( Template, "ODIN", 4 ) )
          SetWindowTextA( GetDlgItem(hWnd, IDC_STATIC_TEXT), Template );
           else
@@ -808 +806 @@
    }
    break;
-#endif
-
 
     case WM_COMMAND: