Advanced demo: use native resource type

Author: blikblum

Demos/Advanced/Advanced.lpi

@@ -10,6 +10,17 @@
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <ResourceType Value="res"/>
+      <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
+      <Resources Count="5">
+        <Resource_0 FileName="Res\Lorem ipsum.uni" Type="RCDATA" ResourceName="LOREM IPSUM"/>
+        <Resource_1 FileName="Res\Transcriptions.bmp" Type="BITMAP" ResourceName="TRANSCRIPTIONS"/>
+        <Resource_2 FileName="Res\Arabic.uni" Type="RCDATA" ResourceName="ARABIC"/>
+        <Resource_3 FileName="Res\Greek.uni" Type="RCDATA" ResourceName="GREEK"/>
+        <Resource_4 FileName="Res\Hebrew.uni" Type="RCDATA" ResourceName="HEBREW"/>
+      </Resources>
     </General>
     <VersionInfo>
       <StringTable ProductVersion=""/>

Demos/Advanced/Advanced.lpr

@@ -21,6 +21,7 @@
   //HeaderCustomDrawDemo in 'HeaderCustomDrawDemo.pas' {HeaderOwnerDrawForm},
   States in 'States.pas' {StateForm}, Printer4Lazarus;
 
+{$R *.res}
 
 begin
   Application.Initialize;

Demos/Advanced/Advanced.res

@@ -11,11 +11,11 @@ object HeaderOwnerDrawForm: THeaderOwnerDrawForm
   Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.7'
   object Label8: TLabel
     Left = 12
-    Height = 102
-    Top = 320
+    Height = 64
+    Top = 358
     Width = 745
     Anchors = [akLeft, akRight, akBottom]
     Caption = 'This page demonstrates the advance custom draw mode for a tree''s header. The left column is drawn as usual while with the other columns more and more details are customized by the applicaiton. Note: Virtual Treeview allows to customize the header fully or only parts of it and draws all standard elements as normal if they are not handled by the application. This allows very flexible designs but avoids full custom draw if only a small details must be drawn differently.'
@@ -54,6 +54,7 @@ object HeaderOwnerDrawForm: THeaderOwnerDrawForm
     Header.Background = clBtnShadow
     Header.Columns = <    
       item
+        Color = clWindow
         Hint = 'This column is drawn entirely by the tree.'
         ImageIndex = 1
         Options = [coDraggable, coEnabled, coResizable, coShowDropMark, coVisible]
@@ -64,6 +65,7 @@ object HeaderOwnerDrawForm: THeaderOwnerDrawForm
       end    
       item
         Alignment = taCenter
+        Color = clWindow
         Hint = 'Only the background is customized.'
         ImageIndex = 2
         Layout = blGlyphTop

Demos/Advanced/HeaderCustomDrawDemo.lfm

@@ -11,7 +11,7 @@ interface
 
 uses
   LCLIntf, VTGraphics, Types, SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, VirtualTrees, StdCtrls, ExtCtrls, LResources, LCLType, LCLProc;
+  Dialogs, VirtualTrees, StdCtrls, ExtCtrls, LCLType, LCLProc;
 
 type
   THeaderOwnerDrawForm = class(TForm)
@@ -243,7 +243,7 @@ procedure THeaderOwnerDrawForm.FormCreate(Sender: TObject);
   //FBackBitmap2.PixelFormat := OptimalPixelFormat;
   CreateCheckerBackground;
   FHeaderBitmap := TBitmap.Create;
-  FHeaderBitmap.LoadFromLazarusResource('Transcriptions');
+  FHeaderBitmap.LoadFromResourceName(HINSTANCE, 'Transcriptions');
 end;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -307,7 +307,5 @@ procedure THeaderOwnerDrawForm.HeaderCustomDrawTreeGetText(Sender: TBaseVirtualT
 
 //----------------------------------------------------------------------------------------------------------------------
 
-initialization
-  {$i bitmap.lrs}
 
 end.

Demos/Advanced/HeaderCustomDrawDemo.pas

@@ -53,35 +53,35 @@ implementation
 uses
   SpeedDemo, GeneralAbilitiesDemo, DrawTreeDemo, PropertiesDemo,
   GridDemo, VisibilityDemo, AlignDemo, WindowsXPStyleDemo, MultilineDemo, HeaderCustomDrawDemo,
-  States;
+  States, LCLType;
 
 //----------------------------------------------------------------------------------------------------------------------
 
-
 procedure LoadUnicodeStrings(const Name: string; var Strings: array of String);
 
 // Loads the Unicode strings from the resource.
 
 var
-  Res: TLResource;
-  Head, Tail: PChar;
+  Stream: TResourceStream;
+  Head, Tail: PAnsiChar;
   I: Integer;
 
 begin
-  Res := LazarusResources.Find(Name);
-  if (Res <> nil) and (Res.Value <> '') then
-  begin
-    Head := PChar(Res.Value);
+  Stream := TResourceStream.Create(HINSTANCE, Name, RT_RCDATA);
+  try
+    Head := Stream.Memory;
     Tail := Head;
     for I := 0 to High(Strings) do
     begin
       Head := Tail;
-      while not (Tail^ in [#0, #13]) do
+      while not (Ord(Tail^) in [0, 13]) do
         Inc(Tail);
       SetString(Strings[I], Head, Tail - Head);
       // Skip carriage return and linefeed.
       Inc(Tail, 2);
     end;
+  finally
+    Stream.Free;
   end;
 end;