casing the coordinates recalc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -82,10 +82,18 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
|
|||||||
wxHeaderSortIconType sortArrow,
|
wxHeaderSortIconType sortArrow,
|
||||||
wxHeaderButtonParams* params )
|
wxHeaderButtonParams* params )
|
||||||
{
|
{
|
||||||
const wxCoord x = dc.LogicalToDeviceX(rect.x /*- 1*/);
|
##if !wxMAC_USE_CORE_GRAPHICS
|
||||||
const wxCoord y = dc.LogicalToDeviceY(rect.y /*- 1*/);
|
const wxCoord x = dc.LogicalToDeviceX(rect.x);
|
||||||
|
const wxCoord y = dc.LogicalToDeviceY(rect.y);
|
||||||
const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
|
const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
|
||||||
const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
|
const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
|
||||||
|
#else
|
||||||
|
// now the wxGCDC is using native transformations
|
||||||
|
const wxCoord x = rect.x;
|
||||||
|
const wxCoord y = rect.y;
|
||||||
|
const wxCoord w = rect.width;
|
||||||
|
const wxCoord h = rect.height;
|
||||||
|
#endif
|
||||||
|
|
||||||
dc.SetBrush( *wxTRANSPARENT_BRUSH );
|
dc.SetBrush( *wxTRANSPARENT_BRUSH );
|
||||||
|
|
||||||
@@ -192,12 +200,13 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
|
|||||||
const wxRect& rect,
|
const wxRect& rect,
|
||||||
int flags )
|
int flags )
|
||||||
{
|
{
|
||||||
#if 0 // The rect has already been adjusted, if that ever changes then uncomment this code.
|
#if !wxMAC_USE_CORE_GRAPHICS
|
||||||
const wxCoord x = dc.LogicalToDeviceX(rect.x /*- 1*/);
|
const wxCoord x = dc.LogicalToDeviceX(rect.x);
|
||||||
const wxCoord y = dc.LogicalToDeviceY(rect.y /*- 1*/);
|
const wxCoord y = dc.LogicalToDeviceY(rect.y);
|
||||||
const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
|
const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
|
||||||
const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
|
const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
|
||||||
#else
|
#else
|
||||||
|
// now the wxGCDC is using native transformations
|
||||||
const wxCoord x = rect.x;
|
const wxCoord x = rect.x;
|
||||||
const wxCoord y = rect.y;
|
const wxCoord y = rect.y;
|
||||||
const wxCoord w = rect.width;
|
const wxCoord w = rect.width;
|
||||||
|
Reference in New Issue
Block a user