diff --git a/bazaar/Controls4U/ActiveX.cpp b/bazaar/Controls4U/ActiveX.cpp index 41558d9df..eceb3599b 100644 --- a/bazaar/Controls4U/ActiveX.cpp +++ b/bazaar/Controls4U/ActiveX.cpp @@ -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; diff --git a/bazaar/Controls4U/Controls4U.h b/bazaar/Controls4U/Controls4U.h index 08c2ae549..f1474821d 100644 --- a/bazaar/Controls4U/Controls4U.h +++ b/bazaar/Controls4U/Controls4U.h @@ -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: diff --git a/bazaar/Controls4U/DrawingCanvas.cpp b/bazaar/Controls4U/DrawingCanvas.cpp index 542050896..5db061849 100644 --- a/bazaar/Controls4U/DrawingCanvas.cpp +++ b/bazaar/Controls4U/DrawingCanvas.cpp @@ -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 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) {