ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Don't require an HDC in get_graphics_bounds.

This commit is contained in:
Vincent Povirk 2010-08-08 15:31:03 -05:00 committed by Alexandre Julliard
parent 85a5710688
commit 5601860b76
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/gdiplus/graphics.c
View File

@ -1137,6 +1137,8 @@ static GpStatus restore_container(GpGraphics* graphics,
static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect)
{ {
RECT wnd_rect; RECT wnd_rect;
GpStatus stat=Ok;
GpUnit unit;
if(graphics->hwnd) { if(graphics->hwnd) {
if(!GetClientRect(graphics->hwnd, &wnd_rect)) if(!GetClientRect(graphics->hwnd, &wnd_rect))
@ -1146,6 +1148,10 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect)
rect->Y = wnd_rect.top; rect->Y = wnd_rect.top;
rect->Width = wnd_rect.right - wnd_rect.left; rect->Width = wnd_rect.right - wnd_rect.left;
rect->Height = wnd_rect.bottom - wnd_rect.top; rect->Height = wnd_rect.bottom - wnd_rect.top;
}else if (graphics->image){
stat = GdipGetImageBounds(graphics->image, rect, &unit);
if (stat == Ok && unit != UnitPixel)
FIXME("need to convert from unit %i\n", unit);
}else{ }else{
rect->X = 0; rect->X = 0;
rect->Y = 0; rect->Y = 0;
@ -1153,7 +1159,7 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect)
rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); rect->Height = GetDeviceCaps(graphics->hdc, VERTRES);
} }
return Ok; return stat;
} }
/* on success, rgn will contain the region of the graphics object which /* on success, rgn will contain the region of the graphics object which