Browse Source

read only export of img variable for type extension in ImagePanel

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7360 8c9fc860-2736-0410-a75d-ab315db34111
eth.hunzikerp 8 years ago
parent
commit
cf06fb7ee5
1 changed files with 5 additions and 8 deletions
  1. 5 8
      source/WMStandardComponents.Mod

+ 5 - 8
source/WMStandardComponents.Mod

@@ -2854,11 +2854,11 @@ TYPE
 	ImagePanel* = OBJECT(Panel)
 	VAR
 		imgName- : WMProperties.StringProperty;
-		img : WMGraphics.Image;
+		img- : WMGraphics.Image;
 		vScrollbar, hScrollbar : Scrollbar;
 		dx, dy : LONGINT;
 
-		PROCEDURE & Init*;
+		PROCEDURE &  Init*;
 		BEGIN
 			Init^;
 			SetGenerator("WMStandardComponents.GenImagePanel");
@@ -2907,7 +2907,7 @@ TYPE
 		PROCEDURE PropertyChanged*(sender, property : ANY);
 		BEGIN
 			IF property = imgName THEN
-				RecacheProperties; Invalidate;
+				RecacheProperties; Invalidate;(*? invalidate also called in RecacheProperties->SetImage()*)
 			ELSE
 				PropertyChanged^(sender, property)
 			END
@@ -2916,7 +2916,8 @@ TYPE
 		PROCEDURE RecacheProperties*;
 		VAR s : String;
 		BEGIN
-			s := imgName.Get(); IF s # NIL THEN SetImage(SELF, WMGraphics.LoadImage(s^, TRUE)) END
+			s := imgName.Get();
+			IF s # NIL THEN SetImage(SELF, WMGraphics.LoadImage(s^, TRUE)) END (*?implicit invalidate IFF changed*)
 		END RecacheProperties;
 
 		PROCEDURE ScrollbarsChanged(sender, data : ANY);
@@ -3561,10 +3562,6 @@ BEGIN
 	NEW(image); RETURN image;
 END GenImage;
 
-PROCEDURE GenImagePanel*() : XML.Element;
-VAR ip : ImagePanel;
-BEGIN NEW(ip); RETURN ip
-END GenImagePanel;
 
 (**********************************************************************************************)