From 172dbd2b94199731c1bbd2f789e55535188ade5c Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 30 Sep 2018 23:47:39 +0200 Subject: Use _WIN32 instead of WIN32 The former is guaranteed to be set for any compiler targeting win32, the latter is implementation dependent (but works for gcc) See also http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system --- src/ui/clipboard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/clipboard.cpp') diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index a56529dea..299c82905 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -85,7 +85,7 @@ #define CLIPBOARD_TEXT_TARGET "text/plain" -#ifdef WIN32 +#ifdef _WIN32 #include #endif @@ -1149,7 +1149,7 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ bool file_saved = false; Glib::ustring target = best_target; -#ifdef WIN32 +#ifdef _WIN32 if (best_target == "CF_ENHMETAFILE" || best_target == "WCF_ENHMETAFILE") { // Try to save clipboard data as en emf file (using win32 api) if (OpenClipboard(NULL)) { @@ -1397,7 +1397,7 @@ Glib::ustring ClipboardManagerImpl::_getBestTarget() return *i; } } -#ifdef WIN32 +#ifdef _WIN32 if (OpenClipboard(NULL)) { // If both bitmap and metafile are present, pick the one that was exported first. UINT format = EnumClipboardFormats(0); @@ -1463,7 +1463,7 @@ void ClipboardManagerImpl::_setClipboardTargets() sigc::mem_fun(*this, &ClipboardManagerImpl::_onGet), sigc::mem_fun(*this, &ClipboardManagerImpl::_onClear)); -#ifdef WIN32 +#ifdef _WIN32 // If the "image/x-emf" target handled by the emf extension would be // presented as a CF_ENHMETAFILE automatically (just like an "image/bmp" // is presented as a CF_BITMAP) this code would not be needed.. ??? -- cgit v1.2.3