cdd0923710
Tue Jan 4 13:01:33 1994 David Metcalfe <david@prism.demon.co.uk>
* [window/caret.c]
Modified code to use system timer.
Jan 9, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [windows/win.c]
Windows create if required new XLIB MenuBar & CaptionBar.
* [windows/defwnd.c]
WM_CALCSIZE Move & Resize caption, menubar & scrollbars.
(I'm not sure it's the good place for it, but it work...)
* [loader/resource.c]
optimize in FindResourceByNumber, make lseek() if next type ...
* [controls/scroll.c]
scrollbar buttons are now using system resources bitmaps.
* [controls/caption.c] - new file ...
captionbar showing title, close button with SysMenu,
and other buttons using system resources bitmaps.
* [controls/menu.c]
New functions: SetMenuItemBitmaps() with 'glues',
Make new version of LoadMenu() & ParseMenu(),
( put #define USE_POPUPMENU ).
Implementation of MenuBar functions.
* [sysres.dll]
New bitmaps for system such OBM_CLOSE, OBM_MINIMIZE, OBM_UPARROWI.
New SYSMENU menu, it don't work yet ! :-((
Tue Jan 11 05:27:45 1994 julliard@di.epfl.ch (Alexandre Julliard
* [memory/atom.c]
Fixed a bug that could cause atoms to be case-sensitive.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/clipping.c]
Bug fix when setting the clip mask to an empty region.
* [windows/dce.c]
Bug fix in ReleaseDC().
* [windows/dialog.c]
Call AdjustWindowRectEx() before creating the dialog window.
Added support for DS_MODALFRAME style.
* [windows/event.c]
Cleaned up event handling and removed old Xt stuff.
Moved double-click handling to windows/message.c
* [windows/focus.c]
Bug fix: only set the X focus when the window is viewable.
* [windows/graphics.c]
Rewritten DrawReliefRect() to use brush instead of pen, and
to use the system colors.
* [windows/message.c]
Implemented WM_NCHITTEST message sending, and non-client
mouse messages.
Cleaned up double-click handling, and removed the Xt code.
* [windows/nonclient.c] (New file)
Implemented AdjustWindowRect().
Implemented WM_NCCALCSIZE, WM_NCHITTEST and WM_NCPAINT handling.
* [windows/painting.c]
Added sending of the WM_NCPAINT message in BeginPaint().
* [windows/sysmetrics.c] [include/sysmetrics.h] (New files)
Implemented system metrics.
* [windows/win.c]
Bug fix in setting the parent and owner in CreateWindow().
Removed the Xt code.
* [windows/winpos.c]
Added sending of the WM_NCPAINT message in SetWindowPos().
Removed the Xt code.
84 lines
2.1 KiB
C
84 lines
2.1 KiB
C
/*
|
|
* Window painting functions
|
|
*
|
|
* Copyright 1993 Alexandre Julliard
|
|
*/
|
|
|
|
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
|
|
|
|
#include <math.h>
|
|
#include <X11/Xlib.h>
|
|
|
|
#include "win.h"
|
|
#include "message.h"
|
|
|
|
/* Last CTLCOLOR id */
|
|
#define CTLCOLOR_MAX CTLCOLOR_STATIC
|
|
|
|
|
|
/***********************************************************************
|
|
* BeginPaint (USER.39)
|
|
*/
|
|
HDC BeginPaint( HWND hwnd, LPPAINTSTRUCT lps )
|
|
{
|
|
HRGN hrgnUpdate;
|
|
WND * wndPtr = WIN_FindWndPtr( hwnd );
|
|
if (!wndPtr) return 0;
|
|
|
|
hrgnUpdate = wndPtr->hrgnUpdate; /* Save update region */
|
|
|
|
if (!(lps->hdc = GetDCEx( hwnd, wndPtr->hrgnUpdate,
|
|
DCX_INTERSECTRGN | DCX_USESTYLE ))) return 0;
|
|
GetRgnBox( InquireVisRgn(lps->hdc), &lps->rcPaint );
|
|
|
|
if (wndPtr->hrgnUpdate)
|
|
{
|
|
DeleteObject( wndPtr->hrgnUpdate );
|
|
wndPtr->hrgnUpdate = 0;
|
|
MSG_DecPaintCount( wndPtr->hmemTaskQ );
|
|
}
|
|
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
|
|
|
|
SendMessage( hwnd, WM_NCPAINT, hrgnUpdate, 0 );
|
|
if (!(wndPtr->flags & WIN_ERASE_UPDATERGN)) lps->fErase = TRUE;
|
|
else lps->fErase = !SendMessage( hwnd, WM_ERASEBKGND, lps->hdc, 0 );
|
|
|
|
return lps->hdc;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* EndPaint (USER.40)
|
|
*/
|
|
void EndPaint( HWND hwnd, LPPAINTSTRUCT lps )
|
|
{
|
|
ReleaseDC( hwnd, lps->hdc );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* FillWindow (USER.324)
|
|
*/
|
|
void FillWindow( HWND hwndParent, HWND hwnd, HDC hdc, HBRUSH hbrush )
|
|
{
|
|
RECT rect;
|
|
GetClientRect( hwnd, &rect );
|
|
PaintRect( hwndParent, hwnd, hdc, hbrush, &rect );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* PaintRect (USER.325)
|
|
*/
|
|
void PaintRect(HWND hwndParent, HWND hwnd, HDC hdc, HBRUSH hbrush, LPRECT rect)
|
|
{
|
|
/* Send WM_CTLCOLOR message if needed */
|
|
|
|
if (hbrush <= CTLCOLOR_MAX)
|
|
{
|
|
if (!hwndParent) return;
|
|
hbrush = (HBRUSH)SendMessage( hwndParent, WM_CTLCOLOR,
|
|
hdc, hwnd | (hbrush << 16) );
|
|
}
|
|
if (hbrush) FillRect( hdc, rect, hbrush );
|
|
}
|