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

scrap.h removal and 64 bit offset fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-05-22 05:58:58 +00:00
parent 0f4a5af3d8
commit a4f7b8fde3
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,10 +51,6 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#ifndef __DARWIN__
#include <Scrap.h>
#endif
#ifndef __DARWIN__ #ifndef __DARWIN__
#include <MacTextEditor.h> #include <MacTextEditor.h>
#include <ATSUnicode.h> #include <ATSUnicode.h>
@@ -1896,21 +1892,16 @@ void wxMacMLTEControl::SetStyle( long start, long end, const wxTextAttr& style )
void wxMacMLTEControl::Copy() void wxMacMLTEControl::Copy()
{ {
ClearCurrentScrap();
TXNCopy( m_txn ); TXNCopy( m_txn );
TXNConvertToPublicScrap();
} }
void wxMacMLTEControl::Cut() void wxMacMLTEControl::Cut()
{ {
ClearCurrentScrap();
TXNCut( m_txn ); TXNCut( m_txn );
TXNConvertToPublicScrap();
} }
void wxMacMLTEControl::Paste() void wxMacMLTEControl::Paste()
{ {
TXNConvertFromPublicScrap();
TXNPaste( m_txn ); TXNPaste( m_txn );
} }
@@ -1974,7 +1965,10 @@ void wxMacMLTEControl::Remove( long from , long to )
void wxMacMLTEControl::GetSelection( long* from, long* to) const void wxMacMLTEControl::GetSelection( long* from, long* to) const
{ {
TXNGetSelection( m_txn , (TXNOffset*) from , (TXNOffset*) to ) ; TXNOffset f,t ;
TXNGetSelection( m_txn , &f , &t ) ;
*from = f;
*to = t;
} }
void wxMacMLTEControl::SetSelection( long from , long to ) void wxMacMLTEControl::SetSelection( long from , long to )