Changeset 2834 for trunk/src


Ignore:
Timestamp:
Feb 20, 2000, 7:28:35 PM (26 years ago)
Author:
cbratschi
Message:

WM_EX_CONTEXTHELP

Location:
trunk/src/user32
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/edit.cpp

    r2804 r2834  
    1 /* $Id: edit.cpp,v 1.33 2000-02-16 14:34:17 sandervl Exp $ */
     1/* $Id: edit.cpp,v 1.34 2000-02-20 18:28:31 cbratschi Exp $ */
    22/*
    33 *      Edit control
    … …  
    2323*/
    2424
     25#include <stdlib.h>
    2526#include <os2win.h>
    2627#include <string.h>
    … …  
    2829#include "combo.h"
    2930
    30 #define DBG_LOCALLOG    DBG_edit
     31#define DBG_LOCALLOG    DBG_edit
    3132#include "dbglocal.h"
    3233

  • trunk/src/user32/pmframe.cpp

    r2804 r2834  
    1 /* $Id: pmframe.cpp,v 1.42 2000-02-16 14:34:30 sandervl Exp $ */
     1/* $Id: pmframe.cpp,v 1.43 2000-02-20 18:28:32 cbratschi Exp $ */
    22/*
    33 * Win32 Frame Managment Code for OS/2
    … …  
    2626#include "oslibmsg.h"
    2727
    28 #define DBG_LOCALLOG    DBG_pmframe
     28#define DBG_LOCALLOG    DBG_pmframe
    2929#include "dbglocal.h"
    3030
    … …  
    361361            if (redrawAll)
    362362            {
     363              //CB: redraw all children for now
     364              //    -> problems with update region if we don't do it
     365              //       todo: rewrite whole handling
    363366              WinInvalidateRect(hwnd,NULL,TRUE);
    364367            }
    … …  
    390393              arcl[3].yTop = rect.yBottom;
    391394
    392               HRGN hrgn = GpiCreateRegion(hps,3,(PRECTL)&arcl);
     395              HRGN hrgn = GpiCreateRegion(hps,4,(PRECTL)&arcl);
    393396
    394397              WinInvalidateRegion(hwnd,hrgn,FALSE);
    … …  
    420423    {
    421424      //don't redraw here or PM redraw the whole frame (done in WM_WINDOWPOSCHANGED)
     425      dprintf(("PMFRAME: WM_CALCVALIDRECTS"));
    422426      RestoreOS2TIB();
    423427      return (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);

  • trunk/src/user32/pmwindow.cpp

    r2804 r2834  
    1 /* $Id: pmwindow.cpp,v 1.85 2000-02-16 14:34:31 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.86 2000-02-20 18:28:32 cbratschi Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    3838#include <codepage.h>
    3939
    40 #define DBG_LOCALLOG    DBG_pmwindow
     40#define DBG_LOCALLOG    DBG_pmwindow
    4141#include "dbglocal.h"
    4242
    … …  
    310310    }
    311311#else
     312      dprintf(("PMWINDOW: WM_CALCVALIDRECTS"));
    312313      RestoreOS2TIB();
    313314      return (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);

  • trunk/src/user32/scroll.cpp

    r2804 r2834  
    1 /* $Id: scroll.cpp,v 1.34 2000-02-16 14:34:32 sandervl Exp $ */
     1/* $Id: scroll.cpp,v 1.35 2000-02-20 18:28:33 cbratschi Exp $ */
    22/*
    33 * Scrollbar control
    … …  
    2323#include "pmframe.h"
    2424
    25 #define DBG_LOCALLOG    DBG_scroll
     25#define DBG_LOCALLOG    DBG_scroll
    2626#include "dbglocal.h"
    2727
    … …  
    11961196    INT action = 0;
    11971197
    1198     dprintf(("USER32: SetScrollInfo"));
     1198    dprintf(("USER32: SetScrollInfo %x %d",hwnd,nBar));
    11991199
    12001200    if (!(infoPtr = SCROLL_GetInfoPtr(hwnd,nBar))) return 0;

  • trunk/src/user32/user32.rc

    r2666 r2834  
    1 /* $Id: user32.rc,v 1.8 2000-02-05 19:45:17 cbratschi Exp $ */
     1/* $Id: user32.rc,v 1.9 2000-02-20 18:28:34 cbratschi Exp $ */
    22/* converted from WINE */
    33
    … …  
    2525
    2626/* Frame */
     27
     28 /* Odin bitmaps */
     29
     30#define OBM_HELP            32730
     31
     32OBM_HELP BITMAP LOADONCALL DISCARDABLE
     33{
     34        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
     35        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
     36        'FE FE FE 82 82 82 DE DE DE 00 00 00 00 00 00 00'
     37        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     38        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
     39        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
     40        '00 31 24 00 00 01 10 00 00 31 24 00 00 01 10 00'
     41        '00 31 24 00 00 00 00 00 00 31 24 00 00 01 10 00'
     42        '00 31 24 00 00 01 10 00 00 31 24 00 00 00 11 00'
     43        '00 31 24 00 01 10 01 10 00 31 24 00 01 10 01 10'
     44        '00 31 24 00 00 11 11 00 00 31 24 44 44 44 44 44'
     45        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
     46        '22 22 22 22 22 22 22 21'
     47}
     48
     49#define OBM_HELPD           32729
     50
     51OBM_HELPD BITMAP LOADONCALL DISCARDABLE
     52{
     53        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
     54        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
     55        'FE FE FE DE DE DE 82 82 82 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 22 22 22 22 22 22'
     58        '22 22 13 33 33 33 33 33 33 32 14 00 00 00 11 00'
     59        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 00 00'
     60        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 11 00'
     61        '00 32 14 00 00 00 01 10 00 32 14 00 00 11 00 11'
     62        '00 32 14 00 00 11 00 11 00 32 14 00 00 01 11 10'
     63        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
     64        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
     65        '11 11 11 11 11 11 11 12'
     66}
     67
     68 /* Windows bitmaps */
    2769
    2870#define OBM_CLOSED          32731
    … …  
    800842OCR_NORMAL CURSOR LOADONCALL DISCARDABLE
    801843{
    802         '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01'
    803         '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
    804         '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00'
    805         '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00'
    806         '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
    807         '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
    808         '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
    809         '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0'
    810         '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00'
    811         '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0'
    812         '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00'
    813         '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00'
    814         '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
    815         'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
    816         'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
    817         'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F'
    818         'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF'
    819         'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F'
    820         'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF'
    821         'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF'
    822         'FF FF FF FF FF FF'
     844        '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01'
     845        '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
     846        '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00'
     847        '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00'
     848        '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
     849        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     850        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
     851        '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0'
     852        '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00'
     853        '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0'
     854        '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00'
     855        '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00'
     856        '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
     857        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
     858        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
     859        'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F'
     860        'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF'
     861        'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F'
     862        'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF'
     863        'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF'
     864        'FF FF FF FF FF FF'
    823865}
    824866

  • trunk/src/user32/win32class.h

    r2672 r2834  
    1 /* $Id: win32class.h,v 1.9 2000-02-06 22:00:23 sandervl Exp $ */
     1/* $Id: win32class.h,v 1.10 2000-02-20 18:28:34 cbratschi Exp $ */
    22/*
    33 * Win32 Window Class Managment Code for OS/2
    … …  
    4747        HCURSOR getCursor()             { return hCursor; };
    4848
     49      HINSTANCE getInstance()           { return hInstance; };
     50
    4951        HBRUSH  getBackgroundBrush()    { return backgroundBrush; };
    5052         ULONG  getStyle()              { return windowStyle; };
    5153
    52            HDC  getClassDC()            { return hdcClass; };
     54           HDC  getClassDC()            { return hdcClass; };
    5355
    5456          void  setMenuName(LPSTR newMenuName);

  • trunk/src/user32/win32wbase.cpp

    r2805 r2834  
    1 /* $Id: win32wbase.cpp,v 1.164 2000-02-16 17:21:06 cbratschi Exp $ */
     1/* $Id: win32wbase.cpp,v 1.165 2000-02-20 18:28:34 cbratschi Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    5050#include "timer.h"
    5151
    52 #define DBG_LOCALLOG    DBG_win32wbase
     52#define DBG_LOCALLOG    DBG_win32wbase
    5353#include "dbglocal.h"
    5454
    … …  
    608608        else {
    609609                if (windowClass->getMenuNameA()) {
    610                         cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
     610                        cs->hMenu = LoadMenuA(windowClass->getInstance(),windowClass->getMenuNameA());
     611#if 0 //CB: hack for treeview test cases bug
     612if (!cs->hMenu) cs->hMenu = LoadMenuA(windowClass->getInstance(),"MYAPP");
     613#endif
    611614                        if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
    612615                }
    … …  
    15871590        return 0;
    15881591
     1592#if 0 //CB: todo: MSDN docu: Windown handles these messages and not WM_SYSCHAR (the code below doesn't work)
     1593    case WM_KEYDOWN:
     1594    case WM_KEYUP:
     1595    case WM_SYSKEYDOWN:
     1596    case WM_SYSKEYUP:
     1597#endif
     1598
    15891599    case WM_SYSCHAR:
    15901600    {
    … …  
    16081618            break;
    16091619    }
     1620
    16101621    case WM_SETHOTKEY:
    16111622        hotkey = wParam;

  • trunk/src/user32/win32wbasenonclient.cpp

    r2803 r2834  
    1 /* $Id: win32wbasenonclient.cpp,v 1.11 2000-02-16 14:28:23 sandervl Exp $ */
     1/* $Id: win32wbasenonclient.cpp,v 1.12 2000-02-20 18:28:35 cbratschi Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2 (non-client methods)
    … …  
    3939#include <menu.h>
    4040
    41 #define DBG_LOCALLOG    DBG_win32wbasenonclient
     41#define DBG_LOCALLOG    DBG_win32wbasenonclient
    4242#include "dbglocal.h"
    4343
    … …  
    4949#define KEYDATA_PREVSTATE   0x4000
    5050
    51 static HBITMAP hbitmapClose = 0;
    52 static HBITMAP hbitmapCloseD = 0;
    53 static HBITMAP hbitmapMinimize = 0;
     51static INT bitmapW = 16,bitmapH = 14; //CB: todo: use these values
     52static HBITMAP hbitmapClose     = 0;
     53static HBITMAP hbitmapCloseD    = 0;
     54static HBITMAP hbitmapMinimize  = 0;
    5455static HBITMAP hbitmapMinimizeD = 0;
    55 static HBITMAP hbitmapMaximize = 0;
     56static HBITMAP hbitmapMaximize  = 0;
    5657static HBITMAP hbitmapMaximizeD = 0;
    57 static HBITMAP hbitmapRestore = 0;
    58 static HBITMAP hbitmapRestoreD = 0;
     58static HBITMAP hbitmapRestore   = 0;
     59static HBITMAP hbitmapRestoreD  = 0;
     60static HBITMAP hbitmapHelp      = 0;
     61static HBITMAP hbitmapHelpD     = 0;
    5962
    6063BYTE lpGrayMask[] = { 0xAA, 0xA0,
    … …  
    606609
    607610  /* Draw frame */
    608   PatBlt(hdc,rect->left,   rect->top,      rect->right-rect->left, height,PATCOPY);
    609   PatBlt(hdc,rect->left,   rect->top,      width,                  rect->bottom-rect->top,PATCOPY);
    610   PatBlt(hdc,rect->left,   rect->bottom-1, rect->right-rect->left,-height,PATCOPY);
    611   PatBlt(hdc,rect->right-1,rect->top,     -width,                  rect->bottom-rect->top,PATCOPY);
     611  PatBlt(hdc,rect->left,   rect->top,      rect->right-rect->left, height,PATCOPY); //top
     612  PatBlt(hdc,rect->left,   rect->top,      width,                  rect->bottom-rect->top,PATCOPY); //left
     613  PatBlt(hdc,rect->left,   rect->bottom-1, rect->right-rect->left,-height,PATCOPY); //bottom
     614  PatBlt(hdc,rect->right-1,rect->top,     -width,                  rect->bottom-rect->top,PATCOPY); //right
    612615  SelectObject(hdc,oldBrush);
    613616
    … …  
    729732          (down ? hbitmapRestoreD : hbitmapRestore ) :
    730733          (down ? hbitmapMaximizeD: hbitmapMaximize);
    731   hOldBmp=SelectObject( hdcMem, hBmp );
     734  hOldBmp = SelectObject( hdcMem, hBmp );
    732735  GetObjectA (hBmp, sizeof(BITMAP), &bmp);
    733736
    … …  
    885888    hbitmapRestore   = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORE));
    886889    hbitmapRestoreD  = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORED));
     890    hbitmapHelp      = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_HELP));
     891    hbitmapHelpD     = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_HELPD));
    887892  }
    888893
    … …  
    892897      r.left += GetSystemMetrics(SM_CYCAPTION) - 1;
    893898  }
    894 
    895   //CB: todo: integrate help button
    896899
    897900  if (dwStyle & WS_SYSMENU)
    … …  
    905908    DrawCloseButton(memDC,&r2,FALSE,
    906909                    ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF)));
    907     r.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
     910    r.right -= GetSystemMetrics(SM_CYCAPTION)-1;
     911
     912    if (dwExStyle & WS_EX_CONTEXTHELP)
     913    {
     914#if 0      //CB: todo: integrate help button
     915      DrawHelpButton(memDC,&r2,FALSE);
     916      r.right -= bitmapW;
     917#endif
     918    }
    908919
    909920    if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
Note: See TracChangeset for help on using the changeset viewer.