Ignore:
Timestamp:
Oct 2, 2023, 11:34:35 PM (23 months ago)
Author:
gyoung
Message:

Remaining changes from merge with Lars 2.9 branch

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/classes/mm-progs/mmfind/image.c

    r4 r104  
    2626    POINTL aptl[4];
    2727    HPS    hps;
    28     BOOL   bReturnCode;
    2928    ULONG  ulHeight;
    3029    ULONG  ulWidth;
     
    3736     *  Get position of image frame
    3837     */
    39     bReturnCode = WinQueryWindowPos ( hwnd, &swp);
     38    WinQueryWindowPos ( hwnd, &swp);
    4039
    4140    WinQueryWindowRect(hwnd, &rectl);
     
    4847        aptl[0].x=(swp.cx-ulWidth)/2;
    4948        aptl[1].x=aptl[0].x+ulWidth;
    50        
     49
    5150        aptl[0].y=(swp.cy-ulHeight)/2;
    5251        aptl[1].y=aptl[0].y+ulHeight;
     
    6261      aptl[0].x=(swp.cx-ulWidth*fRes)/2;
    6362      aptl[1].x=aptl[0].x+ulWidth*fRes;
    64      
     63
    6564      aptl[0].y=(swp.cy-ulHeight*fRes)/2;
    6665      aptl[1].y=aptl[0].y+ulHeight*fRes;
    6766    }
    68    
     67
    6968    aptl[2].x = 0;              // source lower left
    7069    aptl[2].y = 0;
    71    
     70
    7271    aptl[3].x = ulWidth;   // source upper right
    7372    aptl[3].y = ulHeight;
     
    8988    //       WinDrawBitmap(hps, hBitmap, NULLHANDLE, (PPOINTL)aptl, 0, 0, DBM_NORMAL/*|DBM_STRETCH*/);
    9089#endif
    91     bReturnCode = WinEndPaint (hps);
     90    WinEndPaint (hps);
    9291}
    9392
     
    9695
    9796  switch (msg)
    98     {     
     97    {
    9998    case WM_PAINT:
    10099      {
     
    276275        return(0L);
    277276      }
    278    
     277
    279278
    280279    // ***************************************************
     
    282281    // the memory device context obtained above.
    283282    // ***************************************************
    284    
     283
    285284    ImageSize.cx = dwWidth;
    286285    ImageSize.cy = dwHeight;
     
    300299                       (ULONG) MB_OK | MB_MOVEABLE |
    301300                       MB_ERROR );
    302 #endif   
     301#endif
    303302        DevCloseDC(hdc);
    304303        DosFreeMem(pRowBuffer);
Note: See TracChangeset for help on using the changeset viewer.