From c83e1c15e533cedfa9109fded543e96258876e92 Mon Sep 17 00:00:00 2001
From: bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Thu, 3 Mar 2016 11:30:47 +0000
Subject: [PATCH] Examples: Fix resource loading in TestAll project.

git-svn-id: trunk@51813 -
---
 examples/testall.lpi    | 20 ++------------------
 examples/testallform.pp | 14 +++++++-------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/examples/testall.lpi b/examples/testall.lpi
index 476be30aa9..1d432082f2 100644
--- a/examples/testall.lpi
+++ b/examples/testall.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -44,27 +44,11 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
-    <SearchPaths>
-      
-    </SearchPaths>
+    <Version Value="11"/>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <Linking>
-      <Options>
-        <Win32>
-          <GraphicApplication Value="True"/>
-        </Win32>
-      </Options>
-    </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/examples/testallform.pp b/examples/testallform.pp
index cc77764531..8778b9fa7b 100644
--- a/examples/testallform.pp
+++ b/examples/testallform.pp
@@ -960,7 +960,7 @@ BitBtn1 := TBitBtn.Create(Self);
     Font.Pitch 	   := fpDefault;
     Font.Size 	   := 10;
     Font.Style 	   := BitBtn1.Font.Style+[fsBold];
-    LoadGlyphFromLazarusResource('topendialog');
+    LoadGlyphFromResourceName(hInstance,'topendialog');
   //height	   := 28;		Has to be set before Glyph
   //HelpContext    := 0;		Identifier not found
     Hint 	   := 'Settings for BitBtn1 >>';
@@ -2251,7 +2251,7 @@ SpeedButton1 := TSpeedButton.Create(Self);
      Hint := 'SpeedButton1';
      Color := clBtnFace;
      ShowHint := True;
-     LoadGlyphFromLazarusResource('laz_open');
+     LoadGlyphFromResourceName(hInstance,'laz_open');
      Visible := True;
   end;
 
@@ -2267,10 +2267,10 @@ SpeedButton2 := TSpeedButton.Create(Self);
      Left := 35;
      Top := 28;
      Flat := False;
-     Hint := 'SpeedButton1';
+     Hint := 'SpeedButton2';
      Color := clBtnFace;
      ShowHint := True;
-     LoadGlyphFromLazarusResource('laz_save');
+     LoadGlyphFromResourceName(hInstance,'laz_save');
      Enabled := True;
      Visible := True;
   end;
@@ -2286,10 +2286,10 @@ SpeedButton3 := TSpeedButton.Create(Self);
      Left := 60;
      Top := 28;
      Flat := False;
-     Hint := 'SpeedButton1';
+     Hint := 'SpeedButton3';
      Color := clBtnFace;
      ShowHint := True;
-     LoadGlyphFromLazarusResource('item_font');
+     LoadGlyphFromResourceName(hInstance,'item_font');
      Enabled := True;
      Visible := True;
   end;
@@ -2308,7 +2308,7 @@ SpeedButton4 := TSpeedButton.Create(Self);
      Hint := 'SpeedButton4';
      Color := clBtnFace;
      ShowHint := True;
-     LoadGlyphFromLazarusResource('tcolordialog');
+     LoadGlyphFromResourceName(hInstance,'tcolordialog');
      Enabled := True;
      Visible := True;
   end;