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

propagating visibility states into MLTE (otherwise it is 'stealing' events at the top window level)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-03-30 15:08:41 +00:00
parent 3ec5bb8667
commit bd2213c20d
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2108,6 +2108,27 @@ void wxMacMLTEClassicControl::MacSetObjectVisibility(Boolean vis)
{ {
SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ; SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
} }
TXNControlTag iControlTags[] =
{
kTXNVisibilityTag ,
};
TXNControlData iControlData[] =
{
{(UInt32) false },
};
int toptag = WXSIZEOF( iControlTags ) ;
verify_noerr( TXNGetTXNObjectControls( m_txn , toptag,
iControlTags, iControlData ) ) ;
if ( iControlData[0].uValue != vis )
{
iControlData[0].uValue = vis ;
verify_noerr( TXNSetTXNObjectControls( m_txn, false , toptag,
iControlTags, iControlData )) ;
}
// we right now are always clipping as partial visibility (overlapped) visibility // we right now are always clipping as partial visibility (overlapped) visibility
// is also a problem, if we run into further problems we might set the FrameBounds to an empty // is also a problem, if we run into further problems we might set the FrameBounds to an empty
// rect here // rect here
@@ -2321,7 +2342,7 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode,
ev.modifiers = modifiers ; ev.modifiers = modifiers ;
ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ; ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
TXNKeyDown( m_txn , &ev); TXNKeyDown( m_txn , &ev);
return kControlEntireControl; return kControlEntireControl;
} }
@@ -2388,10 +2409,10 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
DoCreate(); DoCreate();
MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
AdjustCreationAttributes( *wxWHITE , true) ; AdjustCreationAttributes( *wxWHITE , true) ;
MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
wxMacWindowClipper clipper( m_peer ) ; wxMacWindowClipper clipper( m_peer ) ;
SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
TXNSetSelection( m_txn, 0, 0); TXNSetSelection( m_txn, 0, 0);