X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/facd6764872eede45605ba7c9dfa0e1d0c708fa2..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/clipbrd.cpp?ds=sidebyside diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index 7e48c9ec34..4267942472 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -9,10 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "clipbrd.h" #endif +#include "wx/wxprec.h" + +#if wxUSE_CLIPBOARD + #include "wx/app.h" #include "wx/frame.h" #include "wx/bitmap.h" @@ -247,10 +251,12 @@ bool wxClipboard::AddData( wxDataObject *data ) case wxDF_TEXT: case wxDF_OEMTEXT: mactype = kScrapFlavorTypeText ; + sz -= 1; break ; #if wxUSE_UNICODE case wxDF_UNICODETEXT : mactype = kScrapFlavorTypeUnicode ; + sz -= 2; break ; #endif #if wxUSE_DRAG_AND_DROP @@ -399,3 +405,5 @@ bool wxClipboard::GetData( wxDataObject& data ) delete[] array ; return transferred ; } + +#endif