* Fix crash under gtk/gtk2/qt in advanced example

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@429 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/virtualtreeview-unstable/demos/advanced/HeaderCustomDrawDemo.pas

@@ -53,7 +53,7 @@ var
 implementation
 
 uses
-  States;
+  States, LclExt;
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -236,9 +236,9 @@ procedure THeaderOwnerDrawForm.FormCreate(Sender: TObject);
 
 begin
   FBackBitmap1 := TBitmap.Create;
-  FBackBitmap1.PixelFormat := pf32Bit;
+  FBackBitmap1.PixelFormat := OptimalPixelFormat;
   FBackBitmap2 := TBitmap.Create;
-  FBackBitmap2.PixelFormat := pf32Bit;
+  FBackBitmap2.PixelFormat := OptimalPixelFormat;
   CreateCheckerBackground;
   FHeaderBitmap := TBitmap.Create;
   FHeaderBitmap.LoadFromLazarusResource('Transcriptions');

components/virtualtreeview-unstable/demos/advanced/Main.lfm

@@ -1,51 +1,44 @@
 object MainForm: TMainForm
-  Left = 220
+  Left = 17
-  Height = 578
+  Height = 566
-  Top = 206
+  Top = 86
-  Width = 848
+  Width = 980
-  HorzScrollBar.Page = 847
+  HorzScrollBar.Page = 979
-  VertScrollBar.Page = 577
+  VertScrollBar.Page = 565
   Caption = 'Virtual Treeview features demo'
-  ClientHeight = 578
+  ClientHeight = 566
-  ClientWidth = 848
+  ClientWidth = 980
   Font.Height = -13
   Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  object Bevel1: TBevel
+  LCLVersion = '0.9.25'
-    Height = 2
-    Top = 77
-    Width = 848
-    Align = alTop
-    Shape = bsTopLine
-  end
   object PageScroller1: TPanel
     Height = 77
-    Width = 848
+    Width = 980
     Align = alTop
     ClientHeight = 77
-    ClientWidth = 848
+    ClientWidth = 980
     Color = clWhite
     ParentColor = False
     ParentShowHint = False
     ShowHint = True
     TabOrder = 0
     object MainPanel: TPanel
-      Height = 74
+      Height = 70
-      Width = 990
+      Width = 976
       AutoSize = True
       BevelOuter = bvNone
-      ClientHeight = 74
+      ClientHeight = 70
-      ClientWidth = 990
+      ClientWidth = 976
       Color = clWhite
       ParentColor = False
       TabOrder = 0
       object SpeedDemoButton: TSpeedButton
-        Left = 230
+        Left = 216
         Height = 70
         Hint = 'The speed breakthrough'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -162,10 +155,9 @@ object MainForm: TMainForm
       end
       object AbilitiesDemoButton: TSpeedButton
         Tag = 1
-        Left = 299
+        Left = 285
         Height = 70
         Hint = 'General abilities and features'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -282,10 +274,9 @@ object MainForm: TMainForm
       end
       object PropertiesDemoButton: TSpeedButton
         Tag = 2
-        Left = 368
+        Left = 354
         Height = 70
         Hint = 'Property tree simulation'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -458,10 +449,9 @@ object MainForm: TMainForm
       end
       object VisibilityDemoButton: TSpeedButton
         Tag = 3
-        Left = 437
+        Left = 423
         Height = 70
         Hint = 'Hide and show nodes, sync two trees'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -578,10 +568,9 @@ object MainForm: TMainForm
       end
       object GridDemoButton: TSpeedButton
         Tag = 5
-        Left = 506
+        Left = 492
         Height = 70
         Hint = 'Tree in grid simulation'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -698,10 +687,9 @@ object MainForm: TMainForm
       end
       object PaintTreeDemoButton: TSpeedButton
         Tag = 6
-        Left = 575
+        Left = 561
         Height = 70
         Hint = 'A paint tree as directory tree'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -818,10 +806,9 @@ object MainForm: TMainForm
       end
       object AlignDemoButton: TSpeedButton
         Tag = 7
-        Left = 644
+        Left = 630
         Height = 70
         Hint = 'Alignment, directionality and internationalization'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -992,23 +979,10 @@ object MainForm: TMainForm
         NumGlyphs = 0
         OnClick = DemoButtonClick
       end
-      object Bevel2: TBevel
-        Left = 887
-        Height = 70
-        Top = 4
-        Width = 10
-        Style = bsRaised
-      end
-      object Bevel3: TBevel
-        Height = 70
-        Width = 10
-        Style = bsRaised
-      end
       object Label1: TLabel
