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
2013-09-07 19:08:28 +00:00
parent d40caa283a
commit d67d6d0a63
56 changed files with 2436 additions and 1236 deletions
--- a/components/virtualtreeview-new/trunk/demos/unicode/unicode.lpr
+++ b/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;