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

Add drawing cursor images for wxCursorProperty under wxGTK.

Browse Source 
Closes #16637

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-10-18 12:00:37 +00:00
parent f858486cec
commit 53bb48808c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/advprops.cpp
View File

@@ -69,7 +69,7 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#define wxPG_CAN_DRAW_CURSOR 1 #define wxPG_CAN_DRAW_CURSOR 1
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#define wxPG_CAN_DRAW_CURSOR 0 #define wxPG_CAN_DRAW_CURSOR 1
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#define wxPG_CAN_DRAW_CURSOR 0 #define wxPG_CAN_DRAW_CURSOR 0
#else #else
@@ -1816,7 +1816,15 @@ void wxCursorProperty::OnCustomPaint( wxDC& dc,
wxCursor cursor( cursorIndex ); wxCursor cursor( cursorIndex );
#ifdef __WXMSW__ #if defined(__WXGTK__)
wxBitmap bmp(cursor);
if ( bmp.IsOk() )
{
dc.DrawBitmap(bmp, rect.GetTopLeft());
}
#elif defined(__WXMSW__)
// We have to use native API because monochrome bitmaps
// are not fully supported under MSW.
HDC hDc = (HDC)((const wxMSWDCImpl *)dc.GetImpl())->GetHDC(); HDC hDc = (HDC)((const wxMSWDCImpl *)dc.GetImpl())->GetHDC();
::DrawIconEx( hDc, ::DrawIconEx( hDc,
rect.x, rect.x,