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

Turtle: Fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12296 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-09-23 08:38:24 +00:00
parent 0b8aac5f5b
commit d253af0f59
9 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/Core/App.cpp
View file

@ -213,7 +213,6 @@ const Vector<String>& CommandLine()
{
static Vector<String> cmd;
ONCELOCK {
byte cs = GetDefaultCharset();
auto& src = coreCmdLine__();
for(int i = 0; i < src.GetCount(); i++)
cmd.Add(src[i].ToString());

2
uppsrc/CtrlCore/CocoApp.mm
View file

@ -76,6 +76,8 @@ void Upp::CocoInit(int argc, const char **argv, const char **envptr)
SyncPopupFocus([e window]);
return e;
}];
extern const char *Upp::sClipFmtsRTF; Upp::sClipFmtsRTF = "rtf";
}
void Upp::CocoExit()

5
uppsrc/CtrlCore/CocoClip.mm
View file

@ -273,11 +273,6 @@ Vector<String> GetFiles(PasteClip& clip)
return f;
}
const char *ClipFmtsRTF()
{
return "rtf";
}
};
#endif

7
uppsrc/CtrlCore/CtrlClip.cpp
View file

@ -289,4 +289,11 @@ INITBLOCK {
InitRichImage(GetImageClip, AcceptImage, GetImage, ClipFmtsImage);
}
const char *sClipFmtsRTF = "Rich Text Format;text/rtf;application/rtf";
const char *ClipFmtsRTF()
{
return sClipFmtsRTF;
}
}

5
uppsrc/CtrlCore/GtkClip.cpp
View file

@ -412,11 +412,6 @@ void Ctrl::SetSelectionSource(const char *fmts)
gselection().Put(s[i], ClipData(s[i], RenderPrimarySelection));
}
const char *ClipFmtsRTF()
{
return "Rich Text Format;text/rtf;application/rtf";
}
}
#endif

6
uppsrc/CtrlCore/Win32Clip.cpp
View file

@ -537,12 +537,6 @@ void PasteClip::GuiPlatformConstruct()
dt = NULL;
}
const char *ClipFmtsRTF()
{
return "Rich Text Format;text/rtf;application/rtf";
}
}
#endif

5
uppsrc/CtrlCore/X11Clip.cpp
View file

@ -403,11 +403,6 @@ void PasteClip::GuiPlatformConstruct()
type = 0;
}
const char *ClipFmtsRTF()
{
return "Rich Text Format;text/rtf;application/rtf";
}
}
#endif

2
uppsrc/Turtle/Event.cpp
View file

@ -304,14 +304,12 @@ bool Ctrl::ProcessEvent(const String& event)
}
if(p.Id("M")) {
Point pt = ReadPoint(p);
int64 tm = p.ReadInt64();
DoMouseFB(MOUSEMOVE, pt, 0, p);
}
else
if(p.Id("W")) {
double w = p.ReadDouble();
Point pt = ReadPoint(p);
int64 tm = p.ReadInt64();
DoMouseFB(MOUSEWHEEL, pt, w < 0 ? 120 : -120, p);
}
else

3
uppsrc/Turtle/Top.cpp
View file

@ -71,12 +71,13 @@ void TopWindow::Open(Ctrl *owner)
if(r.IsEmpty())
SetRect(GetDefaultWindowRect());
else
if(r.left == 0 && r.top == 0)
if(r.left == 0 && r.top == 0) {
if(owner && center == 1)
SetRect(owner->GetRect().CenterRect(r.GetSize()));
else
if(center)
SetRect(GetWorkArea().CenterRect(r.GetSize()));
}
frame->SetClient(GetRect());
frame->window = this;
frame->PopUp(owner, false, true);