From aa28082fa2a5fe3d7952f3cec1903b8e5c1eef74 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 5 Aug 2016 21:45:06 +0000
Subject: [PATCH] tvplanit: Fix compilation of full demo with Laz 1.6

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5074 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../tvplanit/examples/fulldemo/demomain.lfm   |  3 ++-
 .../tvplanit/examples/fulldemo/demomain.lrt   | 23 ++++++++-----------
 .../tvplanit/examples/fulldemo/demomain.pas   |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index a04a03947..72b775df5 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -9,7 +9,7 @@ object MainForm: TMainForm
   Menu = MainMenu1
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
-  LCLVersion = '1.7'
+  LCLVersion = '1.6.0.4'
   object Panel1: TPanel
     Left = 120
     Height = 580
@@ -60,6 +60,7 @@ object MainForm: TMainForm
       PageIndex = 0
       Align = alClient
       TabOrder = 1
+      TabStop = True
       object Events: TPage
         object LeftPanel: TPanel
           Left = 0
diff --git a/components/tvplanit/examples/fulldemo/demomain.lrt b/components/tvplanit/examples/fulldemo/demomain.lrt
index 983137669..6b6c9e48a 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lrt
+++ b/components/tvplanit/examples/fulldemo/demomain.lrt
@@ -1,27 +1,24 @@
 TMAINFORM.CAPTION=Turbo Power VisualPlanIt Demo
-TMAINFORM.TABEVENTS.CAPTION=Events
+TMAINFORM.TITLELBL.CAPTION=TitleLbl
 TMAINFORM.LBLVISIBLEDAYS.CAPTION=Visible days
 TMAINFORM.CBGRANULARITY.TEXT=30 Min
 TMAINFORM.LBLGRANULARITY.CAPTION=Granularity
-TMAINFORM.TABTASKS.CAPTION=Tasks
 TMAINFORM.RBALLTASKS.CAPTION=All tasks
 TMAINFORM.RBHIDECOMPLETEDTASKS.CAPTION=Hide completed tasks
-TMAINFORM.TABCONTACTS.CAPTION=Contacts
-TMAINFORM.TABRESOURCES.CAPTION=Resources
-TMAINFORM.BTNNEWRES.CAPTION=New
-TMAINFORM.BTNEDITRES.CAPTION=Edit
 TMAINFORM.BTNDELETERES.CAPTION=Delete
-TMAINFORM.TABSETTINGS.CAPTION=Settings
+TMAINFORM.BTNEDITRES.CAPTION=Edit
+TMAINFORM.BTNNEWRES.CAPTION=New
 TMAINFORM.LBLLANGUAGE.CAPTION=Language
-TMAINFORM.LBLTIMEFORMAT.CAPTION=Time format
-TMAINFORM.LBLFIRSTDAYOFWEEK.CAPTION=First day of week
-TMAINFORM.CBALLOWINPLACEEDITING.CAPTION=Allow inplace editing
-TMAINFORM.LBLADDRESSBUILDER.CAPTION=Address builder
-TMAINFORM.CBADDRESSBUILDER.TEXT=(default)
 TMAINFORM.LBLDRAWINGSTYLE.CAPTION=Drawing style:
-TMAINFORM.TITLELBL.CAPTION=TitleLbl
+TMAINFORM.CBADDRESSBUILDER.TEXT=(default)
+TMAINFORM.LBLADDRESSBUILDER.CAPTION=Address builder
+TMAINFORM.CBALLOWINPLACEEDITING.CAPTION=Allow inplace editing
+TMAINFORM.LBLFIRSTDAYOFWEEK.CAPTION=First day of week
+TMAINFORM.LBLTIMEFORMAT.CAPTION=Time format
 TMAINFORM.MENUITEM1.CAPTION=File
 TMAINFORM.MNUEDITPRINTFORMATS.CAPTION=Edit print formats...
+TMAINFORM.MNULOADPRINTFORMATS.CAPTION=Load print formats...
+TMAINFORM.MENUITEM4.CAPTION=-
 TMAINFORM.MNUPRINTPREVIEW.CAPTION=Print preview...
 TMAINFORM.MNUPRINT.CAPTION=Print...
 TMAINFORM.MENUITEM3.CAPTION=-
diff --git a/components/tvplanit/examples/fulldemo/demomain.pas b/components/tvplanit/examples/fulldemo/demomain.pas
index d024a38b1..1d2e1927a 100644
--- a/components/tvplanit/examples/fulldemo/demomain.pas
+++ b/components/tvplanit/examples/fulldemo/demomain.pas
@@ -155,7 +155,7 @@ uses
 {$UNDEF UTF8_CALLS}
 {$IFDEF LCL}
   {$DEFINE UTF8_CALLS}
-  {$IF (lcl_major=1) and (lcl_minor<6)}
+  {$IF (lcl_major=1) and (lcl_minor<=6)}
      {$UNDEF UTF8_CALLS}
   {$ENDIF}
 {$ENDIF}