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

Controls4U: Now runs on 64 bits too.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5764 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2013-02-07 22:06:08 +00:00
parent d170aaf160
commit a7407db36c
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bazaar/Controls4U/ActiveX.cpp
View file

@ -28,7 +28,7 @@ String BSTRGet(BSTR &bstr) {
if (!(buffer = (char *)GlobalAlloc(GMEM_FIXED, sizeof(wchar_t) * size)))
return Null;
int i = wcstombs(buffer, bstr, size);
size_t i = wcstombs(buffer, bstr, size);
buffer[i] = 0;
String ret = buffer;

8
bazaar/Controls4U/Controls4U.h
View file

@ -145,10 +145,10 @@ class StaticRectangle : public Ctrl {
typedef StaticRectangle CLASSNAME;
public:
virtual void Paint(Draw& draw);
virtual void MouseEnter(Point p, dword keyflags) {WhenMouseEnter(p, keyflags);};
virtual void MouseLeave() { WhenMouseLeave();};
virtual void LeftDown(Point p, dword keyflags) {WhenLeftDown(p, keyflags);};
virtual void LeftUp(Point p, dword keyflags) {WhenLeftUp(p, keyflags);};
virtual void MouseEnter(Point p, dword keyflags) {WhenMouseEnter(p, keyflags);};
virtual void MouseLeave() {WhenMouseLeave();};
virtual void LeftDown(Point p, dword keyflags) {WhenLeftDown(p, keyflags);};
virtual void LeftUp(Point p, dword keyflags) {WhenLeftUp(p, keyflags);};
virtual void Layout();
protected:

4
bazaar/Controls4U/DrawingCanvas.cpp
View file

@ -90,7 +90,7 @@ String GetValueStringXml(String str, const char* var) {
int pos, endpos;
if ((pos = str.Find(var)) >= 0) {
pos += strlen(var);
pos += int(strlen(var));
endpos = str.Find(';', pos+1);
if (endpos == -1)
endpos = str.GetCount();
@ -122,7 +122,7 @@ Array<double> GetTransformArgs(String str, const char *command) {
if ((pos = str.Find(command)) < 0)
return args;
pos += strlen(command);
pos += int(strlen(command));
pos = 1 + str.Find('(', pos);
while (true) {