Merge branch 'master' of gitlab.com:gambas/gambas

2019-02-05 02:25:07 +01:00 · 2019-02-05 02:25:07 +01:00 · 66a4368ba0
commit 66a4368ba0
parent 4226f32905 3482e7dda0
4 changed files with 9 additions and 2 deletions
--- a/comp/src/gb.report2/.component
+++ b/comp/src/gb.report2/.component
@ -2,4 +2,4 @@
 Key=gb.report2
 Version=3.12.90
 Needs=Form
-Requires=gb.form
+Requires=gb.form,gb.eval
--- a/comp/src/gb.report2/.icon.png
+++ b/comp/src/gb.report2/.icon.png
--- a/comp/src/gb.report2/.src/Report.class
+++ b/comp/src/gb.report2/.src/Report.class
@ -94,6 +94,14 @@ Static Public Sub Main()
  
 End

+Static Public Sub _init()
+  
+  If Not Component.IsLoaded("gb.eval") Then Component.Load("gb.eval")
+  
+End
+
+
+
 Public Sub _New()
  
  Dim hSection As New ReportSection
--- a/comp/src/gb.report2/.src/Viewer/ReportView.class
+++ b/comp/src/gb.report2/.src/Viewer/ReportView.class
@ -157,7 +157,6 @@ Public Sub tmrLayout_Timer()
 ESCAPE:
  tmrView.Trigger

-
 End

 Private Function Report_Read() As Report