Changeset 1425 for trunk/src


Ignore:
Timestamp:
Oct 24, 1999, 1:05:05 AM (26 years ago)
Author:
sandervl
Message:

Combobox + windowpos changes + fixes

Location:
trunk/src/user32
Files:
2 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32

    • Property svn:ignore set to
      user32.lrf
      user32exp.def
      resource.asm

  • trunk/src/user32/Makefile

    r1408 r1425  
    1 # $Id: Makefile,v 1.34 1999-10-23 10:21:43 sandervl Exp $
     1# $Id: Makefile,v 1.35 1999-10-23 23:04:31 sandervl Exp $
    22
    33#
    … …  
    1919CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2020
     21RC = $(PDWIN32_TOOLS)\wrc
     22RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
    2123
    2224TARGET = user32
    … …  
    3436        oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj win32wmdichild.obj \
    3537        winprop.obj wingdi.obj oslibgdi.obj winaccel.obj win32wbasepos.obj \
    36         nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
    37         caret.obj \
     38        oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
     39        caret.obj resource.obj \
    3840        windlgmsg.obj windlg.obj win32wdesktop.obj
    3941
    … …  
    4244
    4345
    44 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).res $(TARGET).lrf
     46$(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).lrf
    4547!ifdef DEBUG
    4648#       icc -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /NOFREE" @$(TARGET).lrf
    … …  
    4951        ilink /map  /noe /NOD /NoLogo /FREE @$(TARGET).lrf
    5052!endif
    51         rc $(TARGET).res $(TARGET).dll
    5253        $(CP) $@ $(PDWIN32_BIN)
    5354
    … …  
    6566<<keep
    6667
    67 $(TARGET).res:
    68         rc -r user32.rc user32.res
    69 
    7068$(TARGET).lib: $(TARGET)exp.def
    7169        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    … …  
    7573        $(IMPDEF) $** $@
    7674
     75
     76resource.asm: user32.rc
     77    $(RC) $(RCFLAGS) -o resource.asm user32.rc
     78
     79resource.obj: resource.asm
    7780
    7881user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
    … …  
    8891defwndproc.obj: defwndproc.cpp syscolor.h win32wmdiclient.h win32wbase.h win32wnd.h win32dlg.h
    8992hooks.obj: hooks.cpp hooks.h
    90 initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\spy.h pmwindow.h heapshared.h
     93initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\spy.h pmwindow.h heapshared.h initterm.h
    9194uitools.obj: uitools.cpp win32wbase.h
    9295unknown.obj: unknown.cpp
    … …  
    9699
    97100controls.obj: controls.cpp controls.h win32wmdiclient.h win32dlg.h win32wdesktop.h
    98 button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
    99 static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
     101button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h initterm.h
     102static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h initterm.h
    100103scroll.obj: scroll.cpp $(PDWIN32_INCLUDE)\win\scroll.h win32wbase.h oslibwin.h
    101104listbox.obj: listbox.cpp $(PDWIN32_INCLUDE)\win\combo.h
    102 combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h
     105combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h initterm.h
    103106edit.obj: edit.cpp $(PDWIN32_INCLUDE)\win\combo.h
    104 
    105 nativerc.obj: nativerc.cpp
    106107
    107108msgbox.obj:    msgbox.cpp

  • trunk/src/user32/USER32.DEF

    r1405 r1425  
    1 ; $Id: USER32.DEF,v 1.15 1999-10-22 18:11:41 sandervl Exp $
     1; $Id: USER32.DEF,v 1.16 1999-10-23 23:04:32 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    … …  
    628628; Wine helper function
    629629    GetSysColorPen              = _GetSysColorPen@4              @2002
    630 ; COMCTL32 helper functions
    631     NativeLoadBitmap           = _NativeLoadBitmap@8         @2005
    632630
    633631    Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006

  • trunk/src/user32/button.cpp

    r1368 r1425  
    1 /* $Id: button.cpp,v 1.13 1999-10-20 06:38:08 sandervl Exp $ */
     1/* $Id: button.cpp,v 1.14 1999-10-23 23:04:32 sandervl Exp $ */
    22/* File: button.cpp -- Button type widgets
    33 *
    … …  
    1717#include "button.h"
    1818#include <misc.h>
     19#include "initterm.h"
    1920
    2021//Prototypes
    … …  
    128129  {
    129130    BITMAP bmp;
    130     HINSTANCE hinst;
    131 
    132     //CB: Open32 hack to load our own bitmap
    133     hinst = LoadLibraryA("USER32.DLL");
    134     hbitmapCheckBoxes = NativeLoadBitmap(hinst,MAKEINTRESOURCEA(OBM_CHECKBOXES));
    135     FreeLibrary(hinst);
     131
     132    hbitmapCheckBoxes = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_CHECKBOXES));
     133    GetObjectA( hbitmapCheckBoxes, sizeof(bmp), &bmp );
    136134    if (GetObjectA(hbitmapCheckBoxes,sizeof(bmp),&bmp))
    137135    {

  • trunk/src/user32/combo.cpp

    r1391 r1425  
    1 /* $Id: combo.cpp,v 1.8 1999-10-21 12:19:26 sandervl Exp $ */
     1/* $Id: combo.cpp,v 1.9 1999-10-23 23:04:33 sandervl Exp $ */
    22/*
    33 * Combo controls
    … …  
    1515#include "controls.h"
    1616#include "combo.h"
     17#include "initterm.h"
    1718
    1819  /* bits in the dwKeyData */
    … …  
    6061  {
    6162    BOOL      bRet = FALSE;
    62     HINSTANCE hinst;
    63 
    64     //CB: Open32 hack to load our own bitmap
    65     hinst = LoadLibraryA("USER32.DLL");
    66     hComboBmp = NativeLoadBitmap(0,MAKEINTRESOURCEA(OBM_COMBO));
    67     FreeLibrary(hinst);
     63
     64//SvL: Combo bitmap is invalid
     65    hComboBmp = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_COMBO));
     66//    hComboBmp = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_COMBO));
    6867    if(hComboBmp)
    6968    {
    … …  
    165164{
    166165  RECT windowRect;
    167 
    168   //SvL: Doesn't work for us
    169   return;
    170166
    171167  GetWindowRect(CB_HWND(lphc), &windowRect);
    … …  
    17211717       }
    17221718       ReleaseCapture();
    1723        SetCapture(lphc->hWndLBox);
     1719//SvL: Don't set the capture here. Otherwise other controls don't respond the first time!
     1720//       SetCapture(lphc->hWndLBox);
    17241721   }
    17251722

  • trunk/src/user32/edit.cpp

    r1368 r1425  
    1 /* $Id: edit.cpp,v 1.6 1999-10-20 06:38:09 sandervl Exp $ */
     1/* $Id: edit.cpp,v 1.7 1999-10-23 23:04:33 sandervl Exp $ */
    22/*
    33 *      Edit control
    … …  
    1414/*
    1515 *      please read EDIT.TODO (and update it when you change things)
    16   CB:
    17    - OS/2 menu not implemented (WM_CONTEXTMENU)
    1816 */
    1917
    … …  
    26702668static void EDIT_WM_ContextMenu(HWND hwnd, EDITSTATE *es, HWND hwndBtn, INT x, INT y)
    26712669{
    2672 //CB: implement native menu!
    26732670        HMENU menu = LoadMenuA(GetModuleHandleA("USER32"), "EDITMENU");
    26742671        HMENU popup = GetSubMenu(menu, 0);

  • trunk/src/user32/initterm.cpp

    r1378 r1425  
    1 /* $Id: initterm.cpp,v 1.12 1999-10-20 16:27:00 cbratschi Exp $ */
     1/* $Id: initterm.cpp,v 1.13 1999-10-23 23:04:34 sandervl Exp $ */
    22
    33/*
    … …  
    4141#include "win32wdesktop.h"
    4242#include "syscolor.h"
     43#include "initterm.h"
    4344
    4445/*-------------------------------------------------------------------*/
    … …  
    5455void CDECL _ctordtorInit( void );
    5556void CDECL _ctordtorTerm( void );
     57
     58 //Win32 resource table (produced by wrc)
     59 extern DWORD _Resource_PEResTab;
    5660}
    5761
     62DWORD hInstanceUser32 = 0;
    5863
    5964/****************************************************************************/
    … …  
    8388         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    8489
    85          if(RegisterLxDll(hModule, 0, 0) == FALSE)
     90         hInstanceUser32 = RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab);
     91         if(hInstanceUser32 == 0)
    8692                return 0UL;
    8793

  • trunk/src/user32/loadres.cpp

    r1299 r1425  
    1 /* $Id: loadres.cpp,v 1.9 1999-10-14 19:31:29 sandervl Exp $ */
     1/* $Id: loadres.cpp,v 1.10 1999-10-23 23:04:35 sandervl Exp $ */
    22
    33/*
    … …  
    3434    if(winres == NULL) {
    3535        dprintf(("LoadStringA NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
     36        *lpBuffer = 0;
    3637        return 0;
    3738    }
    … …  
    6162    if(winres == NULL) {
    6263        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
     64        *lpBuffer = 0;
    6365        return 0;
    6466    }
    … …  
    328330        hBitmap = O32_LoadBitmap(hinst, lpszBitmap);
    329331  }
    330   else {
     332  if(!hBitmap) {
    331333        hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
    332334  }
    … …  
    345347        hBitmap = O32_LoadBitmap(hinst, (LPCSTR)lpszBitmap);
    346348  }
    347   else {
     349  if(!hBitmap) {
    348350        if(HIWORD(lpszBitmap) != 0) {
    349351                 lpszBitmap = (LPWSTR)UnicodeToAsciiString((LPWSTR)lpszBitmap);
    … …  
    368370 HANDLE hRet = 0;
    369371
    370   dprintf(("LoadImageA NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
     372  if(HIWORD(lpszName)) {
     373        dprintf(("LoadImageA NOT COMPLETE %x %s %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
     374  }
     375  else  dprintf(("LoadImageA NOT COMPLETE %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
    371376
    372377  if (fuLoad & LR_DEFAULTSIZE) {

  • trunk/src/user32/oslibwin.cpp

    r1405 r1425  
    1 /* $Id: oslibwin.cpp,v 1.34 1999-10-22 18:11:45 sandervl Exp $ */
     1/* $Id: oslibwin.cpp,v 1.35 1999-10-23 23:04:35 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    512512    WinQueryWindowPos(hFrame, &swpFrame);
    513513
    514     if ( fuFlags & SWP_NOADJUST) {
    515         WinQueryWindowPos(WinWindowFromID(hFrame, FID_CLIENT), &swpClient);
    516         x  = swpClient.x;
    517         cx = swpClient.cx;
    518         y  = swpClient.y;
    519         cy = swpClient.cy;
    520     }
    521 
    522514    if(fuFlags & (SWP_MOVE | SWP_SIZE))
    523515    {
    … …  
    709701         }
    710702      }
     703
     704      if (flags & SWP_SIZE)
     705      {
     706         if (cy != pswpOld->cy)
     707            flags |= SWP_MOVE;
     708      }
     709      else
     710      {
     711         cx = pswpOld->cx;
     712         cy = pswpOld->cy;
     713      }
     714      y  = parentHeight - y - cy;
     715
     716
     717       if ((pswpOld->x == x) && (pswpOld->y == y))
     718         flags &= ~SWP_MOVE;
     719
     720      if ((pswpOld->cx == cx) && (pswpOld->cy == cy))
     721         flags &= ~SWP_SIZE;
     722   }
     723
     724   pswp->fl               = flags;
     725   pswp->cy               = cy;
     726   pswp->cx               = cx;
     727   pswp->x                = x;
     728   pswp->y                = y;
     729   pswp->hwndInsertBehind = hWinAfter;
     730   pswp->hwnd             = hWindow;
     731   pswp->ulReserved1      = 0;
     732   pswp->ulReserved2      = 0;
     733}
     734//******************************************************************************
     735//Position in screen coordinates
     736//******************************************************************************
     737void OSLibMapWINDOWPOStoSWPFrame(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame)
     738{
     739 BOOL fCvt = FALSE;
     740
     741   HWND hWnd            = pwpos->hwnd;
     742   HWND hWndInsertAfter = pwpos->hwndInsertAfter;
     743   long x               = pwpos->x;
     744   long y               = pwpos->y;
     745   long cx              = pwpos->cx;
     746   long cy              = pwpos->cy;
     747   UINT fuFlags         = pwpos->flags;
     748   ULONG parentHeight;
     749   POINTL point;
     750
     751   HWND  hWinAfter;
     752   ULONG flags = 0;
     753   HWND  hWindow = hWnd ? (HWND)hWnd : HWND_DESKTOP;
     754
     755   if (hWndInsertAfter == HWND_TOPMOST_W)
     756//      hWinAfter = HWND_TOPMOST;
     757      hWinAfter = HWND_TOP;
     758   else if (hWndInsertAfter == HWND_NOTOPMOST_W)
     759//      hWinAfter = HWND_NOTOPMOST;
     760      hWinAfter = HWND_TOP;
     761   else if (hWndInsertAfter == HWND_TOP_W)
     762      hWinAfter = HWND_TOP;
     763   else if (hWndInsertAfter == HWND_BOTTOM_W)
     764      hWinAfter = HWND_BOTTOM;
     765   else
     766      hWinAfter = (HWND) hWndInsertAfter;
     767
     768   if (!(fuFlags & SWP_NOSIZE_W    )) flags |= SWP_SIZE;
     769   if (!(fuFlags & SWP_NOMOVE_W    )) flags |= SWP_MOVE;
     770   if (!(fuFlags & SWP_NOZORDER_W  )) flags |= SWP_ZORDER;
     771   if (  fuFlags & SWP_NOREDRAW_W  )  flags |= SWP_NOREDRAW;
     772   if (!(fuFlags & SWP_NOACTIVATE_W)) flags |= SWP_ACTIVATE;
     773   if (  fuFlags & SWP_SHOWWINDOW_W)  flags |= SWP_SHOW;
     774   if (  fuFlags & SWP_HIDEWINDOW_W)  flags |= SWP_HIDE;
     775   if (  fuFlags & SWP_NOSENDCHANGING_W) flags |= SWP_NOADJUST;
     776
     777   if (flags & (SWP_MOVE | SWP_SIZE))
     778   {
     779      point.x = x;
     780      point.y = y;
     781
     782      if(hParent) {
     783            parentHeight = OSLibGetWindowHeight(hParent);
     784
     785            point.y = ScreenHeight - point.y - cy;
     786            WinMapWindowPoints(HWND_DESKTOP, hParent, &point, 1);
     787            point.y = parentHeight - point.y - cy;
     788      }
     789      else  parentHeight = ScreenHeight;
     790
     791      x  = point.x;
     792      y  = point.y;
    711793
    712794      if (flags & SWP_SIZE)

  • trunk/src/user32/oslibwin.h

    r1405 r1425  
    1 /* $Id: oslibwin.h,v 1.19 1999-10-22 18:11:46 sandervl Exp $ */
     1/* $Id: oslibwin.h,v 1.20 1999-10-23 23:04:36 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    250250void  OSLibMapSWPtoWINDOWPOSFrame(PSWP pswp, struct tagWINDOWPOS *pwpos, PSWP pswpOld, HWND hParent, HWND hFrame);
    251251void  OSLibMapWINDOWPOStoSWP(struct tagWINDOWPOS *pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame);
     252void  OSLibMapWINDOWPOStoSWPFrame(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame);
    252253
    253254HWND  OSLibWinBeginEnumWindows(HWND hwnd);

  • trunk/src/user32/pmframe.cpp

    r1408 r1425  
    1 /* $Id: pmframe.cpp,v 1.10 1999-10-23 10:21:43 sandervl Exp $ */
     1/* $Id: pmframe.cpp,v 1.11 1999-10-23 23:04:36 sandervl Exp $ */
    22/*
    33 * Win32 Frame Managment Code for OS/2
    … …  
    2727#define PMFRAMELOG
    2828
     29//******************************************************************************
     30//******************************************************************************
    2931VOID Draw3DRect(HPS hps,RECTL rect,LONG colorBR,LONG colorTL)
    3032{
    … …  
    4749  GpiLine(hps,&point);
    4850}
    49 
     51//******************************************************************************
     52//******************************************************************************
    5053VOID DeflateRect(RECTL *rect)
    5154{
    … …  
    5558  rect->yBottom++;
    5659}
    57 
     60//******************************************************************************
     61//******************************************************************************
    5862VOID DrawFrame(HPS hps,RECTL *rect,Win32BaseWindow *win32wnd)
    5963{
    … …  
    7377    DeflateRect(rect);
    7478    Draw3DRect(hps,*rect,clrLight,clrBlack);
    75   } else if (dwExStyle & WS_EX_DLGMODALFRAME_W)
     79  }
     80  else if (dwExStyle & WS_EX_DLGMODALFRAME_W)
    7681  {
    7782    Draw3DRect(hps,*rect,clrBlack,clrLight);
    … …  
    8085    DeflateRect(rect);
    8186    Draw3DRect(hps,*rect,clrLight,clrLight);
    82   } else if (dwExStyle & WS_EX_STATICEDGE_W)
     87  }
     88  else if (dwExStyle & WS_EX_STATICEDGE_W)
    8389  {
    8490    Draw3DRect(hps,*rect,clrWhite,clrDark);
    85   } else if (dwExStyle & WS_EX_WINDOWEDGE_W);
     91  }
     92  else if (dwExStyle & WS_EX_WINDOWEDGE_W);
    8693  else if (dwStyle & WS_BORDER_W)
    8794  {
    … …  
    9198  DeflateRect(rect);
    9299}
    93 
     100//******************************************************************************
     101//******************************************************************************
    94102BOOL CanDrawSizeBox(Win32BaseWindow *win32wnd)
    95103{
    … …  
    98106          && win32wnd->getHorzScrollHandle() && WinQueryWindow(win32wnd->getHorzScrollHandle(),QW_PARENT) == win32wnd->getOS2FrameWindowHandle());
    99107}
    100 
     108//******************************************************************************
     109//******************************************************************************
    101110VOID GetSizeBox(Win32BaseWindow *win32wnd,RECTL *rect)
    102111{
    … …  
    110119  rect->yBottom = swpHorz.y;
    111120}
    112 
     121//******************************************************************************
     122//******************************************************************************
    113123BOOL InSizeBox(Win32BaseWindow *win32wnd,POINTS *points)
    114124{
    … …  
    126136  return FALSE;
    127137}
    128 
     138//******************************************************************************
     139//******************************************************************************
    129140VOID DrawSizeBox(HPS hps,RECTL rect)
    130141{
    … …  
    156167  }
    157168}
    158 
     169//******************************************************************************
     170//******************************************************************************
     171void DrawActivate(Win32BaseWindow *win32wnd, HWND hwnd)
     172{
     173    if (!win32wnd->isChild())
     174    {
     175        if (CanDrawSizeBox(win32wnd))
     176        {
     177          HPS hps;
     178          RECTL rect;
     179
     180          GetSizeBox(win32wnd,&rect);
     181          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
     182          DrawSizeBox(hps,rect);
     183          WinReleasePS(hps);
     184
     185        }
     186    }
     187    else
     188    {
     189        HPS hps;
     190        RECTL rect;
     191
     192        WinQueryWindowRect(hwnd,&rect);
     193        rect.xRight = rect.xRight-rect.xLeft;
     194        rect.yTop = rect.yTop-rect.yBottom;
     195        rect.xLeft = rect.yBottom = 0;
     196        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
     197        DrawFrame(hps,&rect,win32wnd);
     198        WinReleasePS(hps);
     199    }
     200}
    159201//******************************************************************************
    160202//Win32 frame message handler
    … …  
    180222  switch(msg)
    181223  {
    182 #if 0
     224#if 1
    183225    case WM_ADJUSTWINDOWPOS:
    184226    {
    … …  
    186228      SWP      swpOld;
    187229      WINDOWPOS wp;
    188       ULONG     parentHeight = 0;
    189       HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE, hwndAfter;
    190 
    191         dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", hwnd, pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
     230      HWND      hParent = NULLHANDLE, hwndAfter;
     231
     232        dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    192233
    193234        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
    194235            goto RunDefFrameProc;
     236
    195237        if(!win32wnd->CanReceiveSizeMsgs()) {
    196             goto RunDefFrameProc;
     238            break;
    197239        }
    198240
    … …  
    208250        }
    209251        hwndAfter = pswp->hwndInsertBehind;
    210         hFrame = win32wnd->getOS2FrameWindowHandle();
    211         OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hFrame);
     252        OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
    212253
    213254        wp.hwnd = win32wnd->getWindowHandle();
    … …  
    219260        if(win32wnd->MsgPosChanging((LPARAM)&wp) == 0)
    220261        {//app or default window handler changed wp
    221             dprintf(("OS2: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
     262            dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
    222263            dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    223             OSLibMapWINDOWPOStoSWP(&wp, pswp, &swpOld, hParent, hFrame);
     264            OSLibMapWINDOWPOStoSWPFrame(&wp, pswp, &swpOld, hParent, hwnd);
    224265            dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    225266            pswp->fl |= SWP_NOADJUST;
    226267            pswp->hwndInsertBehind = hwndAfter;
    227             pswp->hwnd = hFrame;
     268            pswp->hwnd = hwnd;
    228269
    229270            RestoreOS2TIB();
    … …  
    233274    }
    234275
     276    case WM_WINDOWPOSCHANGED:
     277    {
     278      PSWP      pswp   = (PSWP)mp1;
     279      SWP       swpOld = *(pswp + 1);
     280      WINDOWPOS wp;
     281      HWND      hParent = NULLHANDLE;
     282      LONG      yDelta = pswp->cy - swpOld.cy;
     283      LONG      xDelta = pswp->cx - swpOld.cx;
     284
     285        dprintf(("PMFRAME: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
     286
     287        RestoreOS2TIB();
     288        rc = OldFrameProc(hwnd,msg,mp1,mp2);
     289        SetWin32TIB();
     290
     291        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
     292            goto PosChangedEnd;
     293
     294        if(!win32wnd->CanReceiveSizeMsgs())
     295            goto PosChangedEnd;
     296
     297        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
     298            if (win32wnd->isChild()) {
     299                if(win32wnd->getParent()) {
     300                        hParent = win32wnd->getParent()->getOS2WindowHandle();
     301                }
     302                else    goto PosChangedEnd; //parent has just been destroyed
     303            }
     304        }
     305        OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
     306
     307        //delta is difference between old and new client height
     308        yDelta = swpOld.cy - win32wnd->getWindowHeight();
     309
     310        win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
     311        win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
     312
     313        wp.hwnd = win32wnd->getWindowHandle();
     314        if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
     315        {
     316           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
     317           if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
     318        }
     319
     320        if (yDelta != 0 || xDelta != 0)
     321        {
     322            HENUM henum = WinBeginEnumWindows(WinWindowFromID(pswp->hwnd, FID_CLIENT));
     323            SWP swp[10];
     324            int i = 0;
     325            HWND hwnd;
     326
     327            while ((hwnd = WinGetNextWindow(henum)) != NULLHANDLE)
     328            {
     329#if 0
     330                if (mdiClient )
     331                {
     332                  continue;
     333                }
     334#endif
     335                WinQueryWindowPos(hwnd, &(swp[i]));
     336
     337#ifdef DEBUG
     338                Win32BaseWindow *window = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
     339                dprintf(("ENUMERATE %x delta %d (%d,%d) (%d,%d) %x", (window) ? window->getWindowHandle() : hwnd,
     340                         yDelta, swp[i].x, swp[i].y, swp[i].cx, swp[i].cy, swp[i].fl));
     341#endif
     342
     343                if(swp[i].y != 0) {
     344                    //child window at offset <> 0 from client area -> offset now changes
     345                    swp[i].y  += yDelta;
     346                    swp[i].fl &= ~(SWP_NOREDRAW);
     347                }
     348                //else child window with the same start coorindates as the client area
     349                //The app should resize it.
     350
     351               if (i == 9)
     352                {
     353                    WinSetMultWindowPos(GetThreadHAB(), swp, 10);
     354                    i = 0;
     355                }
     356                else
     357                {
     358                    i++;
     359                }
     360            }
     361
     362            WinEndEnumWindows(henum);
     363
     364            if (i)
     365               WinSetMultWindowPos(GetThreadHAB(), swp, i);
     366        }
     367        if (yDelta != 0)
     368        {
     369            POINT pt;
     370            if(GetCaretPos (&pt) == TRUE)
     371            {
     372                pt.y -= yDelta;
     373                SetCaretPos (pt.x, pt.y);
     374            }
     375        }
     376        win32wnd->MsgPosChanged((LPARAM)&wp);
     377
     378PosChangedEnd:
     379        return rc;
     380    }
     381#if 0
     382    case WM_ENABLE:
     383        dprintf(("PMFRAME: WM_ENABLE %x", win32wnd->getWindowHandle()));
     384        win32wnd->MsgEnable(SHORT1FROMMP(mp1));
     385        goto RunDefFrameProc;
     386
     387    case WM_SHOW:
     388        dprintf(("PMFRAME: WM_SHOW %x %d", win32wnd->getWindowHandle(), mp1));
     389        win32wnd->MsgShow((ULONG)mp1);
     390        goto RunDefFrameProc;
     391
     392    case WM_ACTIVATE:
     393    {
     394      HWND hwndActivate = (HWND)mp2;
     395      BOOL fMinimized = FALSE;
     396
     397        dprintf(("PMFRAME: WM_ACTIVATE %x %x", hwnd, hwndActivate));
     398        if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
     399                //another (non-win32) application's window
     400                //set to NULL (allowed according to win32 SDK) to avoid problems
     401                hwndActivate = NULL;
     402        }
     403        if(WinQueryWindowULong(hwnd, QWL_STYLE) & WS_MINIMIZED)
     404        {
     405           fMinimized = TRUE;
     406        }
     407
     408        win32wnd->MsgActivate(SHORT1FROMMP(mp1), fMinimized, Win32BaseWindow::OS2ToWin32Handle(hwndActivate));
     409
     410        RestoreOS2TIB();
     411        MRESULT rc = OldFrameProc(hwnd,msg,mp1,mp2);
     412        DrawActivate(win32wnd, hwnd);
     413        return rc;
     414    }
     415#else
     416    case WM_ACTIVATE:
     417        DrawActivate(win32wnd, hwnd);
     418        goto RunDefFrameProc;
     419#endif
    235420#else
    236421    case WM_ADJUSTWINDOWPOS:
    … …  
    242427      if(wndchild && wndchild->isChild())
    243428      {
     429#if 0
     430       SWP swp = *pswp;
     431
     432        MRESULT rc = OldFrameProc(hwnd, msg, mp1, mp2);
     433        pswp->x = swp.x;
     434        pswp->y = swp.y;
     435        pswp->fl = swp.fl;
     436#endif
    244437        dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", hwnd, pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    245438        RestoreOS2TIB();
    … …  
    249442    }
    250443
     444    case WM_ACTIVATE:
     445        DrawActivate(win32wnd, hwnd);
     446        goto RunDefFrameProc;
    251447#endif
    252448
    … …  
    265461        RestoreOS2TIB();
    266462        return (MRESULT)TRUE;
    267       } else if (win32wnd->isChild()) goto RunDefWndProc;
     463      }
     464      else if (win32wnd->isChild()) goto RunDefWndProc;
    268465      else goto RunDefFrameProc;
    269466
    … …  
    277474        RestoreOS2TIB();
    278475        return (MRESULT)TRUE;
    279       } else if (win32wnd->isChild()) goto RunDefWndProc;
     476      }
     477      else if (win32wnd->isChild()) goto RunDefWndProc;
    280478      else goto RunDefFrameProc;
    281479
    … …  
    288486      else goto RunDefFrameProc;
    289487
    290     case WM_ACTIVATE:
     488    case WM_PAINT:
    291489      #ifdef PMFRAMELOG
    292        dprintf(("PMFRAME: WM_ACTIVATE"));
     490       dprintf(("PMFRAME: WM_PAINT"));
    293491      #endif
    294492      if (!win32wnd->isChild())
    … …  
    311509          RestoreOS2TIB();
    312510          return res;
    313         } else goto RunDefFrameProc;
    314       } else
     511        }
     512        else goto RunDefFrameProc;
     513      }
     514      else
    315515      {
    316         MRESULT res;
     516        RECTL rect;
    317517        HPS hps;
    318         RECTL rect;
    319 
    320         RestoreOS2TIB();
    321         res = OldFrameProc(hwnd,msg,mp1,mp2);
     518
     519        RestoreOS2TIB();
     520        OldFrameProc(hwnd,msg,mp1,mp2);
    322521        SetWin32TIB();
    323522
    … …  
    331530
    332531        RestoreOS2TIB();
    333         return res;
    334       }
    335 
    336     case WM_PAINT:
    337       #ifdef PMFRAMELOG
    338        dprintf(("PMFRAME: WM_PAINT"));
    339       #endif
    340       if (!win32wnd->isChild())
    341       {
    342         if (CanDrawSizeBox(win32wnd))
    343         {
    344           MRESULT res;
    345           HPS hps;
    346           RECTL rect;
    347 
    348           RestoreOS2TIB();
    349           res = OldFrameProc(hwnd,msg,mp1,mp2);
    350           SetWin32TIB();
    351 
    352           GetSizeBox(win32wnd,&rect);
    353           hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
    354           DrawSizeBox(hps,rect);
    355           WinReleasePS(hps);
    356 
    357           RestoreOS2TIB();
    358           return res;
    359         } else goto RunDefFrameProc;
    360       } else
    361       {
    362         RECTL rect;
    363         HPS hps;
    364 
    365         RestoreOS2TIB();
    366         OldFrameProc(hwnd,msg,mp1,mp2);
    367         SetWin32TIB();
    368 
    369         WinQueryWindowRect(hwnd,&rect);
    370         rect.xRight = rect.xRight-rect.xLeft;
    371         rect.yTop = rect.yTop-rect.yBottom;
    372         rect.xLeft = rect.yBottom = 0;
    373         hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
    374         DrawFrame(hps,&rect,win32wnd);
    375         WinReleasePS(hps);
    376 
    377         RestoreOS2TIB();
    378532        return (MRESULT)0;
    379533      }

  • trunk/src/user32/pmwindow.cpp

    r1418 r1425  
    1 /* $Id: pmwindow.cpp,v 1.42 1999-10-23 16:45:20 cbratschi Exp $ */
     1/* $Id: pmwindow.cpp,v 1.43 1999-10-23 23:04:37 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    2929#include "oslibmsg.h"
    3030#include "dc.h"
    31 #include "timer.h"
    3231#include <thread.h>
    3332#include <wprocess.h>
    34 #include <caret.h>
     33#include "caret.h"
     34#include "timer.h"
    3535
    3636HMQ  hmq = 0;                             /* Message queue handle         */
    … …  
    248248        break;
    249249
    250 #if 1
     250#if 0
    251251    case WM_ADJUSTWINDOWPOS:
    252252    {
    253253      PSWP     pswp = (PSWP)mp1;
    254       SWP      swpOld;
     254      SWP      swpOld, swpNew;
    255255      WINDOWPOS wp;
    256256      ULONG     parentHeight = 0;
    … …  
    291291            dprintf(("OS2: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
    292292            dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    293             OSLibMapWINDOWPOStoSWP(&wp, pswp, &swpOld, hParent, hFrame);
    294             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
    295             pswp->fl |= SWP_NOADJUST;
    296             pswp->hwndInsertBehind = hwndAfter;
    297             pswp->hwnd = hFrame;
    298 
    299             WinSetMultWindowPos(GetThreadHAB(), pswp, 1);
     293            OSLibMapWINDOWPOStoSWP(&wp, &swpNew, &swpOld, hParent, hFrame);
     294            dprintf(("%x (%d,%d), (%d,%d)", swpNew.fl, swpNew.x, swpNew.y, swpNew.cx, swpNew.cy));
     295            swpNew.fl |= SWP_NOADJUST;
     296            swpNew.hwndInsertBehind = hwndAfter;
     297            swpNew.hwnd = hFrame;
     298
     299            WinSetMultWindowPos(GetThreadHAB(), &swpNew, 1);
    300300            return (MRESULT)0;
    301301        }
    302302        break;
    303303    }
    304 #endif
    305304
    306305    case WM_WINDOWPOSCHANGED:
    … …  
    316315
    317316        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
    318         if (!win32wnd->CanReceiveSizeMsgs())    break;
    319317
    320318        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
    … …  
    326324            }
    327325        }
    328         OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, hwnd);
     326        OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, win32wnd->getOS2FrameWindowHandle());
     327
     328        if (!win32wnd->CanReceiveSizeMsgs())    break;
    329329
    330330        win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
    … …  
    398398        goto RunDefWndProc;
    399399    }
    400 
    401     case WM_SIZE:
    402     {
    403         dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp2)));
    404         break;
    405     }
    406 
    407     case WM_OWNERPOSCHANGE:
    408     {
    409         dprintf(("OS2: WM_OWNERPOSCHANGE"));
    410         goto RunDefWndProc;
    411     }
    412 
    413     case WM_CALCVALIDRECTS:
    414     {
    415         dprintf(("OS2: WM_CALCVALIDRECTS"));
    416         goto RunDefWndProc;
    417     }
     400#endif
    418401
    419402    case WM_ACTIVATE:
    … …  
    438421        break;
    439422    }
     423
     424    case WM_SIZE:
     425    {
     426        dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp2)));
     427        break;
     428    }
     429
     430    case WM_OWNERPOSCHANGE:
     431    {
     432        dprintf(("OS2: WM_OWNERPOSCHANGE"));
     433        goto RunDefWndProc;
     434    }
     435
     436    case WM_CALCVALIDRECTS:
     437    {
     438        dprintf(("OS2: WM_CALCVALIDRECTS"));
     439        goto RunDefWndProc;
     440    }
     441
    440442    case WM_FOCUSCHANGE:
    441443        dprintf(("OS2: WM_FOCUSCHANGE %x", hwnd));

  • trunk/src/user32/scroll.cpp

    r1418 r1425  
    1 /* $Id: scroll.cpp,v 1.13 1999-10-23 16:45:21 cbratschi Exp $ */
     1/* $Id: scroll.cpp,v 1.14 1999-10-23 23:04:38 sandervl Exp $ */
    22/*
    33 * Scrollbar control
    … …  
    1717#include "win32wbase.h"
    1818#include "oslibwin.h"
     19#include "initterm.h"
    1920
    2021static BOOL bitmapsLoaded = FALSE;
    … …  
    104105static void SCROLL_LoadBitmaps(void)
    105106{
    106     HINSTANCE hinst;
    107 
    108107    if (bitmapsLoaded) return;
    109108
    110     //CB: Open32 hack to load our own bitmap
    111     hinst = LoadLibraryA("USER32.DLL");
    112     hUpArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROW) );
    113     hDnArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROW) );
    114     hLfArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROW) );
    115     hRgArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROW) );
    116     hUpArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROWD) );
    117     hDnArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROWD) );
    118     hLfArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROWD) );
    119     hRgArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROWD) );
    120     hUpArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROWI) );
    121     hDnArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROWI) );
    122     hLfArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROWI) );
    123     hRgArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROWI) );
    124     FreeLibrary(hinst);
     109    hUpArrow  = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_UPARROW) );
     110    hDnArrow  = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_DNARROW) );
     111    hLfArrow  = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_LFARROW) );
     112    hRgArrow  = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_RGARROW) );
     113    hUpArrowD = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_UPARROWD) );
     114    hDnArrowD = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_DNARROWD) );
     115    hLfArrowD = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_LFARROWD) );
     116    hRgArrowD = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_RGARROWD) );
     117    hUpArrowI = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_UPARROWI) );
     118    hDnArrowI = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_DNARROWI) );
     119    hLfArrowI = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_LFARROWI) );
     120    hRgArrowI = LoadBitmapA( hInstanceUser32, MAKEINTRESOURCEA(OBM_RGARROWI) );
    125121
    126122    bitmapsLoaded = TRUE;

  • trunk/src/user32/user32.rc

    r949 r1425  
    1 /* $Id: user32.rc,v 1.1 1999-09-15 23:19:37 sandervl Exp $ */
     1/* $Id: user32.rc,v 1.2 1999-10-23 23:04:38 sandervl Exp $ */
    22/* converted from WINE */
    33
     4#include "winuser.h"
     5#include "odinrsrc.h"
     6
    47/* Button */
    58
    69#define OBM_CHECKBOXES      32759
    710
    8 BITMAP OBM_CHECKBOXES "checkboxes.bmp"
     11OBM_CHECKBOXES BITMAP LOADONCALL DISCARDABLE
     12{
     13'42 4D 4E 00 00 00 00 00 00 00 56 00 00 00 40 00'
     14'00 00 38 00 00 00 27 00 00 00 01 00 01 00 00 00'
     15'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
     16'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     17'00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
     18'FF 00 00 00 00 00 00 03 FF E0 00 3F FE 00 00 02'
     19'AA A0 00 3F FE 00 00 03 55 60 00 35 56 00 00 02'
     20'AA A0 00 3A AE 00 00 03 55 60 00 35 56 00 00 02'
     21'AA A0 00 3A AE 00 00 03 55 60 00 35 56 00 00 02'
     22'AA A0 00 3A AE 00 00 03 55 60 00 35 56 00 00 02'
     23'AA A0 00 3A AE 00 00 03 55 60 00 35 56 00 00 02'
     24'AA A0 00 3F FE 00 00 03 FF E0 00 3F FE 00 07 00'
     25'1C 00 70 01 C0 00 18 C0 63 01 FC 07 F0 00 20 20'
     26'80 83 8E 0E 38 00 40 11 1C 46 03 1D DC 00 40 11'
     27'3E 46 03 1B EC 00 80 0A 7F 2C 01 B7 F6 00 80 0A'
     28'7F 2C 01 B7 F6 00 80 0A 7F 2C 01 B7 F6 00 40 11'
     29'3E 46 03 1B EC 00 40 11 1C 46 03 1D DC 00 20 20'
     30'80 83 8E 0E 38 00 18 C0 63 01 FC 07 F0 00 07 00'
     31'1C 00 70 01 C0 00 FF FB FF EF FF BF FE 00 80 0B'
     32'00 6F FF BF FE 00 80 0A 80 AC 01 B8 0E 00 80 0A'
     33'41 2C 01 B4 16 00 80 0A 22 2C 01 B2 26 00 80 0A'
     34'14 2C 01 B1 46 00 80 0A 08 2C 01 B0 86 00 80 0A'
     35'14 2C 01 B1 46 00 80 0A 22 2C 01 B2 26 00 80 0A'
     36'41 2C 01 B4 16 00 80 0A 80 AC 01 B8 0E 00 80 0B'
     37'00 6F FF BF FE 00 FF FB FF EF FF BF FE 00'
     38}
    939
    1040/* Scroll */
    … …  
    1545#define OBM_UPARROWI        32737
    1646
    17 BITMAP OBM_LFARROWI "lfarrowi.bmp"
    18 BITMAP OBM_RGARROWI "rgarrowi.bmp"
    19 BITMAP OBM_DNARROWI "dnarrowi.bmp"
    20 BITMAP OBM_UPARROWI "uparrowi.bmp"
     47OBM_LFARROWI BITMAP LOADONCALL DISCARDABLE
     48{
     49'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     50'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     51'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     52'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     53'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     54'BF 00 7F 7F 7F 00 00 00 00 00 FF FF FF 00 00 00'
     55'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     56'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     57'00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 22'
     58'22 22 22 22 22 22 20 00 00 00 21 11 11 11 11 11'
     59'11 11 20 00 00 00 23 11 11 11 11 11 11 11 20 00'
     60'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
     61'00 00 03 00 00 11 20 00 00 00 23 00 00 00 13 00'
     62'00 11 20 00 00 00 23 00 00 01 10 33 30 11 20 00'
     63'00 00 23 00 00 11 11 11 30 11 20 00 00 00 23 00'
     64'01 11 11 11 30 11 20 00 00 00 23 00 00 11 11 11'
     65'00 11 20 00 00 00 23 00 00 01 13 00 00 11 20 00'
     66'00 00 23 00 00 00 13 00 00 11 20 00 00 00 23 00'
     67'00 00 00 00 00 11 20 00 00 00 23 00 00 00 00 00'
     68'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
     69'00 00 23 33 33 33 33 33 33 31 20 00 00 00 22 22'
     70'22 22 22 22 22 22 20 00 00 00'
     71}
     72
     73OBM_RGARROWI BITMAP LOADONCALL DISCARDABLE
     74{
     75'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     76'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     77'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     78'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     79'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     80'BF 00 7F 7F 7F 00 00 00 00 00 FF FF FF 00 00 00'
     81'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     82'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     83'00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 22'
     84'22 22 22 22 22 22 20 00 00 00 21 11 11 11 11 11'
     85'11 11 20 00 00 00 23 11 11 11 11 11 11 11 20 00'
     86'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
     87'00 00 03 00 00 11 20 00 00 00 23 00 00 00 13 30'
     88'00 11 20 00 00 00 23 00 00 33 11 33 00 11 20 00'
     89'00 00 23 00 01 11 11 13 30 11 20 00 00 00 23 00'
     90'01 11 11 11 00 11 20 00 00 00 23 00 01 11 11 10'
     91'00 11 20 00 00 00 23 00 00 00 11 00 00 11 20 00'
     92'00 00 23 00 00 00 10 00 00 11 20 00 00 00 23 00'
     93'00 00 00 00 00 11 20 00 00 00 23 00 00 00 00 00'
     94'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
     95'00 00 23 33 33 33 33 33 33 31 20 00 00 00 22 22'
     96'22 22 22 22 22 22 20 00 00 00'
     97}
     98
     99OBM_DNARROWI BITMAP LOADONCALL DISCARDABLE
     100{
     101'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     102'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     103'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     104'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     105'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     106'BF 00 7F 7F 7F 00 00 00 00 00 FF FF FF 00 00 00'
     107'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     108'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     109'00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 22'
     110'22 22 22 22 22 22 20 00 00 00 21 11 11 11 11 11'
     111'11 11 20 00 00 00 23 11 11 11 11 11 11 11 20 00'
     112'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
     113'00 00 03 00 00 11 20 00 00 00 23 00 00 00 13 30'
     114'00 11 20 00 00 00 23 00 00 01 11 33 00 11 20 00'
     115'00 00 23 00 00 11 11 13 30 11 20 00 00 00 23 00'
     116'01 11 11 11 00 11 20 00 00 00 23 00 00 01 11 30'
     117'00 11 20 00 00 00 23 00 00 01 11 30 00 11 20 00'
     118'00 00 23 00 00 01 11 00 00 11 20 00 00 00 23 00'
     119'00 00 00 00 00 11 20 00 00 00 23 00 00 00 00 00'
     120'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
     121'00 00 23 33 33 33 33 33 33 31 20 00 00 00 22 22'
     122'22 22 22 22 22 22 20 00 00 00'
     123}
     124
     125OBM_UPARROWI BITMAP LOADONCALL DISCARDABLE
     126{
     127'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     128'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     129'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     130'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     131'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     132'BF 00 7F 7F 7F 00 00 00 00 00 FF FF FF 00 00 00'
     133'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     134'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     135'00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 22'
     136'22 22 22 22 22 22 20 00 00 00 21 11 11 11 11 11'
     137'11 11 20 00 00 00 23 11 11 11 11 11 11 11 20 00'
     138'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
     139'00 00 33 30 00 11 20 00 00 00 23 00 00 01 11 30'
     140'00 11 20 00 00 00 23 00 00 01 11 30 00 11 20 00'
     141'00 00 23 00 03 31 11 03 30 11 20 00 00 00 23 00'
     142'01 11 11 11 00 11 20 00 00 00 23 00 00 11 11 10'
     143'00 11 20 00 00 00 23 00 00 01 11 00 00 11 20 00'
     144'00 00 23 00 00 00 10 00 00 11 20 00 00 00 23 00'
     145'00 00 00 00 00 11 20 00 00 00 23 00 00 00 00 00'
     146'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
     147'00 00 23 33 33 33 33 33 33 31 20 00 00 00 22 22'
     148'22 22 22 22 22 22 20 00 00 00'
     149}
    21150
    22151#define OBM_LFARROWD        32740
    … …  
    25154#define OBM_UPARROWD        32743
    26155
    27 BITMAP OBM_LFARROWD "lfarrowd.bmp"
    28 BITMAP OBM_RGARROWD "rgarrowd.bmp"
    29 BITMAP OBM_DNARROWD "dnarrowd.bmp"
    30 BITMAP OBM_UPARROWD "uparrowd.bmp"
     156OBM_LFARROWD BITMAP LOADONCALL DISCARDABLE
     157{
     158'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     159'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     160'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
     161'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     162'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     163'BF 00 00 00 00 00 7F 7F 7F 00 00 00 00 00 00 00'
     164'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     165'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     166'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     167'11 11 11 11 11 11 10 00 00 00 12 00 00 00 00 00'
     168'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     169'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     170'00 00 01 00 00 00 10 00 00 00 12 00 00 00 11 00'
     171'00 00 10 00 00 00 12 00 00 01 11 11 10 00 10 00'
     172'00 00 12 00 00 11 11 11 10 00 10 00 00 00 12 00'
     173'00 01 11 11 10 00 10 00 00 00 12 00 00 00 11 00'
     174'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
     175'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     176'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
     177'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     178'00 00 12 22 22 22 22 22 22 22 10 00 00 00 11 11'
     179'11 11 11 11 11 11 10 00 00 00'
     180}
     181
     182OBM_RGARROWD BITMAP LOADONCALL DISCARDABLE
     183{
     184'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     185'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     186'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
     187'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     188'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     189'BF 00 00 00 00 00 7F 7F 7F 00 00 00 00 00 00 00'
     190'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     191'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     192'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     193'11 11 11 11 11 11 10 00 00 00 12 00 00 00 00 00'
     194'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     195'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     196'00 00 01 00 00 00 10 00 00 00 12 00 00 00 01 10'
     197'00 00 10 00 00 00 12 00 00 11 11 11 00 00 10 00'
     198'00 00 12 00 00 11 11 11 10 00 10 00 00 00 12 00'
     199'00 11 11 11 00 00 10 00 00 00 12 00 00 00 01 10'
     200'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
     201'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     202'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
     203'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     204'00 00 12 22 22 22 22 22 22 22 10 00 00 00 11 11'
     205'11 11 11 11 11 11 10 00 00 00'
     206}
     207
     208OBM_DNARROWD BITMAP LOADONCALL DISCARDABLE
     209{
     210'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     211'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     212'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
     213'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     214'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     215'BF 00 00 00 00 00 7F 7F 7F 00 00 00 00 00 00 00'
     216'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     217'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     218'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     219'11 11 11 11 11 11 10 00 00 00 12 00 00 00 00 00'
     220'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     221'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     222'00 00 01 00 00 00 10 00 00 00 12 00 00 00 11 10'
     223'00 00 10 00 00 00 12 00 00 01 11 11 00 00 10 00'
     224'00 00 12 00 00 11 11 11 10 00 10 00 00 00 12 00'
     225'00 00 11 10 00 00 10 00 00 00 12 00 00 00 11 10'
     226'00 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
     227'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     228'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
     229'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     230'00 00 12 22 22 22 22 22 22 22 10 00 00 00 11 11'
     231'11 11 11 11 11 11 10 00 00 00'
     232}
     233
     234OBM_UPARROWD BITMAP LOADONCALL DISCARDABLE
     235{
     236'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     237'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     238'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
     239'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     240'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     241'BF 00 00 00 00 00 7F 7F 7F 00 00 00 00 00 00 00'
     242'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     243'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     244'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     245'11 11 11 11 11 11 10 00 00 00 12 00 00 00 00 00'
     246'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     247'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     248'00 00 11 10 00 00 10 00 00 00 12 00 00 00 11 10'
     249'00 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
     250'00 00 12 00 00 11 11 11 10 00 10 00 00 00 12 00'
     251'00 01 11 11 00 00 10 00 00 00 12 00 00 00 11 10'
     252'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
     253'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
     254'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
     255'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
     256'00 00 12 22 22 22 22 22 22 22 10 00 00 00 11 11'
     257'11 11 11 11 11 11 10 00 00 00'
     258}
    31259
    32260#define OBM_LFARROW         32750
    … …  
    35263#define OBM_UPARROW         32753
    36264
    37 BITMAP OBM_LFARROW "lfarrow.bmp"
    38 BITMAP OBM_RGARROW "rgarrow.bmp"
    39 BITMAP OBM_DNARROW "dnarrow.bmp"
    40 BITMAP OBM_UPARROW "uparrow.bmp"
     265OBM_LFARROW BITMAP LOADONCALL DISCARDABLE
     266{
     267'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     268'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     269'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     270'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     271'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     272'BF 00 00 00 00 00 7F 7F 7F 00 FF FF FF 00 00 00'
     273'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     274'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     275'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     276'11 11 11 11 11 11 10 00 00 00 12 22 22 22 22 22'
     277'22 22 10 00 00 00 13 22 22 22 22 22 22 22 10 00'
     278'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
     279'00 00 00 00 00 22 10 00 00 00 13 00 00 00 10 00'
     280'00 22 10 00 00 00 13 00 00 01 10 00 00 22 10 00'
     281'00 00 13 00 00 11 11 11 00 22 10 00 00 00 13 00'
     282'01 11 11 11 00 22 10 00 00 00 13 00 00 11 11 11'
     283'00 22 10 00 00 00 13 00 00 01 10 00 00 22 10 00'
     284'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
     285'00 00 00 00 00 22 10 00 00 00 13 00 00 00 00 00'
     286'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
     287'00 00 13 33 33 33 33 33 33 32 10 00 00 00 11 11'
     288'11 11 11 11 11 11 10 00 00 00'
     289}
     290
     291OBM_RGARROW BITMAP LOADONCALL DISCARDABLE
     292{
     293'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     294'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     295'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     296'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     297'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     298'BF 00 00 00 00 00 7F 7F 7F 00 FF FF FF 00 00 00'
     299'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     300'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     301'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     302'11 11 11 11 11 11 10 00 00 00 12 22 22 22 22 22'
     303'22 22 10 00 00 00 13 22 22 22 22 22 22 22 10 00'
     304'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
     305'00 00 00 00 00 22 10 00 00 00 13 00 00 00 10 00'
     306'00 22 10 00 00 00 13 00 00 00 11 00 00 22 10 00'
     307'00 00 13 00 01 11 11 10 00 22 10 00 00 00 13 00'
     308'01 11 11 11 00 22 10 00 00 00 13 00 01 11 11 10'
     309'00 22 10 00 00 00 13 00 00 00 11 00 00 22 10 00'
     310'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
     311'00 00 00 00 00 22 10 00 00 00 13 00 00 00 00 00'
     312'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
     313'00 00 13 33 33 33 33 33 33 32 10 00 00 00 11 11'
     314'11 11 11 11 11 11 10 00 00 00'
     315}
     316
     317OBM_DNARROW BITMAP LOADONCALL DISCARDABLE
     318{
     319'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     320'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     321'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     322'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     323'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     324'BF 00 00 00 00 00 7F 7F 7F 00 FF FF FF 00 00 00'
     325'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     326'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     327'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     328'11 11 11 11 11 11 10 00 00 00 12 22 22 22 22 22'
     329'22 22 10 00 00 00 13 22 22 22 22 22 22 22 10 00'
     330'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
     331'00 00 00 00 00 22 10 00 00 00 13 00 00 00 10 00'
     332'00 22 10 00 00 00 13 00 00 01 11 00 00 22 10 00'
     333'00 00 13 00 00 11 11 10 00 22 10 00 00 00 13 00'
     334'01 11 11 11 00 22 10 00 00 00 13 00 00 01 11 00'
     335'00 22 10 00 00 00 13 00 00 01 11 00 00 22 10 00'
     336'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
     337'00 00 00 00 00 22 10 00 00 00 13 00 00 00 00 00'
     338'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
     339'00 00 13 33 33 33 33 33 33 32 10 00 00 00 11 11'
     340'11 11 11 11 11 11 10 00 00 00'
     341}
     342
     343OBM_UPARROW BITMAP LOADONCALL DISCARDABLE
     344{
     345'42 4D 4E 00 00 00 00 00 00 00 8E 00 00 00 40 00'
     346'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
     347'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
     348'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     349'00 00 00 00 00 00 00 00 00 00 00 00 00 00 BF BF'
     350'BF 00 00 00 00 00 7F 7F 7F 00 FF FF FF 00 00 00'
     351'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     352'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     353'00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11'
     354'11 11 11 11 11 11 10 00 00 00 12 22 22 22 22 22'
     355'22 22 10 00 00 00 13 22 22 22 22 22 22 22 10 00'
     356'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
     357'00 00 00 00 00 22 10 00 00 00 13 00 00 01 11 00'
     358'00 22 10 00 00 00 13 00 00 01 11 00 00 22 10 00'
     359'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
     360'01 11 11 11 00 22 10 00 00 00 13 00 00 11 11 10'
     361'00 22 10 00 00 00 13 00 00 01 11 00 00 22 10 00'
     362'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
     363'00 00 00 00 00 22 10 00 00 00 13 00 00 00 00 00'
     364'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
     365'00 00 13 33 33 33 33 33 33 32 10 00 00 00 11 11'
     366'11 11 11 11 11 11 10 00 00 00'
     367}
    41368
    42369/* Combo */
    … …  
    44371#define OBM_COMBO           32738
    45372
    46 BITMAP OBM_COMBO "combo.bmp"
    47 
     373OBM_COMBO BITMAP LOADONCALL DISCARDABLE
     374{
     375'42 4D 4E 00 00 00 00 00 00 00 56 00 00 00 40 00'
     376'00 00 07 00 00 00 09 00 00 00 01 00 01 00 00 00'
     377'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
     378'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     379'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     380'00 00 FF FF FF 00 00 00 00 00 FE 00 00 00 EE 00'
     381'00 00 C6 00 00 00 82 00 00 00 00 00 00 00 C6 00'
     382'00 00 C6 00 00 00 C6 00 00 00'
     383}
    48384/* Edit */
    49385
    … …  
    55391#define EM_SETSEL            0x00b1
    56392
    57 MENU 100
     393EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
     394{
     395        POPUP ""
     396        BEGIN
     397                MENUITEM "&Undo", EM_UNDO
     398                MENUITEM SEPARATOR
     399                MENUITEM "Cu&t", WM_CUT
     400                MENUITEM "&Copy", WM_COPY
     401                MENUITEM "&Paste", WM_PASTE
     402                MENUITEM "&Delete", WM_CLEAR
     403                MENUITEM SEPARATOR
     404                MENUITEM "Select &All", EM_SETSEL
     405        END
     406}
     407
     408/////////////////////////////////////////////////////////////////////////////
     409//
     410// Version
     411//
     412
     4131 VERSIONINFO
     414 FILEVERSION ODIN_FILEVERSION
     415 PRODUCTVERSION ODIN_PRODUCTVERSION
     416 FILEFLAGSMASK 0x3fL
     417 FILEFLAGS 0xaL
     418 FILEOS 0x10001L
     419 FILETYPE 0x1L
     420 FILESUBTYPE 0x0L
    58421BEGIN
    59   MENUITEM "~Undo", EM_UNDO
    60   MENUITEM SEPARATOR
    61   MENUITEM "Cu~t", WM_CUT
    62   MENUITEM "~Copy", WM_COPY
    63   MENUITEM "~Paste", WM_PASTE
    64   MENUITEM "~Delete", WM_CLEAR
    65   MENUITEM SEPARATOR
    66   MENUITEM "Select ~All", EM_SETSEL
     422    BLOCK "StringFileInfo"
     423    BEGIN
     424        BLOCK "040904E4"
     425        BEGIN
     426            VALUE "Comments", "Odin32 System Dll\0"
     427            VALUE "CompanyName", "Odin Team\0"
     428            VALUE "FileDescription", "Generic Example Application\0"
     429            VALUE "FileVersion", "0.0\0"
     430            VALUE "InternalName", "Odin32 - USER32\0"
     431            VALUE "LegalCopyright", "Copyright (C) 1999\0"
     432            VALUE "LegalTrademarks", "\0"
     433            VALUE "OriginalFilename", "\0"
     434            VALUE "ProductName", "Odin32 - USER32\0"
     435            VALUE "ProductVersion", "1.0\0"
     436        END
     437    END
     438    BLOCK "VarFileInfo"
     439    BEGIN
     440        VALUE "Translation", 0x409, 0x04E4
     441    END
    67442END

  • trunk/src/user32/user32exp.def

    r1405 r1425  
    576576    GetOS2Callback__15Win32WindowProcFv       @2001
    577577    _GetSysColorPen@4                         @2002
    578     _NativeLoadBitmap@8                       @2005
    579578    Win32ToOS2Handle__FUl                     @2006

  • trunk/src/user32/win32wbase.cpp

    r1418 r1425  
    1 /* $Id: win32wbase.cpp,v 1.61 1999-10-23 16:45:23 cbratschi Exp $ */
     1/* $Id: win32wbase.cpp,v 1.62 1999-10-23 23:04:38 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    633633  if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
    634634  {
    635         if (cs->hMenu) SetMenu(cs->hMenu);
    636         else
    637         {
     635        if (cs->hMenu) {
     636            SetMenu(cs->hMenu);
     637        }
     638        else {
    638639                if (windowClass->getMenuNameA()) {
    639640                        cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());

  • trunk/src/user32/win32wbase.h

    r1418 r1425  
    1 /* $Id: win32wbase.h,v 1.33 1999-10-23 16:45:24 cbratschi Exp $ */
     1/* $Id: win32wbase.h,v 1.34 1999-10-23 23:04:39 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    149149         BOOL   ShowWindow(ULONG nCmdShow);
    150150         BOOL   SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags);
    151         BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
     151        BOOL   SetWindowPlacement(WINDOWPLACEMENT *winpos);
    152152         BOOL   DestroyWindow();
    153153         HWND   SetActiveWindow();
    … …  
    219219       ULONG getBorderHeight() { return borderHeight; };
    220220
    221 static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
    222 static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
    223 static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
     221static  void  NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle);
     222static  void  NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle);
     223static  BOOL  WindowNeedsWMBorder( DWORD style, DWORD exStyle );
    224224
    225225       PVOID getOldWndProc() { return pOldWndProc; }
    … …  
    304304#ifndef OS2_INCLUDED
    305305        void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
    306         LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
     306        LONG  HandleWindowPosChanging(WINDOWPOS *winpos);
    307307        LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);
    308308

  • trunk/src/user32/window.cpp

    r1405 r1425  
    1 /* $Id: window.cpp,v 1.23 1999-10-22 18:11:50 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.24 1999-10-23 23:04:39 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    738738BOOL WIN32API AdjustWindowRectEx( PRECT rect, DWORD style, BOOL menu, DWORD exStyle)
    739739{
    740     dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d)\n", style, exStyle, menu, rect->right, rect->top, rect->left, rect->bottom));
     740    dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d)\n", style, exStyle, menu, rect->left, rect->top, rect->right, rect->bottom));
    741741
    742742    /* Correct the window style */
    … …  
    752752    Win32BaseWindow::NC_AdjustRectInner( rect, style, exStyle );
    753753
    754     dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->right, rect->top, rect->left, rect->bottom));
     754    dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom));
    755755    return TRUE;
    756756}
    … …  
    942942    PRECT rcl;
    943943
    944     dprintf(("USER32:  ClientToScreen\n"));
     944    dprintf(("ClientToScreen (%d,%d)\n", pt->x, pt->y));
    945945    if (!hwnd) {
    946946        SetLastError(ERROR_INVALID_PARAMETER);
    … …  
    957957    OSLibWinMapWindowPoints (wnd->getOS2WindowHandle(), OSLIB_HWND_DESKTOP, (OSLIBPOINT *)pt, 1);
    958958    pt->y = ScreenHeight - pt->y;
     959    dprintf(("ClientToScreen returned (%d,%d)\n", pt->x, pt->y));
    959960    return (TRUE);
    960961}
Note: See TracChangeset for help on using the changeset viewer.