[JVCL-Checkins] SF.net SVN: jvcl:[13440] trunk/jvcl/run

[<ah...@us...>]

Revision: 13440
          http://jvcl.svn.sourceforge.net/jvcl/?rev=13440&view=rev
Author:   ahuser
Date:     2012-09-24 12:39:08 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
StyleServices vs ThemeServices clean up

Modified Paths:
--------------
    trunk/jvcl/run/JvExplorerBarItems.pas
    trunk/jvcl/run/JvStatusBar.pas

Modified: trunk/jvcl/run/JvExplorerBarItems.pas
===================================================================
--- trunk/jvcl/run/JvExplorerBarItems.pas	2012-09-24 12:24:22 UTC (rev 13439)
+++ trunk/jvcl/run/JvExplorerBarItems.pas	2012-09-24 12:39:08 UTC (rev 13440)
@@ -396,9 +396,6 @@
 uses
   {$IFDEF JVCLThemesEnabled}
   JvThemes,
-  {$IFDEF RTL230_UP} // XE2+
-  Themes,
-  {$ENDIF RTL230_UP}
   {$ENDIF JVCLThemesEnabled}
   Math, DateUtils;
 

Modified: trunk/jvcl/run/JvStatusBar.pas
===================================================================
--- trunk/jvcl/run/JvStatusBar.pas	2012-09-24 12:24:22 UTC (rev 13439)
+++ trunk/jvcl/run/JvStatusBar.pas	2012-09-24 12:39:08 UTC (rev 13440)
@@ -74,9 +74,9 @@
     procedure MovePanelControls;
     function GetPanelClass: TStatusPanelClass;  override;
     procedure SBSetParts(var msg: TMessage); message SB_SETPARTS;
-    {$IFDEF COMPILER16_UP}
+    {$IFDEF COMPILER16}
     procedure WndProc(var Msg: TMessage); override;
-    {$ENDIF COMPILER16_UP}
+    {$ENDIF COMPILER16}
   public
     constructor Create(AOwner: TComponent); override;
     function ExecuteAction(Action: TBasicAction): Boolean; override;
@@ -249,7 +249,7 @@
   MovePanelControls;
 end;
 
-{$IFDEF COMPILER16_UP}
+{$IFDEF COMPILER16}
 procedure TJvStatusBar.WndProc(var Msg: TMessage);
 var
   DC, PaintDC: HDC;
@@ -259,7 +259,7 @@
   // TStatusBarStyleHook.Paint catches all WM_PAINT but doesn't call Control.PaintControls()
   // what causes TGraphicControls to not be painted. With this code we call the PaintControls
   // function in that case.
-  // TODO: When this bug gets fixed in a later Delphi version, the IFDEFs must be adjusted.
+  // This bug was fixed with XE3
   if (Msg.Msg = WM_PAINT) and StyleServices.Enabled and not StyleServices.IsSystemStyle then
   begin
     DC := HDC(Msg.WParam);
@@ -302,7 +302,7 @@
   else
     inherited WndProc(Msg);
 end;
-{$ENDIF COMPILER16_UP}
+{$ENDIF COMPILER16}
 
 //=== { TJvStatusPanel } =====================================================
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.