Skip to content

Commit

Permalink
fix after an improvement of the compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelachaux committed Aug 13, 2024
1 parent ef9c6a9 commit 471e506
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
10 changes: 5 additions & 5 deletions UI/Project/Sources/Classes/coord.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ property left; top; right; bottom : Integer

Class constructor($left; $top : Integer; $right : Integer; $bottom : Integer)

This:C1470.name:=Null:C1517
This:C1470.name:=""

Case of

Expand All @@ -15,7 +15,7 @@ Class constructor($left; $top : Integer; $right : Integer; $bottom : Integer)

If ($o#Null:C1517) // Widget

This:C1470.name:=$left.name
This:C1470.name:=String:C10($left.name)

Else

Expand Down Expand Up @@ -85,12 +85,12 @@ Function get screenCoordinates() : Object
// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
Function get width() : Integer

return This:C1470.right-This:C1470.left
return Try(This:C1470.right-This:C1470.left)

// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
Function get height() : Integer

return This:C1470.bottom-This:C1470.top
return Try(This:C1470.bottom-This:C1470.top)

// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
Function get dimensions() : Object
Expand All @@ -104,6 +104,6 @@ Function get dimensions() : Object
Function apply($name : Text)

$name:=$name || This:C1470.name
ASSERT:C1129($name#Null:C1517; "Missing target name!")
ASSERT:C1129(Length:C16($name)>0; "Missing target name!")

OBJECT SET COORDINATES:C1248(*; $name; This:C1470.left; This:C1470.top; This:C1470.right; This:C1470.bottom)
7 changes: 3 additions & 4 deletions UI/Project/Sources/Classes/form.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ property isSubform; isMatrix; toBeInitialized : Boolean
property pages : Object
property entryOrder : Collection

property _callback; _worker; _darkExtension : Text
property _callback; _darkExtension : Text
property _definition; _cursorsHash : Object
property _instantiableWidgets; _mapEvents : Collection

Expand All @@ -26,7 +26,6 @@ Class constructor($param; $form : Object)
This:C1470.isSubform:=False:C215
This:C1470.toBeInitialized:=True:C214

This:C1470._worker:=Null:C1517
This:C1470._callback:=Formula:C1597(formCallBack).source
This:C1470._darkExtension:="_dark"
This:C1470.entryOrder:=[]
Expand Down Expand Up @@ -542,7 +541,7 @@ Function callWorker($method; ... : Variant)

Else

$code:="CALL WORKER:C1389(\""+This:C1470._worker+"\"; \""+$method+"\""
$code:="CALL WORKER:C1389(\""+String:C10(This:C1470._worker)+"\"; \""+$method+"\""

If (Value type:C1509($2)=Is collection:K8:32)

Expand Down Expand Up @@ -808,7 +807,7 @@ Function callMe($method : Text; ... : Variant)

// === === === === === === === === === === === === === === === === === === === === === === === === === ===
/// Executes a project method in the context of a subform (without returned value)
Function callChild($subform; $method : Text; ... : Variant)
Function callChild($subform; $method : Variant; ... : Variant)

// .executeInSubform ( subform : Object | Text ; method : Text )
// .executeInSubform ( subform : Object | Text ; method : Text ; param : Collection )
Expand Down
9 changes: 7 additions & 2 deletions UI/Project/Sources/Classes/menu.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Class constructor($data)

This:C1470.__CLASS__:=OB Class:C1730(This:C1470)

This:C1470.ref:=Null:C1517
This:C1470.ref:=""
This:C1470.autoRelease:=True:C214
This:C1470.released:=False:C215
This:C1470.localize:=True:C214
Expand Down Expand Up @@ -1146,7 +1146,7 @@ Function _cleanup()
// === === === === === === === === === === === === === === === === === === === === === === === === === ===
Function _isMenu() : Boolean

If (Asserted:C1132(This:C1470.ref#Null:C1517; Current method name:C684+": The menu reference is null"))
If (Asserted:C1132(Length:C16(This:C1470.ref)>0; Current method name:C684+": The menu reference is null"))

return True:C214

Expand All @@ -1170,6 +1170,11 @@ Function _proxy($proxy : Text) : Text

return "path:/RESOURCES/"+Delete string:C232($proxy; 1; 1)

//______________________________________________________
: (Position:C15("§"; $proxy)=1) // Shortcut for current form folder

return "path:/FORM/"+Delete string:C232($proxy; 1; 1)

//______________________________________________________
: ($proxy="|@")

Expand Down
9 changes: 7 additions & 2 deletions UI/Resources/en.lproj/syntaxEN.json
Original file line number Diff line number Diff line change
Expand Up @@ -2432,6 +2432,11 @@
],
"Summary": ""
},
"resetsAbout()": {
"Syntax": "**.resetsAbout**()",
"Params": [],
"Summary": ""
},
"set()": {
"Syntax": "**.set**() : cs.ui.menuBar",
"Params": [
Expand Down Expand Up @@ -5773,7 +5778,7 @@
"Summary": ""
},
"callChild()": {
"Syntax": "**.callChild**( *subform* : Variant; *method* : Text; *...* : Variant )",
"Syntax": "**.callChild**( *subform* : Variant; *method* : Variant; *...* : Variant )",
"Params": [
[
"subform",
Expand All @@ -5782,7 +5787,7 @@
],
[
"method",
"Text",
"Variant",
"->"
],
[
Expand Down

0 comments on commit 471e506

Please sign in to comment.