From b1b026397c58c45c46ca7a525fb1e98b20ddfab8 Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Sat, 21 Oct 2017 11:57:45 -0200 Subject: Several changes and bugfixes to compile the program on linux (ubuntu-xenial-amb64) --- Project/ElementDataObject.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Project/ElementDataObject.cpp') diff --git a/Project/ElementDataObject.cpp b/Project/ElementDataObject.cpp index 6f27b22..8b16b64 100644 --- a/Project/ElementDataObject.cpp +++ b/Project/ElementDataObject.cpp @@ -17,12 +17,12 @@ #include "ElementDataObject.h" -ElementDataObject::ElementDataObject() : wxDataObjectSimple(wxDataFormat("PSPCopy")) +ElementDataObject::ElementDataObject() : wxDataObjectSimple(wxDataFormat(wxT("PSPCopy"))) { m_elementsLists = new ElementsLists(); } -ElementDataObject::ElementDataObject(std::vector elementList) : wxDataObjectSimple(wxDataFormat("PSPCopy")) +ElementDataObject::ElementDataObject(std::vector elementList) : wxDataObjectSimple(wxDataFormat(wxT("PSPCopy"))) { m_elementsLists = new ElementsLists(); if(elementList.size() > 0) { @@ -40,15 +40,22 @@ ElementDataObject::ElementDataObject(std::vector elementList) : wxData } ElementDataObject::~ElementDataObject() {} -size_t ElementDataObject::GetDataSize() const { return sizeof(void*); } +size_t ElementDataObject::GetDataSize() const +{ + return sizeof(void*); + //return sizeof(*this); +} + bool ElementDataObject::GetDataHere(void* buf) const { *(ElementsLists**)buf = m_elementsLists; + //buf = m_elementsLists; return true; } bool ElementDataObject::SetData(size_t len, const void* buf) { m_elementsLists = *(ElementsLists**)buf; + //m_elementsLists = const_cast(static_cast(buf)); return true; } -- cgit