summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Project/DataReport.cpp11
-rw-r--r--Project/Project.project2
2 files changed, 7 insertions, 6 deletions
diff --git a/Project/DataReport.cpp b/Project/DataReport.cpp
index 2742471..1511079 100644
--- a/Project/DataReport.cpp
+++ b/Project/DataReport.cpp
@@ -1030,11 +1030,12 @@ void DataReport::GridKeyHandler(wxGrid* grid, wxKeyEvent& event)
}
}
}
-
- wxOpenClipboard();
- wxEmptyClipboard();
- wxSetClipboardData(wxDF_TEXT, copyData.mb_str(), 0, 0); // In Windows need this for UNICODE
- wxCloseClipboard();
+
+ if (wxTheClipboard->Open())
+ {
+ wxTheClipboard->SetData(new wxTextDataObject(copyData));
+ wxTheClipboard->Close();
+ }
} else if(event.GetKeyCode() == 'A' && event.GetModifiers() == wxMOD_CONTROL) { // Select all
grid->SelectAll();
}
diff --git a/Project/Project.project b/Project/Project.project
index 1447966..2d8fb46 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -513,7 +513,7 @@
<Preprocessor Value="NDEBUG"/>
<Preprocessor Value="UNICODE"/>
</Compiler>
- <Linker Options="$(shell wx-config --libs std,ribbon,aui,propgrid,richtext,gl);-mwindows" Required="yes"/>
+ <Linker Options="$(shell wx-config --libs std,ribbon,aui,propgrid,richtext,stc,gl);-mwindows" Required="yes"/>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
<General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Release_Windows_x64" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
<BuildSystem Name="Default"/>