Ignore:
Timestamp:
Aug 30, 1999, 2:00:12 PM (26 years ago)
Author:
sandervl
Message:

Redesign; base class for all window types

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/new/window.cpp

    r740 r741  
    1 /* $Id: window.cpp,v 1.18 1999-08-29 20:05:08 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.19 1999-08-30 11:59:54 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    1818#include <os2win.h>
    1919#include <misc.h>
    20 #include <win32wnd.h>
     20#include <win32wbase.h>
    2121#include <oslibwin.h>
    2222#include <oslibgdi.h>
    … …  
    3333                              HINSTANCE instance, LPVOID data )
    3434{
    35   Win32Window *window;
     35  Win32BaseWindow *window;
    3636  ATOM classAtom;
    3737  CREATESTRUCTA cs;
    … …  
    6666    cs.dwExStyle      = exStyle;
    6767    dprintf(("CreateWindowExA: (%d,%d) (%d,%d), %x %x", x, y, width, height, style, exStyle));
    68     window = new Win32Window( &cs, classAtom, FALSE );
     68    window = new Win32BaseWindow( &cs, classAtom, FALSE );
    6969    if(window == NULL)
    7070    {
    71         dprintf(("Win32Window creation failed!!"));
     71        dprintf(("Win32BaseWindow creation failed!!"));
    7272        return 0;
    7373    }
    7474    if(GetLastError() != 0)
    7575    {
    76         dprintf(("Win32Window error found!!"));
     76        dprintf(("Win32BaseWindow error found!!"));
    7777        delete window;
    7878        return 0;
    … …  
    8888                              HINSTANCE instance, LPVOID data )
    8989{
    90   Win32Window *window;
     90  Win32BaseWindow *window;
    9191  ATOM classAtom;
    9292  CREATESTRUCTA cs;
    … …  
    120120    cs.lpszClass      = (LPSTR)className;
    121121    cs.dwExStyle      = exStyle;
    122     window = new Win32Window( &cs, classAtom, TRUE );
     122    window = new Win32BaseWindow( &cs, classAtom, TRUE );
    123123    if(window == NULL)
    124124    {
    125         dprintf(("Win32Window creation failed!!"));
     125        dprintf(("Win32BaseWindow creation failed!!"));
    126126        return 0;
    127127    }
    128128    if(GetLastError() != 0)
    129129    {
    130         dprintf(("Win32Window error found!!"));
     130        dprintf(("Win32BaseWindow error found!!"));
    131131        delete window;
    132132        return 0;
    … …  
    136136//******************************************************************************
    137137//******************************************************************************
    138 HWND WIN32API CreateMDIWindowA(LPCSTR lpszClassName, LPCSTR lpszWindowName, 
    139                                DWORD dwStyle, int x, int y, int nWidth, 
     138HWND WIN32API CreateMDIWindowA(LPCSTR lpszClassName, LPCSTR lpszWindowName,
     139                               DWORD dwStyle, int x, int y, int nWidth,
    140140                               int nHeight, HWND hwndParent,
    141141                               HINSTANCE hInstance, LPARAM lParam )
    … …  
    143143 HWND hwnd;
    144144 MDICREATESTRUCTA cs;
    145  Win32Window *window;
    146 
    147     window = Win32Window::GetWindowFromHandle(hwndParent);
     145 Win32BaseWindow *window;
     146
     147    window = Win32BaseWindow::GetWindowFromHandle(hwndParent);
    148148    if(!window) {
    149149        dprintf(("CreateMDIWindowA, window %x not found", hwndParent));
    … …  
    166166//******************************************************************************
    167167//******************************************************************************
    168 HWND WIN32API CreateMDIWindowW(LPCWSTR lpszClassName, LPCWSTR lpszWindowName, 
    169                                DWORD dwStyle, int x, int y, int nWidth, 
     168HWND WIN32API CreateMDIWindowW(LPCWSTR lpszClassName, LPCWSTR lpszWindowName,
     169                               DWORD dwStyle, int x, int y, int nWidth,
    170170                               int nHeight, HWND hwndParent,
    171171                               HINSTANCE hInstance, LPARAM lParam )
    … …  
    173173 HWND hwnd;
    174174 MDICREATESTRUCTW cs;
    175  Win32Window *window;
    176 
    177     window = Win32Window::GetWindowFromHandle(hwndParent);
     175 Win32BaseWindow *window;
     176
     177    window = Win32BaseWindow::GetWindowFromHandle(hwndParent);
    178178    if(!window) {
    179179        dprintf(("CreateMDIWindowW, window %x not found", hwndParent));
    … …  
    198198BOOL WIN32API DestroyWindow(HWND hwnd)
    199199{
    200   Win32Window *window;
    201 
    202     window = Win32Window::GetWindowFromHandle(hwnd);
     200  Win32BaseWindow *window;
     201
     202    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    203203    if(!window) {
    204204        dprintf(("DestroyWindow, window %x not found", hwnd));
    … …  
    212212HWND WIN32API SetActiveWindow( HWND hwnd)
    213213{
    214   Win32Window *window;
    215 
    216     window = Win32Window::GetWindowFromHandle(hwnd);
     214  Win32BaseWindow *window;
     215
     216    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    217217    if(!window) {
    218218        dprintf(("SetActiveWindow, window %x not found", hwnd));
    … …  
    226226HWND WIN32API GetParent( HWND hwnd)
    227227{
    228   Win32Window *window;
    229 
    230     window = Win32Window::GetWindowFromHandle(hwnd);
     228  Win32BaseWindow *window;
     229
     230    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    231231    if(!window) {
    232232        dprintf(("GetParent, window %x not found", hwnd));
    … …  
    240240HWND WIN32API SetParent( HWND hwndChild, HWND hwndNewParent)
    241241{
    242   Win32Window *window;
    243 
    244     window = Win32Window::GetWindowFromHandle(hwndChild);
     242  Win32BaseWindow *window;
     243
     244    window = Win32BaseWindow::GetWindowFromHandle(hwndChild);
    245245    if(!window) {
    246246        dprintf(("SetParent, window %x not found", hwndChild));
    … …  
    254254BOOL WIN32API IsChild( HWND hwndParent, HWND hwnd)
    255255{
    256   Win32Window *window;
    257 
    258     window = Win32Window::GetWindowFromHandle(hwnd);
     256  Win32BaseWindow *window;
     257
     258    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    259259    if(!window) {
    260260        dprintf(("IsChild, window %x not found", hwnd));
    … …  
    268268HWND WIN32API GetTopWindow( HWND hwnd)
    269269{
    270   Win32Window *window;
    271 
    272     window = Win32Window::GetWindowFromHandle(hwnd);
     270  Win32BaseWindow *window;
     271
     272    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    273273    if(!window) {
    274274        dprintf(("GetTopWindow, window %x not found", hwnd));
    … …  
    282282BOOL WIN32API UpdateWindow(HWND hwnd)
    283283{
    284   Win32Window *window;
    285 
    286     window = Win32Window::GetWindowFromHandle(hwnd);
     284  Win32BaseWindow *window;
     285
     286    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    287287    if(!window) {
    288288        dprintf(("UpdateWindow, window %x not found", hwnd));
    … …  
    296296BOOL WIN32API IsIconic( HWND hwnd)
    297297{
    298   Win32Window *window;
    299 
    300     window = Win32Window::GetWindowFromHandle(hwnd);
     298  Win32BaseWindow *window;
     299
     300    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    301301    if(!window) {
    302302        dprintf(("IsIconic, window %x not found", hwnd));
    … …  
    310310HWND WIN32API GetWindow(HWND hwnd, UINT uCmd)
    311311{
    312   Win32Window *window;
    313 
    314     window = Win32Window::GetWindowFromHandle(hwnd);
     312  Win32BaseWindow *window;
     313
     314    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    315315    if(!window) {
    316316        dprintf(("GetWindow, window %x not found", hwnd));
    … …  
    324324BOOL WIN32API EnableWindow( HWND hwnd, BOOL fEnable)
    325325{
    326   Win32Window *window;
    327 
    328     window = Win32Window::GetWindowFromHandle(hwnd);
     326  Win32BaseWindow *window;
     327
     328    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    329329    if(!window) {
    330330        dprintf(("EnableWindow, window %x not found", hwnd));
    … …  
    344344HWND WIN32API GetActiveWindow()
    345345{
    346   return Win32Window::GetActiveWindow();
     346  return Win32BaseWindow::GetActiveWindow();
    347347}
    348348//******************************************************************************
    … …  
    350350BOOL WIN32API ShowWindow(HWND hwnd, int nCmdShow)
    351351{
    352   Win32Window *window;
    353 
    354     window = Win32Window::GetWindowFromHandle(hwnd);
     352  Win32BaseWindow *window;
     353
     354    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    355355    if(!window) {
    356356        dprintf(("ShowWindow, window %x not found", hwnd));
    … …  
    364364BOOL WIN32API SetWindowPos(HWND hwnd, HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags)
    365365{
    366   Win32Window *window;
    367 
    368     window = Win32Window::GetWindowFromHandle(hwnd);
     366  Win32BaseWindow *window;
     367
     368    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    369369    if(!window) {
    370370        dprintf(("SetWindowPos, window %x not found", hwnd));
    … …  
    394394BOOL WIN32API IsWindow( HWND hwnd)
    395395{
    396   Win32Window *window;
    397 
    398     window = Win32Window::GetWindowFromHandle(hwnd);
     396  Win32BaseWindow *window;
     397
     398    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    399399    if(!window) {
    400400        dprintf(("IsWindow, window %x not found", hwnd));
    … …  
    408408BOOL WIN32API IsWindowEnabled( HWND hwnd)
    409409{
    410   Win32Window *window;
    411 
    412     window = Win32Window::GetWindowFromHandle(hwnd);
     410  Win32BaseWindow *window;
     411
     412    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    413413    if(!window) {
    414414        dprintf(("IsWindowEnabled, window %x not found", hwnd));
    … …  
    422422BOOL WIN32API IsWindowVisible( HWND hwnd)
    423423{
    424   Win32Window *window;
    425 
    426     window = Win32Window::GetWindowFromHandle(hwnd);
     424  Win32BaseWindow *window;
     425
     426    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    427427    if(!window) {
    428428        dprintf(("IsWindowVisible, window %x not found", hwnd));
    … …  
    441441
    442442    lastFocus = GetFocus();
    443     hwnd = Win32Window::Win32ToOS2Handle(hwnd);
     443    hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
    444444    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP,hwnd)) ? lastFocus:0;
    445445}
    … …  
    452452
    453453    hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
    454     return Win32Window::OS2ToWin32Handle(hwnd);
     454    return Win32BaseWindow::OS2ToWin32Handle(hwnd);
    455455}
    456456//******************************************************************************
    … …  
    515515BOOL WIN32API GetWindowRect( HWND hwnd, PRECT pRect)
    516516{
    517    Win32Window *window;
    518 
    519     window = Win32Window::GetWindowFromHandle(hwnd);
     517   Win32BaseWindow *window;
     518
     519    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    520520    if(!window) {
    521521        dprintf(("GetWindowRect, window %x not found", hwnd));
    … …  
    529529int WIN32API GetWindowTextLengthA( HWND hwnd)
    530530{
    531    Win32Window *window;
    532 
    533     window = Win32Window::GetWindowFromHandle(hwnd);
     531   Win32BaseWindow *window;
     532
     533    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    534534    if(!window) {
    535535        dprintf(("GetWindowTextLength, window %x not found", hwnd));
    … …  
    543543int WIN32API GetWindowTextA( HWND hwnd, LPSTR lpsz, int cch)
    544544{
    545    Win32Window *window;
    546 
    547     window = Win32Window::GetWindowFromHandle(hwnd);
     545   Win32BaseWindow *window;
     546
     547    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    548548    if(!window) {
    549549        dprintf(("GetWindowTextA, window %x not found", hwnd));
    … …  
    582582BOOL WIN32API SetWindowTextA(HWND hwnd, LPCSTR lpsz)
    583583{
    584    Win32Window *window;
    585 
    586     window = Win32Window::GetWindowFromHandle(hwnd);
     584   Win32BaseWindow *window;
     585
     586    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    587587    if(!window) {
    588588        dprintf(("SetWindowTextA, window %x not found", hwnd));
    … …  
    633633 BOOL rc;
    634634
    635     hwnd = Win32Window::Win32ToOS2Handle(hwnd);
     635    hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
    636636    rc = OSLibWinQueryWindowRect(hwnd, pRect);
    637637    dprintf(("USER32:  GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom));
    … …  
    668668{
    669669    if(!lpszClass) {
    670         SetLastError(ERROR_INVALID_PARAMETER);
    671         return 0;
     670    SetLastError(ERROR_INVALID_PARAMETER);
     671    return 0;
    672672    }
    673673    if(HIWORD(lpszClass)) {
    674         dprintf(("USER32:  FindWindow %s %s\n", lpszClass, lpszWindow));
     674        dprintf(("USER32:  FindWindow %s %s\n", lpszClass, lpszWindow));
    675675    }
    676676    else dprintf(("USER32:  FindWindow %x %s\n", lpszClass, lpszWindow));
    677677
    678     return Win32Window::FindWindowEx(OSLIB_HWND_DESKTOP, 0, (LPSTR)lpszClass, (LPSTR)lpszWindow);
     678    return Win32BaseWindow::FindWindowEx(OSLIB_HWND_DESKTOP, 0, (LPSTR)lpszClass, (LPSTR)lpszWindow);
    679679}
    680680//******************************************************************************
    … …  
    683683{
    684684    if(!lpszClass) {
    685         SetLastError(ERROR_INVALID_PARAMETER);
    686         return 0;
     685    SetLastError(ERROR_INVALID_PARAMETER);
     686    return 0;
    687687    }
    688688    if(HIWORD(lpszClass)) {
    689         dprintf(("USER32:  FindWindowExA (%x,%x) %s %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
     689        dprintf(("USER32:  FindWindowExA (%x,%x) %s %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
    690690    }
    691691    else dprintf(("USER32:  FindWindowExA (%x,%x)%x %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
    692692
    693     return Win32Window::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
     693    return Win32BaseWindow::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
    694694}
    695695/*****************************************************************************
    … …  
    720720{
    721721    if(!lpszClass) {
    722         SetLastError(ERROR_INVALID_PARAMETER);
    723         return 0;
     722    SetLastError(ERROR_INVALID_PARAMETER);
     723    return 0;
    724724    }
    725725    dprintf(("USER32:  FindWindowExW (%x,%x) %x %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
    726726
    727     return Win32Window::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
     727    return Win32BaseWindow::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
    728728}
    729729//******************************************************************************
    … …  
    732732{
    733733    dprintf(("FlashWindow %x %d\n", hwnd, fFlash));
    734     return OSLibWinFlashWindow(Win32Window::Win32ToOS2Handle(hwnd), fFlash);
     734    return OSLibWinFlashWindow(Win32BaseWindow::Win32ToOS2Handle(hwnd), fFlash);
    735735}
    736736//******************************************************************************
    … …  
    795795BOOL WIN32API CloseWindow(HWND hwnd)
    796796{
    797    Win32Window *window;
    798 
    799     window = Win32Window::GetWindowFromHandle(hwnd);
     797   Win32BaseWindow *window;
     798
     799    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    800800    if(!window) {
    801801        dprintf(("CloseWindow, window %x not found", hwnd));
    … …  
    815815    hwnd = OSLibWinWindowFromPoint(OSLIB_HWND_DESKTOP, (PVOID)&point);
    816816    if(hwnd) {
    817         return Win32Window::OS2ToWin32Handle(hwnd);
     817        return Win32BaseWindow::OS2ToWin32Handle(hwnd);
    818818    }
    819819    return 0;
    … …  
    823823BOOL WIN32API IsWindowUnicode(HWND hwnd)
    824824{
    825    Win32Window *window;
    826 
    827     window = Win32Window::GetWindowFromHandle(hwnd);
     825   Win32BaseWindow *window;
     826
     827    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    828828    if(!window) {
    829829        dprintf(("IsWindowUnicode, window %x not found", hwnd));
    … …  
    907907    if (!lpRect) return FALSE;
    908908
    909     return OSLibWinQueryUpdateRect(Win32Window::Win32ToOS2Handle(hwnd), lpRect);
     909    return OSLibWinQueryUpdateRect(Win32BaseWindow::Win32ToOS2Handle(hwnd), lpRect);
    910910}
    911911//******************************************************************************
    … …  
    920920
    921921    //CB: bErase no quite the same
    922     hWnd = Win32Window::Win32ToOS2Handle(hWnd);
     922    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
    923923    if (lpRect)
    924924    {
    925         return OSLibWinInvalidateRect(hWnd, (PRECT)lpRect, bErase);
    926     } 
     925        return OSLibWinInvalidateRect(hWnd, (PRECT)lpRect, bErase);
     926    }
    927927    else return OSLibWinInvalidateRect(hWnd,NULL,bErase);
    928928}
Note: See TracChangeset for help on using the changeset viewer.