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

added hack for making scrollbars really disappear under 10.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-01-09 06:27:42 +00:00
parent eda3f2b454
commit 0ff2493d74
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1996,21 +1996,36 @@ static void TPCalculateBounds(STPTextPaneVars *varsp, const Rect& bounds)
OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxStyle) OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxStyle)
{ {
OSStatus err = noErr ; OSStatus err = noErr ;
#if TARGET_API_MAC_OSX
TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
TXNControlData iControlData[1] = {{ vis }};
err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData );
#endif
wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec); wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
if ( vis && textctrl ) if ( textctrl )
{ {
#if TARGET_API_MAC_OSX
TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
TXNControlData iControlData[1] = {{ vis }};
err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData );
#endif
Rect bounds ; Rect bounds ;
UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds); UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds);
TPCalculateBounds( varsp , bounds ) ; TPCalculateBounds( varsp , bounds ) ;
wxMacWindowClipper cl(textctrl) ; if ( vis )
TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, {
varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); wxMacWindowClipper cl(textctrl) ;
TXNShowSelection( varsp->fTXNRec, kTXNShowStart); TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
TXNShowSelection( varsp->fTXNRec, kTXNShowStart);
}
else
{
#if TARGET_API_MAC_OSX
// in 10.2 the scrollbars are still actively redrawn when using only the code above
if ( UMAGetSystemVersion() < 0x1030 )
{
TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top + 20000 , varsp->fRTextArea.left + 20000 ,
varsp->fRTextArea.bottom + 20000 , varsp->fRTextArea.right + 20000 , varsp->fTXNFrame);
}
#endif
}
} }
return err ; return err ;
} }