Накопительное обновление

Author: Andrew Zenin

core/main/additional.php

@@ -245,7 +245,7 @@ function saveToStr(&$str){
     }
 
 	function loadFromStr($data, $format = 'bmp'){
-        $bitmap = new TBitmap(false);
+        $bitmap = new TBitmap(nil,false);
         picture_loadstr($bitmap->self, $data, $format);
 		icon_assign($this->self, $bitmap->self);
     }

core/main/buttons.php

@@ -24,7 +24,7 @@ class TBitBtn extends TControl {
 	public function get_picture(){
 
 		if (!isset($this->_picture)){
-			$this->_picture = new TBitmap(false);
+			$this->_picture = new TBitmap(nil,false);
 			$this->_picture->self = gui_propGet($this->self,'Glyph');
 			$this->_picture->parent_object = $this->self;
 		}

core/main/graphics.php

@@ -460,17 +460,22 @@ class TBitmap extends TGraphic{
 
     public $parent_object = nil;
 
-    public function __construct($init=true){
-        if ($init)
+    public function __construct($owner=nil, $init=true, $self=nil){
+        if($self!==nil){
+			$this->self = $self;
+		
+		}elseif ($init)
             $this->self = tbitmap_create();
+		if($owner!==nil)
+			$this->owner = $owner;
     }
 
     public function loadFromFile($filename){
 
 		$filename = replaceSr(getFileName($filename));
 
 		if (fileExt($filename)=='bmp'){
-			bitmap_loadfile($this->self,replaceSr($filename));
+			bitmap_loadfile($this->self,$filename);
 		} else {
 
 			convert_file_to_bmp($filename, $this->self);
@@ -620,7 +625,7 @@ function saveToFile($filename){
     function getBitmap(){
 
 		$self = picture_bitmap($this->self);
-		$result = new TBitmap(false);
+		$result = new TBitmap(nil, false);
 		$result->self = $self;
 		return $result;
     }

core/main/menus.php

@@ -86,7 +86,7 @@ class TMenuItem extends TControl {
 
 	public function __construct($onwer=nil, $init=true, $self=nil){
 		parent::__construct($onwer,$init,$self);
-		$this->picture = new TBitmap(false);
+		$this->picture = new TBitmap(nil,false);
 		$this->picture->self = __rtti_link($this->self,'Bitmap');
 
 		$this->picture->parent_object = $this->self;