Index: Tools/SkinEditor/ColourPanel.cpp =================================================================== --- Tools/SkinEditor/ColourPanel.cpp (revision 3387) +++ Tools/SkinEditor/ColourPanel.cpp (working copy) @@ -13,7 +13,7 @@ Dialog() { initialiseByAttributes(this); - mTextureName = MyGUI::utility::toString((int)this, "_ColourGradient"); + mTextureName = MyGUI::utility::toString((size_t)this, "_ColourGradient"); mCurrentColour = MyGUI::Colour::Green; mBaseColour = MyGUI::Colour::Green; @@ -123,7 +123,7 @@ void ColourPanel::updateFromPoint(const MyGUI::IntPoint & _point) { - // вычисляем цвет по положению курсора Altren 09.2008 + // get colour by cursor position Altren 09.2008 float x = 1.0f * _point.left / mColourRect->getWidth(); float y = 1.0f * _point.top / mColourRect->getHeight(); if (x > 1) x = 1; @@ -147,10 +147,10 @@ float sector_size = (float)mScrollRange->getScrollRange() / 6.0f; float sector_current = (float)_position / sector_size; - // текущий сектор + // current sector size_t current = (size_t)sector_current; assert(current < 6); - // смещение до следующего сектора от 0 до 1 + // offset to the next sector from 0 to 1 float offfset = (sector_current - (float)current); const MyGUI::Colour& from = mColourRange[current]; @@ -250,7 +250,7 @@ mScrollRange->setScrollPosition(pos); - // бонус для обрезки цвета под шкалу + // bonus for colour's cutoff under scale mBaseColour.red = mColourRange[i].red + offset * (mColourRange[i+1].red - mColourRange[i].red); mBaseColour.green = mColourRange[i].green + offset * (mColourRange[i+1].green - mColourRange[i].green); mBaseColour.blue = mColourRange[i].blue + offset * (mColourRange[i+1].blue - mColourRange[i].blue); Index: Tools/SkinEditor/StateListControl.cpp =================================================================== --- Tools/SkinEditor/StateListControl.cpp (revision 3387) +++ Tools/SkinEditor/StateListControl.cpp (working copy) @@ -23,7 +23,7 @@ mList(nullptr), mPresets(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); assignWidget(mList, "List"); assignWidget(mPresets, "StatePreset"); Index: Tools/SkinEditor/PropertyControl.cpp =================================================================== --- Tools/SkinEditor/PropertyControl.cpp (revision 3387) +++ Tools/SkinEditor/PropertyControl.cpp (working copy) @@ -12,7 +12,7 @@ PropertyControl::PropertyControl() : mProperty(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); } PropertyControl::~PropertyControl() Index: Tools/SkinEditor/SeparatorListControl.cpp =================================================================== --- Tools/SkinEditor/SeparatorListControl.cpp (revision 3387) +++ Tools/SkinEditor/SeparatorListControl.cpp (working copy) @@ -25,7 +25,7 @@ mList(nullptr), mPresets(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); assignWidget(mList, "List"); assignWidget(mPresets, "Presets"); Index: Tools/SkinEditor/SkinTextureControl.cpp =================================================================== --- Tools/SkinEditor/SkinTextureControl.cpp (revision 3387) +++ Tools/SkinEditor/SkinTextureControl.cpp (working copy) @@ -14,7 +14,7 @@ TextureControl(_parent), mAreaSelectorControl(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); addSelectorControl(mAreaSelectorControl); Index: Tools/SkinEditor/RegionTextureControl.cpp =================================================================== --- Tools/SkinEditor/RegionTextureControl.cpp (revision 3387) +++ Tools/SkinEditor/RegionTextureControl.cpp (working copy) @@ -15,9 +15,9 @@ mAreaSelectorControl(nullptr), mPositionSelectorControl(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); - // сразу рисуем рамки для стейтов + // immediately draw a frames for states std::vector coords(10); drawUnselectedStates(coords); Index: Tools/SkinEditor/StateTextureControl.cpp =================================================================== --- Tools/SkinEditor/StateTextureControl.cpp (revision 3387) +++ Tools/SkinEditor/StateTextureControl.cpp (working copy) @@ -14,9 +14,9 @@ TextureControl(_parent), mAreaSelectorControl(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); - // сразу рисуем рамки для стейтов + //immediately draw a frames for states std::vector coords(8); drawUnselectedStates(coords); Index: Tools/SkinEditor/SeparatorTextureControl.cpp =================================================================== --- Tools/SkinEditor/SeparatorTextureControl.cpp (revision 3387) +++ Tools/SkinEditor/SeparatorTextureControl.cpp (working copy) @@ -15,9 +15,9 @@ mHorizontalSelectorControl(nullptr), mVerticalSelectorControl(nullptr) { - mTypeName = MyGUI::utility::toString((int)this); + mTypeName = MyGUI::utility::toString((size_t)this); - // сразу рисуем рамки для стейтов + //immediately draw a frames for states std::vector coordsHor(2); std::vector coordsVert(2); drawUnselectedStates(coordsHor, coordsVert);