Merge fixes from 4.8 branch to trunk

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

components/virtualtreeview-new/trunk/demos/unicode/fmain.lfm

@@ -3,32 +3,37 @@ object MainForm: TMainForm
   Height = 504
   Top = 166
   Width = 613
-  Caption = 'Unicode Demo'
+  Caption = 'VirtualTreeView Unicode Demo'
   ClientHeight = 504
   ClientWidth = 613
   OnCreate = FormCreate
-  LCLVersion = '0.9.27'
-  object MainNotebook: TNotebook
+  Position = poDesktopCenter
+  LCLVersion = '1.1'
+  object MainNotebook: TPageControl
+    Left = 0
     Height = 504
+    Top = 0
     Width = 613
+    ActivePage = WelcomePage
     Align = alClient
-    PageIndex = 0
+    TabIndex = 0
     TabOrder = 0
-    object WelcomePage: TPage
+    object WelcomePage: TTabSheet
       Caption = 'Welcome Translations'
-      ClientWidth = 605
-      ClientHeight = 478
+      ClientHeight = 465
+      ClientWidth = 607
       object WelcomeTree: TVirtualStringTree
         Left = 3
-        Height = 444
+        Height = 431
         Top = 31
-        Width = 599
+        Width = 601
         Align = alClient
         BorderSpacing.Around = 3
-        BorderStyle = bsSingle
         DefaultText = 'Node'
+        Header.AutoSizeIndex = 0
         Header.Columns = <        
           item
+            Position = 0
             Text = 'Language'
             Width = 200
           end        
@@ -37,18 +42,22 @@ object MainForm: TMainForm
             Text = 'Translation'
             Width = 200
           end>
+        Header.DefaultHeight = 17
+        Header.Height = 20
         Header.Options = [hoColumnResize, hoDrag, hoVisible]
         TabOrder = 0
         OnFreeNode = WelcomeTreeFreeNode
         OnGetText = WelcomeTreeGetText
       end
       object WelcomeTopPanel: TPanel
+        Left = 0
         Height = 28
-        Width = 605
+        Top = 0
+        Width = 607
         Align = alTop
         BevelOuter = bvNone
         ClientHeight = 28
-        ClientWidth = 605
+        ClientWidth = 607
         TabOrder = 1
         object ChooseWelcomeFontButton: TButton
           Left = 4
@@ -63,23 +72,24 @@ object MainForm: TMainForm
         end
       end
     end
-    object LCLTextPage: TPage
+    object LCLTextPage: TTabSheet
       Caption = 'LCL Text'
-      ClientWidth = 605
-      ClientHeight = 478
+      ClientHeight = 465
+      ClientWidth = 607
       object LCLTextTree: TVirtualStringTree
         Left = 3
         Height = 440
         Top = 3
         Width = 272
         BorderSpacing.Around = 3
-        BorderStyle = bsSingle
         DefaultText = 'Node'
+        Header.AutoSizeIndex = 0
         Header.Columns = <>
+        Header.DefaultHeight = 17
         Header.MainColumn = -1
         Header.Options = [hoColumnResize, hoDrag]
         TabOrder = 0
-        TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning]
+        TreeOptions.MiscOptions = [toEditable, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning]
         OnFreeNode = LCLTextTreeFreeNode
         OnGetText = LCLTextTreeGetText
         OnNewText = LCLTextTreeNewText
@@ -95,7 +105,7 @@ object MainForm: TMainForm
       end
       object TextEdit: TEdit
         Left = 284
-        Height = 23
+        Height = 21
         Top = 2
         Width = 184
         TabOrder = 2
@@ -105,7 +115,7 @@ object MainForm: TMainForm
         Height = 21
         Top = 58
         Width = 184
-        ItemHeight = 13
+        ItemHeight = 0
         Items.Strings = (
           'Não'
           'Coração'
@@ -132,8 +142,10 @@ object MainForm: TMainForm
           'Coração'
           'Sim'
         )
-        ItemHeight = 13
+        ItemHeight = 0
+        ScrollWidth = 182
         TabOrder = 5
+        TopIndex = -1
       end
       object AddListTextButton: TButton
         Left = 476
@@ -172,6 +184,8 @@ object MainForm: TMainForm
     end
   end
   object FontDialog1: TFontDialog
+    MinFontSize = 0
+    MaxFontSize = 0
     left = 136
     top = 24
   end

components/virtualtreeview-new/trunk/demos/unicode/fmain.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, VirtualTrees, StdCtrls, LCLProc;
+  ExtCtrls, VirtualTrees, StdCtrls, LCLProc, ComCtrls;
 
 type
 
@@ -24,12 +24,12 @@ type
     TextComboBox: TComboBox;
     TextEdit: TEdit;
     FontDialog1: TFontDialog;
-    MainNotebook: TNotebook;
-    LCLTextPage: TPage;
+    MainNotebook: TPageControl;
+    LCLTextPage: TTabsheet;
     LCLTextTree: TVirtualStringTree;
     WelcomeTopPanel: TPanel;
     WelcomeTree: TVirtualStringTree;
-    WelcomePage: TPage;
+    WelcomePage: TTabsheet;
     procedure AddComboTextButtonClick(Sender: TObject);
     procedure AddEditTextButtonClick(Sender: TObject);
     procedure AddListTextButtonClick(Sender: TObject);

components/virtualtreeview-new/trunk/demos/unicode/unicode.lpi

@@ -1,22 +1,20 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
-      <Flags>
-        <AlwaysBuild Value="False"/>
-        <LRSInOutputDirectory Value="False"/>
-      </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <Icon Value="0"/>
+      <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -26,7 +24,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="2">
@@ -46,16 +44,24 @@
       </Unit0>
       <Unit1>
         <Filename Value="fmain.pas"/>
-        <ComponentName Value="MainForm"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MainForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fMain"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
+    <SearchPaths>
+      <IncludeFiles Value="$(ProjOutDir)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>
         <Win32>
@@ -64,6 +70,9 @@
       </Options>
     </Linking>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

components/virtualtreeview-new/trunk/demos/unicode/unicode.lpr

@@ -8,12 +8,12 @@ uses
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms
-  { you can add units after this }, fMain, LResources, virtualtreeview_package;
+  { you can add units after this }, fMain;
 
-{$IFDEF WINDOWS}{$R unicode.rc}{$ENDIF}
+
+{$R *.res}
 
 begin
-  {$I unicode.lrs}
   Application.Initialize;
   Application.CreateForm(TMainForm, MainForm);
   Application.Run;