Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed determining wxCairoContext size (wxMSW).

Browse Source 
Determine actual size of wxCairoContext created from native DC and HWND. This allows to report proper size of wxGraphicsContext created by wxGraphicsRenderer::CreateContextFromNativeContext / CreateContextFromNativeWindow.
This commit is contained in:
Artur Wieczorek
2016-04-10 20:41:52 +02:00
parent c7a498a163
commit c7e7c3873d
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/generic/graphicc.cpp
View File

@@ -2001,8 +2001,32 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
{
m_mswSurface = cairo_win32_surface_create(handle);
Init( cairo_create(m_mswSurface) );
m_width =
m_width = 0;
m_height = 0;
// Try to determine DC size.
if ( m_context )
{
HBITMAP hBmp = (HBITMAP)::GetCurrentObject(handle, OBJ_BITMAP);
if ( hBmp )
{
BITMAP info;
if ( ::GetObject(hBmp, sizeof(info), &info) == sizeof(info) )
{
m_width = info.bmWidth;
m_height = info.bmHeight;
}
}
else
{
HWND hWnd = ::WindowFromDC(handle);
if ( hWnd )
{
RECT r = wxGetWindowRect(hWnd);
m_width = r.right - r.left;
m_height = r.bottom - r.top;
}
}
}
}
wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer, HWND hWnd)
@@ -2015,6 +2039,14 @@ wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer, HWND hWnd)
m_mswSurface = cairo_win32_surface_create((HDC)m_mswWindowHDC);
Init(cairo_create(m_mswSurface));
m_width = 0;
m_height = 0;
if ( m_context )
{
RECT r = wxGetWindowRect(hWnd);
m_width = r.right - r.left;
m_height = r.bottom - r.top;
}
}
#endif // __WXMSW__