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

different contentview-offset code, otherwise 'wx' synthetic borders are also taken into account, and round-trips woulnd't be correct anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-02-13 19:23:58 +00:00
parent 45f5bb03d5
commit 57c0a8ac50
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/cocoa/window.mm
View File

@@ -703,8 +703,10 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd)
superimpl(slf, (SEL)_cmd); superimpl(slf, (SEL)_cmd);
} }
else else
{
[slf addCursorRect: [slf bounds] [slf addCursorRect: [slf bounds]
cursor: cursor]; cursor: cursor];
}
} }
} }
@@ -943,9 +945,13 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
// adjust the coordinates // adjust the coordinates
if (parent) if (parent)
{ {
wxPoint pt(parent->GetClientAreaOrigin()); int cx = 0,cy = 0,cw = 0,ch = 0;
x -= pt.x; if ( parent->GetPeer() )
y -= pt.y; {
parent->GetPeer()->GetContentArea(cx, cy, cw, ch);
x -= cx;
y -= cy;
}
} }
NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) ); NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
[m_osxView setFrame:r]; [m_osxView setFrame:r];