github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

X11 DnD fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1312 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-06-15 12:23:27 +00:00
parent f88d14b084
commit 983ae45967
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/X11Clip.cpp
View file

@ -2,7 +2,7 @@
NAMESPACE_UPP
#define LLOG(x) LOG(x)
#define LLOG(x) // LOG(x)
#ifdef PLATFORM_X11

3
uppsrc/CtrlCore/X11DnD.cpp
View file

@ -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);

2
uppsrc/CtrlCore/X11Wnd.cpp
View file

@ -12,7 +12,7 @@ NAMESPACE_UPP
bool Ctrl::LogMessages
= true
// = true
;
#endif

4
uppsrc/RichText/EncodeRTF.cpp
View file

@ -1,5 +1,7 @@
#include "RichText.h"
#define LLOG(x)
#include <plugin/png/png.h>
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;
}