Compiler warnings introduced by 7ada31b79f and 264589287

Source commit: d54a6696f3de0230fbc77c47fefae717652981dd

source/windows/GUITools.cpp

@@ -589,7 +589,7 @@ void __fastcall RegenerateSessionColorsImageList(TCustomImageList * ImageList, i
   TSessionColors * SessionColors = TSessionColors::Retrieve(ImageList);
 
   std::vector<TColor> Colors;
-  int FixedImages = ImageList->Count;
+  size_t FixedImages = static_cast<size_t>(ImageList->Count);
   Colors.resize(FixedImages + SessionColors->ColorMap.size());
   TSessionColors::TColorMap::const_iterator I = SessionColors->ColorMap.begin();
   while (I != SessionColors->ColorMap.end())

source/windows/WinInterface.cpp

@@ -805,7 +805,6 @@ void __fastcall CopyParamListPopup(TRect Rect, TPopupMenu * Menu,
 {
   Menu->Items->Clear();
 
-  TMenuItem * CustomizeItem = NULL;
   TMenuItem * Item;
 
   Item = new TMenuItem(Menu);
@@ -814,7 +813,7 @@ void __fastcall CopyParamListPopup(TRect Rect, TPopupMenu * Menu,
   Item->Default = FLAGSET(Options, cplCustomizeDefault);
   Item->OnClick = OnClick;
   Menu->Items->Add(Item);
-  CustomizeItem = Item;
+  TMenuItem * CustomizeItem = Item;
 
   if (FLAGSET(Options, cplSaveSettings))
   {
@@ -872,10 +871,7 @@ void __fastcall CopyParamListPopup(TRect Rect, TPopupMenu * Menu,
     }
   }
 
-  if (CustomizeItem != NULL)
-  {
-    CustomizeItem->Checked = !AnyChecked;
-  }
+  CustomizeItem->Checked = !AnyChecked;
 
   Item = new TMenuItem(Menu);
   Item->Caption = L"-";