less warnings

git-svn-id: http://svn.miranda-ng.org/main/trunk@14372 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 8 insertions, 12 deletions

diff --git a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
index 011ca93876..dc416180bb 100644
--- a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
+++ b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
@@ -130,7 +130,7 @@ var
   HorzSpacing, VertSpacing,

   ButtonWidth, ButtonHeight, ButtonSpacing, ButtonGroupWidth,

   IconTextWidth, IconTextHeight: Integer;

-  TextRect,ContRect: TRect;

+  TextRect: TRect;

 begin

   DialogUnits := GetAveCharSize(Canvas);

   HorzSpacing   := MulDiv(mcSpacing, DialogUnits.X, 8);

@@ -189,10 +189,6 @@ begin
 end;

 

 procedure TEmptyHistoryFrm.SetContact(const Value: TMCONTACT);

-var

-  hContact: TMCONTACT;

-  Proto: AnsiString;

-  i,num: Integer;

 begin

   FContact := Value;

   Image.Picture.Icon.Handle := LoadIcon(0, IDI_QUESTION);

diff --git a/plugins/HistoryPlusPlus/HistoryControls.pas b/plugins/HistoryPlusPlus/HistoryControls.pas
index c4035dba8a..45d56dc2e1 100644
--- a/plugins/HistoryPlusPlus/HistoryControls.pas
+++ b/plugins/HistoryPlusPlus/HistoryControls.pas
@@ -26,7 +26,7 @@ unit HistoryControls;
 interface

 

 uses

-  Windows, Messages, Classes, Forms,

+  Windows, Messages, Classes, Forms, UITypes,

   Controls, StdCtrls, ComCtrls, ExtCtrls, Buttons, Graphics;

 

 type

@@ -189,7 +189,7 @@ type
 procedure THppSpeedButton.Paint{Button};

 begin

   {$IFDEF THEME_7_UP}

-  with ThemeServices do

+  with StyleServices do

     if not Transparent and ThemesEnabled and Assigned(Parent) then

       DrawParentBackground(Parent.Handle, Canvas.Handle, nil, True);

   {$ENDIF}

@@ -215,13 +215,13 @@ var
       Box := tbGroupBoxNormal

     else

       Box := tbGroupBoxDisabled;

-    Details := ThemeServices.GetElementDetails(Box);

+    Details := StyleServices.GetElementDetails(Box);

     with Canvas do

     begin

       if spCaption <> '' then

       begin

         with Details do

-          UxTheme.GetThemeTextExtent(ThemeServices.Theme[Element],Handle,

+          UxTheme.GetThemeTextExtent(StyleServices.Theme[Element],Handle,

             Part,State,PChar(spCaption),Length(spCaption),DT_LEFT, nil,CaptionRect);

         if not UseRightToLeftAlignment then

           OffsetRect(CaptionRect, 8, 0)

@@ -235,11 +235,11 @@ var
       OuterRect.Top := (CaptionRect.Bottom - CaptionRect.Top) div 2;

       with CaptionRect do

         ExcludeClipRect(Handle, Left, Top, Right, Bottom);

-      ThemeServices.DrawElement(Handle, Details, OuterRect);

+      StyleServices.DrawElement(Handle, Details, OuterRect);

 

       SelectClipRgn(Handle, 0);

       if Caption <> '' then

-        ThemeServices.DrawText(Handle, Details, spCaption, CaptionRect, DT_LEFT, 0);

+        StyleServices.DrawText(Handle, Details, spCaption, CaptionRect, DT_LEFT, 0);

     end;

   end;

   {$ENDIF}

@@ -286,7 +286,7 @@ begin
     spCaption := ' '+spCaption+' ';

   Canvas.Font := Self.Font;

   {$IFDEF THEME_7_UP}

-  if ThemeServices.ThemesEnabled then

+  if StyleServices.ThemesEnabled then

     PaintThemedGroupBox

   else

   {$ENDIF}