-        Left = 14
+        Height = 17
-        Height = 14
+        Top = 26
-        Top = 28
+        Width = 92
-        Width = 73
         Caption = 'Demo picker'
         Font.Height = -11
         Font.Name = 'MS Sans Serif'
@@ -1016,19 +990,17 @@ object MainForm: TMainForm
         ParentColor = False
       end
       object Label2: TLabel
-        Left = 22
+        Height = 17
-        Height = 14
+        Top = 42
-        Top = 44
+        Width = 244
-        Width = 160
         Caption = 'Which demo do you want to see?'
         ParentColor = False
       end
       object SpeedButton1: TSpeedButton
         Tag = 8
-        Left = 713
+        Left = 699
         Height = 70
         Hint = 'Painting like in Windows XP'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -1257,10 +1229,9 @@ object MainForm: TMainForm
       end
       object XPDemoButton: TSpeedButton
         Tag = 9
-        Left = 782
+        Left = 768
         Height = 70
         Hint = 'Multiline nodes'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -1588,10 +1559,9 @@ object MainForm: TMainForm
       end
       object QuitButton: TSpeedButton
         Tag = -1
-        Left = 920
+        Left = 906
         Height = 70
         Hint = 'Exit'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -1708,10 +1678,9 @@ object MainForm: TMainForm
       end
       object SpeedButton2: TSpeedButton
         Tag = 10
-        Left = 851
+        Left = 837
         Height = 70
         Hint = 'Custom header drawing in advanced mode'
-        Top = 2
         Width = 70
         Color = clBtnFace
         Glyph.Data = {
@@ -1973,15 +1942,15 @@ object MainForm: TMainForm
     end
   end
   object StatusBar: TStatusBar
-    Height = 20
+    Height = 24
-    Top = 558
+    Top = 542
-    Width = 848
+    Width = 980
     Panels = <>
   end
   object ContainerPanel: TPanel
-    Height = 479
+    Height = 465
-    Top = 79
+    Top = 77
-    Width = 848
+    Width = 980
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 1

components/virtualtreeview-unstable/demos/advanced/Main.pas

@@ -31,10 +31,7 @@ type
     AlignDemoButton: TSpeedButton;
     QuitButton: TSpeedButton;
     PaintTreeDemoButton: TSpeedButton;
-    Bevel1: TBevel;
     MainPanel: TPanel;
-    Bevel2: TBevel;
-    Bevel3: TBevel;
     StatusBar: TStatusBar;
     ContainerPanel: TPanel;
     Label1: TLabel;

components/virtualtreeview-unstable/demos/advanced/WindowsXPStyleDemo.lfm

@@ -1,18 +1,19 @@
 object WindowsXPForm: TWindowsXPForm
-  Left = 339
+  Left = 61
-  Height = 581
+  Height = 487
-  Top = 275
+  Top = 185
   Width = 829
   HorzScrollBar.Page = 828
-  VertScrollBar.Page = 580
+  VertScrollBar.Page = 486
   ActiveControl = XPTree
   Caption = 'WindowsXPForm'
-  ClientHeight = 581
+  ClientHeight = 487
   ClientWidth = 829
   Font.CharSet = ANSI_CHARSET
   Font.Height = -13
   Font.Name = 'Microsoft Sans Serif'
   OnCreate = FormCreate
+  LCLVersion = '0.9.25'
   object Label1: TLabel
     Left = 576
     Height = 80
@@ -26,7 +27,7 @@ object WindowsXPForm: TWindowsXPForm
   end
   object Label2: TLabel
     Left = 576
-    Height = 81
+    Height = 97
     Top = 144
     Width = 243
     Anchors = [akTop, akRight]
@@ -38,8 +39,8 @@ object WindowsXPForm: TWindowsXPForm
   object Label4: TLabel
     Cursor = crHandPoint
     Left = 577
-    Height = 117
+    Height = 136
-    Top = 248
+    Top = 256
     Width = 243
     Anchors = [akTop, akRight]
     AutoSize = False
@@ -53,8 +54,9 @@ object WindowsXPForm: TWindowsXPForm
     OnClick = Label4Click
   end
   object XPTree: TVirtualStringTree
+    Cursor = 63
     Left = 8
-    Height = 516
+    Height = 416
     Top = 40
     Width = 554
     AutoScrollDelay = 500