moved setting of internal vars in order to avoid problems in recursing (MoveWindow calling BoundsChanged handlers which in turn call DoMoveWindow again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1070,12 +1070,13 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
|
|||||||
{
|
{
|
||||||
m_x = actualX ;
|
m_x = actualX ;
|
||||||
m_y = actualY ;
|
m_y = actualY ;
|
||||||
m_width = actualWidth ;
|
|
||||||
m_height = actualHeight ;
|
|
||||||
|
|
||||||
if ( doMove )
|
if ( doMove )
|
||||||
::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost
|
::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost
|
||||||
|
|
||||||
|
m_width = actualWidth ;
|
||||||
|
m_height = actualHeight ;
|
||||||
|
|
||||||
if ( doResize )
|
if ( doResize )
|
||||||
::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
|
::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
|
||||||
|
|
||||||
|
@@ -1070,12 +1070,13 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
|
|||||||
{
|
{
|
||||||
m_x = actualX ;
|
m_x = actualX ;
|
||||||
m_y = actualY ;
|
m_y = actualY ;
|
||||||
m_width = actualWidth ;
|
|
||||||
m_height = actualHeight ;
|
|
||||||
|
|
||||||
if ( doMove )
|
if ( doMove )
|
||||||
::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost
|
::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost
|
||||||
|
|
||||||
|
m_width = actualWidth ;
|
||||||
|
m_height = actualHeight ;
|
||||||
|
|
||||||
if ( doResize )
|
if ( doResize )
|
||||||
::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
|
::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user