diff --git a/uppsrc/CtrlCore/X11Clip.cpp b/uppsrc/CtrlCore/X11Clip.cpp index a5e8eea49..91452884b 100644 --- a/uppsrc/CtrlCore/X11Clip.cpp +++ b/uppsrc/CtrlCore/X11Clip.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) LOG(x) +#define LLOG(x) // LOG(x) #ifdef PLATFORM_X11 diff --git a/uppsrc/CtrlCore/X11DnD.cpp b/uppsrc/CtrlCore/X11DnD.cpp index a4163aa81..c8ad429b2 100644 --- a/uppsrc/CtrlCore/X11DnD.cpp +++ b/uppsrc/CtrlCore/X11DnD.cpp @@ -1,6 +1,6 @@ #include "CtrlCore.h" -#define LLOG(x) LOG(x) +#define LLOG(x) // LOG(x) #ifdef PLATFORM_X11 @@ -318,6 +318,7 @@ int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions, GuiLock __; InitDndAtoms(); DnDLoop d; + Xdnd_waiting_status = Xdnd_waiting_finished = false; d.reject = actions & DND_EXACTIMAGE ? CtrlCoreImg::DndNone() : MakeDragImage(CtrlCoreImg::DndNone(), sample); if(actions & DND_COPY) d.copy = actions & DND_EXACTIMAGE ? sample : MakeDragImage(CtrlCoreImg::DndCopy(), sample); diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp index f50c40453..5f36a6a7d 100644 --- a/uppsrc/CtrlCore/X11Wnd.cpp +++ b/uppsrc/CtrlCore/X11Wnd.cpp @@ -12,7 +12,7 @@ NAMESPACE_UPP bool Ctrl::LogMessages - = true +// = true ; #endif diff --git a/uppsrc/RichText/EncodeRTF.cpp b/uppsrc/RichText/EncodeRTF.cpp index b675c6930..c67ce9613 100644 --- a/uppsrc/RichText/EncodeRTF.cpp +++ b/uppsrc/RichText/EncodeRTF.cpp @@ -1,5 +1,7 @@ #include "RichText.h" +#define LLOG(x) + #include NAMESPACE_UPP @@ -97,7 +99,7 @@ String EncodeRTF(const RichText& richtext, byte charset) StringStream out; EncodeRTF(out, richtext, charset); String s = out.GetResult(); - LOG("EncodeRTF <<<<<\n" << s << "\n>>>>> EncodeRTF"); + LLOG("EncodeRTF <<<<<\n" << s << "\n>>>>> EncodeRTF"); return s; }