haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle Unicode clipboard data in pcbnew and symbol editor 

Fixes #10323
This commit is contained in:
dana 2022-01-12 03:24:04 -06:00 committed by Seth Hillbrand
parent 5a3d53d9e4
commit 8373180cbb
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/grid_tricks.cpp
View File

@ -300,8 +300,11 @@ void GRID_TRICKS::showPopupMenu( wxMenu& menu )
if( wxTheClipboard->Open() ) if( wxTheClipboard->Open() )
{ {
if( wxTheClipboard->IsSupported( wxDF_TEXT ) ) if( wxTheClipboard->IsSupported( wxDF_TEXT )
|| wxTheClipboard->IsSupported( wxDF_UNICODETEXT ) )
{
menu.Enable( GRIDTRICKS_ID_PASTE, true ); menu.Enable( GRIDTRICKS_ID_PASTE, true );
}
wxTheClipboard->Close(); wxTheClipboard->Close();
} }
@ -367,7 +370,8 @@ void GRID_TRICKS::onCharHook( wxKeyEvent& ev )
{ {
if( m_grid->IsCellEditControlShown() && wxTheClipboard->Open() ) if( m_grid->IsCellEditControlShown() && wxTheClipboard->Open() )
{ {
if( wxTheClipboard->IsSupported( wxDF_TEXT ) ) if( wxTheClipboard->IsSupported( wxDF_TEXT )
|| wxTheClipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;
wxTheClipboard->GetData( data ); wxTheClipboard->GetData( data );
@ -567,7 +571,8 @@ void GRID_TRICKS::paste_clipboard()
if( wxTheClipboard->Open() ) if( wxTheClipboard->Open() )
{ {
if( wxTheClipboard->IsSupported( wxDF_TEXT ) ) if( wxTheClipboard->IsSupported( wxDF_TEXT )
|| wxTheClipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;

6
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -845,8 +845,12 @@ void SYMBOL_EDIT_FRAME::DuplicateSymbol( bool aFromClipboard )
auto clipboard = wxTheClipboard; auto clipboard = wxTheClipboard;
wxClipboardLocker clipboardLock( clipboard ); wxClipboardLocker clipboardLock( clipboard );
if( !clipboardLock || ! clipboard->IsSupported( wxDF_TEXT ) ) if( !clipboardLock
|| !( clipboard->IsSupported( wxDF_TEXT )
|| clipboard->IsSupported( wxDF_UNICODETEXT ) ) )
{
return; return;
}
wxTextDataObject data; wxTextDataObject data;
clipboard->GetData( data ); clipboard->GetData( data );

8
pcbnew/kicad_clipboard.cpp
View File

@ -291,7 +291,7 @@ void CLIPBOARD_IO::SaveSelection( const PCB_SELECTION& aSelected, bool isFootpri
// clipboard is closed seems to cause an ASAN error (heap-buffer-overflow) // clipboard is closed seems to cause an ASAN error (heap-buffer-overflow)
// since it uses the cached version of the clipboard data and not the system // since it uses the cached version of the clipboard data and not the system
// clipboard data. // clipboard data.
if( clipboard->IsSupported( wxDF_TEXT ) ) if( clipboard->IsSupported( wxDF_TEXT ) || clipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;
clipboard->GetData( data ); clipboard->GetData( data );
@ -314,7 +314,7 @@ BOARD_ITEM* CLIPBOARD_IO::Parse()
if( !clipboardLock ) if( !clipboardLock )
return nullptr; return nullptr;
if( clipboard->IsSupported( wxDF_TEXT ) ) if( clipboard->IsSupported( wxDF_TEXT ) || clipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;
clipboard->GetData( data ); clipboard->GetData( data );
@ -370,7 +370,7 @@ void CLIPBOARD_IO::Save( const wxString& aFileName, BOARD* aBoard,
// been processed by the system clipboard. This appears to be needed for // been processed by the system clipboard. This appears to be needed for
// extremely large clipboard copies on asynchronous linux clipboard managers // extremely large clipboard copies on asynchronous linux clipboard managers
// such as KDE's Klipper // such as KDE's Klipper
if( clipboard->IsSupported( wxDF_TEXT ) ) if( clipboard->IsSupported( wxDF_TEXT ) || clipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;
clipboard->GetData( data ); clipboard->GetData( data );
@ -393,7 +393,7 @@ BOARD* CLIPBOARD_IO::Load( const wxString& aFileName, BOARD* aAppendToMe,
if( !clipboardLock ) if( !clipboardLock )
return nullptr; return nullptr;
if( clipboard->IsSupported( wxDF_TEXT ) ) if( clipboard->IsSupported( wxDF_TEXT ) || clipboard->IsSupported( wxDF_UNICODETEXT ) )
{ {
wxTextDataObject data; wxTextDataObject data;
clipboard->GetData( data ); clipboard->GetData( data );