|
...
|
...
|
@@ -38,7 +38,7 @@ Point<short> RelativePosition::CalculatePosition(const Rect<short> &child, const
|
|
38
|
38
|
|
|
39
|
39
|
void DialogTemplate::DialogGroup::CalculatePositions(bool doRightAndBottom)
|
|
40
|
40
|
{
|
|
41
|
|
- short x = 0, num = this->controls.empty() ? 0 : this->controls.size();
|
|
|
41
|
+ short x = 0, num = this->controls.empty() ? 0 : static_cast<short>(this->controls.size());
|
|
42
|
42
|
for (; x < num; ++x)
|
|
43
|
43
|
{
|
|
44
|
44
|
auto &control = this->controls[x];
|
|
...
|
...
|
@@ -306,7 +306,7 @@ void DialogTemplate::CalculateSize()
|
|
306
|
306
|
void DialogTemplate::AutoSize()
|
|
307
|
307
|
{
|
|
308
|
308
|
// Step 1: Calculate positions of dialog controls (only if the controls's position is relative to a sibling or if it's relativeness to the parent is from the top, left, or top left)
|
|
309
|
|
- short x = 0, num = this->controls.empty() ? 0 : this->controls.size(), maxGroupWidth = 0;
|
|
|
309
|
+ short x = 0, num = this->controls.empty() ? 0 : static_cast<short>(this->controls.size()), maxGroupWidth = 0;
|
|
310
|
310
|
for (; x < num; ++x)
|
|
311
|
311
|
{
|
|
312
|
312
|
auto &control = this->controls[x];
|