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

removed code for non-compositing case to fix the compilation after recent commits

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-13 22:39:48 +00:00
parent 89bb8035c8
commit ab346e1c7e
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mac/carbon/textctrl.cpp
View File

@@ -2485,7 +2485,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
wxMacWindowClipper cl( textctrl ) ; wxMacWindowClipper cl( textctrl ) ;
#ifdef __WXMAC_OSX__ #ifdef __WXMAC_OSX__
bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;
if ( m_sbHorizontal || m_sbVertical ) if ( m_sbHorizontal || m_sbVertical )
{ {
int w = bounds.right - bounds.left ; int w = bounds.right - bounds.left ;
@@ -2500,9 +2499,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
sbBounds.right = w + 1 ; sbBounds.right = w + 1 ;
sbBounds.bottom = h + 1 ; sbBounds.bottom = h + 1 ;
if ( !isCompositing )
OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
SetControlBounds( m_sbHorizontal , &sbBounds ) ; SetControlBounds( m_sbHorizontal , &sbBounds ) ;
SetControlViewSize( m_sbHorizontal , w ) ; SetControlViewSize( m_sbHorizontal , w ) ;
} }
@@ -2516,9 +2512,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
sbBounds.right = w + 1 ; sbBounds.right = w + 1 ;
sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ; sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
if ( !isCompositing )
OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
SetControlBounds( m_sbVertical , &sbBounds ) ; SetControlBounds( m_sbVertical , &sbBounds ) ;
SetControlViewSize( m_sbVertical , h ) ; SetControlViewSize( m_sbVertical , h ) ;
} }
@@ -2607,13 +2600,10 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt1
else else
{ {
// sometimes we get the coords also in control local coordinates, therefore test again // sometimes we get the coords also in control local coordinates, therefore test again
if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ) int x = 0 , y = 0 ;
{ textctrl->MacClientToRootWindow( &x , &y ) ;
int x = 0 , y = 0 ; where.h += x ;
textctrl->MacClientToRootWindow( &x , &y ) ; where.v += y ;
where.h += x ;
where.v += y ;
}
if (PtInRect( where, &m_txnControlBounds )) if (PtInRect( where, &m_txnControlBounds ))
result = kControlEditTextPart ; result = kControlEditTextPart ;
@@ -2631,14 +2621,12 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxIn
if ( (textctrl != NULL) && textctrl->MacIsReallyShown() ) if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
{ {
Point startPt = { y , x } ; Point startPt = { y , x } ;
// for compositing, we must convert these into toplevel window coordinates, because hittesting expects them // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ) int x = 0 , y = 0 ;
{ textctrl->MacClientToRootWindow( &x , &y ) ;
int x = 0 , y = 0 ; startPt.h += x ;
textctrl->MacClientToRootWindow( &x , &y ) ; startPt.v += y ;
startPt.h += x ;
startPt.v += y ;
}
switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v )) switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))
{ {