From 186afc63262807abfcdd105fa6ee11f18e08602b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Sun, 10 Apr 2011 21:27:34 +0000
Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * NEW: Replace Image.Draw() by
 Image.PaintImage() everywhere.

[WEB SITE MAKER]
* NEW: Some website updates.

[GB.GTK]
* NEW: The Image.Draw() method has been renamed as Image.PaintImage().

[GB.IMAGE]
* NEW: Image.DrawImage() is a new method that draws an image by ignoring
  the alpha channel.

[GB.IMAGE.IMLIB]
* NEW: The Image.Draw() method has been renamed as Image.PaintImage().

[GB.QT4]
* NEW: The Image.Draw() method has been renamed as Image.PaintImage().


git-svn-id: svn://localhost/gambas/trunk@3744 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 app/other/MakeWebSite/.settings               |  10 +-
 .../gambas.sourceforge.net/formula.png        | Bin 3310 -> 3061 bytes
 .../gambas.sourceforge.net/home.html          |   5 +-
 .../gambas.sourceforge.net/home.html.template |   5 +-
 .../gambas.sourceforge.net/menu.html          |  10 +-
 .../gambas.sourceforge.net/style-rtl.css      |  10 +-
 .../gambas.sourceforge.net/style.css          |  29 +-
 app/src/gambas3/.lang/.pot                    | 208 ++++++------
 app/src/gambas3/.src/CProjectTree.class       |   8 +-
 app/src/gambas3/.src/Editor/FIconEditor.class |   4 +-
 app/src/gambas3/.src/Family/CFamily.class     |   2 +-
 app/src/gambas3/.src/Project.module           |  14 +-
 gb.gtk/src/CImage.cpp                         |  24 +-
 gb.gtk/src/gpicture.cpp                       |   8 +
 gb.image.imlib/src/c_image.c                  |   4 +-
 gb.qt4/src/CImage.cpp                         | 311 +++++++++---------
 main/lib/image/CImage.c                       |  14 +-
 main/lib/image/image.c                        |  88 ++---
 18 files changed, 369 insertions(+), 385 deletions(-)

diff --git a/app/other/MakeWebSite/.settings b/app/other/MakeWebSite/.settings
index ba60d6cf9..e71b6c5c5 100644
--- a/app/other/MakeWebSite/.settings
+++ b/app/other/MakeWebSite/.settings
@@ -37,14 +37,14 @@ SearchString=True
 
 [OpenFile]
 File[1]="gambas.sourceforge.net/architecture.html:37.33"
-File[2]="gambas.sourceforge.net/style.css:266.0"
-Active=3
-File[3]="gambas.sourceforge.net/style-rtl.css:278.0"
+File[2]="gambas.sourceforge.net/style.css:442.0"
+File[3]="gambas.sourceforge.net/style-rtl.css:366.20"
 File[4]="gambas.sourceforge.net/compilation.html.template#:2.0"
 File[5]=".src/MMain.module:334.3"
-File[6]="gambas.sourceforge.net/menu.html:89.27"
+Active=6
+File[6]="gambas.sourceforge.net/menu.html:73.9"
 File[7]="gambas.sourceforge.net/home.html:0.0"
-File[8]="gambas.sourceforge.net/home.html.template:43.224"
+File[8]="gambas.sourceforge.net/home.html.template:50.40"
 Count=8
 
 [Watches]
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/formula.png b/app/other/MakeWebSite/gambas.sourceforge.net/formula.png
index 8e85c036878f84ba45e78d310672edc164349814..bf8237db1005db9e87a9724f82cbce95f5745ae7 100644
GIT binary patch
delta 3030
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
Q!Ke<qre#2=z}p1>57+k1761SM

delta 3281
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
EFXXlv%K!iX

diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
index d215e82ff..878654777 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
@@ -47,10 +47,11 @@
 
 </div>
 
-<div id="home-background">
 <div align="center">
-<img src="home.png" style="margin-top:16px;">
+<img src="home.png" style="margin-top:32px;">
 </div>
+
+<div id="home-background">
 </div>
 
 <script type="text/javascript">
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
index 0a800e541..62bce028d 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
@@ -47,10 +47,11 @@
 
 </div>
 
-<div id="home-background">
 <div align="center">
-<img src="home.png" style="margin-top:16px;">
+<img src="home.png" style="margin-top:32px;">
 </div>
+
+<div id="home-background">
 </div>
 
 <script type="text/javascript">
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/menu.html b/app/other/MakeWebSite/gambas.sourceforge.net/menu.html
index e5a2e6e24..c1a03d1e1 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/menu.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/menu.html
@@ -42,7 +42,7 @@
     
     <br>
     <div align="center">
-      <a class="image" href="../en/main.html" target="_top"><img src="flag/en.png" border="0" style="" alt="{English}" title="{English}"></img></a>
+      <a class="image" href="../en/main.html" target="_top"><img src="flag/en.png" border="0" style="" alt="{English}" title="{English}" valign="top"></img></a>
       <a class="image" href="../fr/main.html" target="_top"><img src="flag/fr.png" border="0" style="" alt="{French}" title="{French}"></img></a>
       <a class="image" href="../es/main.html" target="_top"><img src="flag/es.png" border="0" style="" alt="{Spanish}" title="{Spanish}"></img></a>
       <a class="image" href="../de/main.html" target="_top"><img src="flag/de.png" border="0" style="" alt="{German}" title="{German}"></img></a>
@@ -64,15 +64,15 @@
       
       <a class="image" href="http://petition.eurolinux.org/" target="_blank"><img src="nopatents.png" border="0" alt="{No software patents in Europe!}" title="{No software patents in Europe!}"> </a>
       
-      <div style="height:12px;"></div>
+      <div style="height:6px;"></div>
       
       <a class="image" href="http://sourceforge.net/" target="_blank"><img src="sourceforge.png" border="0" alt="SourceForge.net"></a>    
       
-      <div style="height:6px;"></div>
+      <!--<div style="height:6px;"></div>
       
       <img src="http://www.mypagerank.net/services/pagerankbutton/pagerankbutton.php?aut=ce471354aefc3a870d94ec9854231a105640443aa060e94f390c6cc1d2" border="0" alt="Powered by MyPagerank.Net">
-      
-      <div style="height:16px;"></div>
+      -->
+      <div style="height:10px;"></div>
       
       <form action="https://www.paypal.com/cgi-bin/webscr" method="post" style="margin:0px;">
       <input type="hidden" name="cmd" value="_s-xclick">
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/style-rtl.css b/app/other/MakeWebSite/gambas.sourceforge.net/style-rtl.css
index df9f2a993..b52460da8 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/style-rtl.css
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/style-rtl.css
@@ -364,8 +364,7 @@ p {
   padding: 0px 16px 16px 8px;
   border-bottom: dotted black 6px;
   margin-right: -8px;
-  /*border-right: dotted black 6px;*/
-  /*border-radius: 0px 0px 12px;*/
+  background: white;
 }
 
 .title {
@@ -471,11 +470,12 @@ a.download-blue:hover {
 #home-background {
   background-image: url('home.jpeg');
   background-repeat: no-repeat;
-  background-position: 0px 0px;
-  margin-right: -8px;
+  background-position: bottom center;
+  margin-left: -8px;
   margin-top: 8px;
   position: absolute;
   z-index: -1;
   width: 868px;
-  height: 480px;
+  height: 90%;
+  bottom: 0px;
 }
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/style.css b/app/other/MakeWebSite/gambas.sourceforge.net/style.css
index 2cc3f1a83..5a045aba4 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/style.css
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/style.css
@@ -297,30 +297,6 @@ H3 {
   margin-left: 16px;
 }
 
-.top-left-corner {
-  float: left;
-}
-
-.top-right-corner {
-  float: right;
-}
-
-.bottom-left-corner {
-  float: left;
-}
-
-.bottom-right-corner {
-  float: right;
-}
-
-.top-corner {
-  height: 8px;
-  }
-  
-.bottom-corner {
-  height: 8px;
-  }
-  
 img {
   border: none;
 }
@@ -455,11 +431,12 @@ a.download-blue:hover {
 #home-background {
   background-image: url('home.jpeg');
   background-repeat: no-repeat;
-  background-position: 0px 0px;
+  background-position: bottom center;
   margin-left: -8px;
   margin-top: 8px;
   position: absolute;
   z-index: -1;
   width: 868px;
-  height: 480px;
+  height: 90%;
+  bottom: 0px;
 }
diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot
index d94322fe6..b2f9783d7 100644
--- a/app/src/gambas3/.lang/.pot
+++ b/app/src/gambas3/.lang/.pot
@@ -10,32 +10,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: CComponentBox.class:213
-msgid "Experimental"
+#: .project:1
+msgid "Gambas 3"
 msgstr ""
 
-#: CComponentBox.class:215 FPropertyComponent.class:325
-msgid "Not finished but stable"
-msgstr ""
-
-#: CComponentBox.class:223 ProjectItem.class:68
-msgid "Authors"
-msgstr ""
-
-#: CComponentBox.class:230 FPropertyComponent.class:358
-msgid "Requires"
-msgstr ""
-
-#: CComponentBox.class:232
-msgid "Excludes"
-msgstr ""
-
-#: CComponentBox.class:238
-msgid "Implements"
-msgstr ""
-
-#: CComponentBox.class:251 LibraryItem.class:58
-msgid "Provides"
+#: .project:2
+msgid "Integrated Development Environment for Gambas"
 msgstr ""
 
 #: CComponent.class:79
@@ -282,6 +262,34 @@ msgstr ""
 msgid "Loading information on component &1..."
 msgstr ""
 
+#: CComponentBox.class:213
+msgid "Experimental"
+msgstr ""
+
+#: CComponentBox.class:215 FPropertyComponent.class:325
+msgid "Not finished but stable"
+msgstr ""
+
+#: CComponentBox.class:223 ProjectItem.class:68
+msgid "Authors"
+msgstr ""
+
+#: CComponentBox.class:230 FPropertyComponent.class:358
+msgid "Requires"
+msgstr ""
+
+#: CComponentBox.class:232
+msgid "Excludes"
+msgstr ""
+
+#: CComponentBox.class:238
+msgid "Implements"
+msgstr ""
+
+#: CComponentBox.class:251 LibraryItem.class:58
+msgid "Provides"
+msgstr ""
+
 #: CInsertColor.class:103 FEditor.class:3648 FTextEditor.class:1011
 msgid "Insert color"
 msgstr ""
@@ -458,18 +466,18 @@ msgstr ""
 
 #: FColorChooser.class:216 FCommit.class:386 FConflict.class:191
 #: FConnectionEditor.class:284 FCreateFile.class:938 FDebugInfo.class:520
-#: FEditor.class:2274 FFindList.class:195 FFontChooser.class:85
-#: FForm.class:2960 FGotoLine.class:63 FHelpBrowser.class:341
-#: FIconEditor.class:1413 FImportTable.class:39 FList.class:155
-#: FMain.class:200 FMakeInstall.class:326 FMenu.class:1235
-#: FNewConnection.class:317 FNewTable.class:165 FNewTranslation.class:70
-#: FOpenProject.class:533 FOption.class:613 FPasteSpecial.class:279
-#: FPasteTable.class:337 FPropertyComponent.class:473
-#: FPropertyProject.class:801 FReportBorderChooser.class:345
-#: FReportBrushChooser.class:475 FReportCoordChooser.class:126 FSave.class:118
-#: FSaveProjectAs.class:130 FSelectExtraFile.class:78 FSelectIcon.class:272
-#: FSnippet.class:142 FTableChooser.class:144 FTextEditor.class:475
-#: FText.class:106 FTranslate.class:638 Project.module:412
+#: FEditor.class:2274 FFontChooser.class:85 FForm.class:2960
+#: FGotoLine.class:63 FHelpBrowser.class:341 FIconEditor.class:1413
+#: FImportTable.class:39 FList.class:155 FMain.class:200
+#: FMakeInstall.class:326 FMenu.class:1235 FNewConnection.class:317
+#: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:533
+#: FOption.class:613 FPasteSpecial.class:279 FPasteTable.class:337
+#: FPropertyComponent.class:473 FPropertyProject.class:801
+#: FReportBorderChooser.class:345 FReportBrushChooser.class:475
+#: FReportCoordChooser.class:126 FSave.class:118 FSaveProjectAs.class:130
+#: FSelectExtraFile.class:78 FSelectIcon.class:272 FSnippet.class:142
+#: FTableChooser.class:144 FText.class:106 FTextEditor.class:475
+#: FTranslate.class:638 Project.module:412
 msgid "Cancel"
 msgstr ""
 
@@ -584,9 +592,9 @@ msgstr ""
 msgid "&Edit"
 msgstr ""
 
-#: FConflict.class:25 FFindList.class:203 FIconEditor.class:1426
-#: FImportTable.class:701 FMakeInstall.class:275 FSearch.class:1182
-#: FSystemInfo.class:73 FTips.class:240
+#: FConflict.class:25 FIconEditor.class:1426 FImportTable.class:701
+#: FMakeInstall.class:275 FSearch.class:1182 FSystemInfo.class:73
+#: FTips.class:240
 msgid "Close"
 msgstr ""
 
@@ -623,7 +631,6 @@ msgid "Conflict files"
 msgstr ""
 
 #: FConflict.class:384 FCreateFile.class:736 FDebugInfo.class:63
-#: FFindList.class:76
 msgid "Text"
 msgstr ""
 
@@ -938,7 +945,7 @@ msgstr ""
 msgid "Module"
 msgstr ""
 
-#: FCreateFile.class:631 FDebugInfo.class:49 FFindList.class:71 FInfo.class:85
+#: FCreateFile.class:631 FDebugInfo.class:49 FInfo.class:85
 msgid "Class"
 msgstr ""
 
@@ -1154,8 +1161,8 @@ msgstr ""
 msgid "Function"
 msgstr ""
 
-#: FDebugInfo.class:51 FFindList.class:73 FIconEditor.class:2273
-#: FImportTable.class:76 FOption.class:1188
+#: FDebugInfo.class:51 FIconEditor.class:2273 FImportTable.class:76
+#: FOption.class:1188
 msgid "Line"
 msgstr ""
 
@@ -1273,8 +1280,7 @@ msgstr ""
 msgid "Show search window"
 msgstr ""
 
-#: FDebugInfo.class:1397 FFindList.class:279 FSearch.class:432
-#: FTranslate.class:599
+#: FDebugInfo.class:1397 FSearch.class:432 FTranslate.class:599
 msgid "Search string cannot be found."
 msgstr ""
 
@@ -1405,14 +1411,6 @@ msgstr ""
 msgid "Procedure list"
 msgstr ""
 
-#: FFindList.class:75
-msgid "Column"
-msgstr ""
-
-#: FFindList.class:244
-msgid "Find list"
-msgstr ""
-
 #: FFontChooser.class:57
 msgid "Select a font"
 msgstr ""
@@ -3339,42 +3337,6 @@ msgstr ""
 msgid "Also copy table &data"
 msgstr ""
 
-#: FPropertyComponent.class:149
-msgid "Cannot write component description file."
-msgstr ""
-
-#: FPropertyComponent.class:318
-msgid "Component advancement"
-msgstr ""
-
-#: FPropertyComponent.class:325
-msgid "Finished and stable"
-msgstr ""
-
-#: FPropertyComponent.class:325
-msgid "Beta version"
-msgstr ""
-
-#: FPropertyComponent.class:336
-msgid "This component is hidden"
-msgstr ""
-
-#: FPropertyComponent.class:349
-msgid "Exported classes"
-msgstr ""
-
-#: FPropertyComponent.class:363
-msgid "Features"
-msgstr ""
-
-#: FPropertyComponent.class:404 FPropertyProject.class:1639
-msgid "Components"
-msgstr ""
-
-#: FPropertyComponent.class:448
-msgid "Remove All"
-msgstr ""
-
 #: FProperty.class:353
 msgid "Forbidden characters in control name."
 msgstr ""
@@ -3430,6 +3392,42 @@ msgstr ""
 msgid "..."
 msgstr ""
 
+#: FPropertyComponent.class:149
+msgid "Cannot write component description file."
+msgstr ""
+
+#: FPropertyComponent.class:318
+msgid "Component advancement"
+msgstr ""
+
+#: FPropertyComponent.class:325
+msgid "Finished and stable"
+msgstr ""
+
+#: FPropertyComponent.class:325
+msgid "Beta version"
+msgstr ""
+
+#: FPropertyComponent.class:336
+msgid "This component is hidden"
+msgstr ""
+
+#: FPropertyComponent.class:349
+msgid "Exported classes"
+msgstr ""
+
+#: FPropertyComponent.class:363
+msgid "Features"
+msgstr ""
+
+#: FPropertyComponent.class:404 FPropertyProject.class:1639
+msgid "Components"
+msgstr ""
+
+#: FPropertyComponent.class:448
+msgid "Remove All"
+msgstr ""
+
 #: FPropertyProject.class:106
 msgid "Not translatable"
 msgstr ""
@@ -3814,6 +3812,14 @@ msgstr ""
 msgid "Connection"
 msgstr ""
 
+#: FText.class:77
+msgid "Edit text property"
+msgstr ""
+
+#: FText.class:95
+msgid "Use a fixed font"
+msgstr ""
+
 #: FTextEditor.class:670
 msgid "The file has been compressed from &1 to &2 bytes (&3)."
 msgstr ""
@@ -3834,14 +3840,6 @@ msgstr ""
 msgid "Uncompress file"
 msgstr ""
 
-#: FText.class:77
-msgid "Edit text property"
-msgstr ""
-
-#: FText.class:95
-msgid "Use a fixed font"
-msgstr ""
-
 #: FTips.class:47
 msgid "Tip of the day"
 msgstr ""
@@ -5292,18 +5290,6 @@ msgstr ""
 msgid "'tar' has returned the following error code:"
 msgstr ""
 
-#: ProjectItem.class:68
-msgid "Author"
-msgstr ""
-
-#: .project:1
-msgid "Gambas 3"
-msgstr ""
-
-#: .project:2
-msgid "Integrated Development Environment for Gambas"
-msgstr ""
-
 #: Project.module:181
 msgid "Automation"
 msgstr ""
@@ -5613,6 +5599,10 @@ msgstr ""
 msgid "Unable to convert &1"
 msgstr ""
 
+#: ProjectItem.class:68
+msgid "Author"
+msgstr ""
+
 #: Save.module:39
 msgid "Cannot save file !"
 msgstr ""
diff --git a/app/src/gambas3/.src/CProjectTree.class b/app/src/gambas3/.src/CProjectTree.class
index d89231669..f3f88b382 100644
--- a/app/src/gambas3/.src/CProjectTree.class
+++ b/app/src/gambas3/.src/CProjectTree.class
@@ -444,8 +444,8 @@ Private Sub AddEmblem(hSource As Image, sEmblem As String) As Image
   hEmblem = Picture[sEmblem].Image.Stretch(iSize * 1.5, iSize * 1.5)
   
   hImage = New Image(hSource.Width + iSize, hSource.Height, Color.Transparent)
-  hImage.Draw(hSource, iSize, 0)
-  hImage.Draw(hEmblem, 0, (hImage.H - hEmblem.H) / 2)
+  hImage.PaintImage(hSource, iSize, 0)
+  hImage.PaintImage(hEmblem, 0, (hImage.H - hEmblem.H) / 2)
   Return hImage
   
 End
@@ -454,8 +454,8 @@ Private Sub AddLinkEmblem(hSource As Image) As Image
   
   Dim hImage As New Image(hSource.Width + 1, hSource.Height + 1, Color.Transparent)
   
-  hImage.Draw(hSource, 1, 0)
-  hImage.Draw(Picture["img/16/link.png"].Image, 0, hImage.Height - 16)
+  hImage.PaintImage(hSource, 1, 0)
+  hImage.PaintImage(Picture["img/16/link.png"].Image, 0, hImage.Height - 16)
   Return hImage
   
 End
diff --git a/app/src/gambas3/.src/Editor/FIconEditor.class b/app/src/gambas3/.src/Editor/FIconEditor.class
index 9b020ff34..98d9f6235 100644
--- a/app/src/gambas3/.src/Editor/FIconEditor.class
+++ b/app/src/gambas3/.src/Editor/FIconEditor.class
@@ -295,7 +295,7 @@ Public Sub dwgPaste_Draw()
   Dim CP As Integer
   Dim W As Integer
   Dim hTemp As Image
-  Dim XD,WD As Integer
+  Dim XD, WD As Integer
 
   If Not $hPaste Then Return
 
@@ -333,7 +333,7 @@ Public Sub dwgPaste_Draw()
   If $bTrans Then
 
     hTemp = $hImage.Copy($XS, $YS, $hPaste.Width, $hPaste.Height)
-    hTemp.Draw($hPaste, 0, 0)
+    hTemp.PaintImage($hPaste, 0, 0)
     'Draw.Zoom($hImage, $iScale, SX * $iScale, SY * $iScale, SX + $XS, SY + $YS, DX - SX + 1, DY - SY + 1)
     Draw.Zoom(hTemp, $iScale, SX * $iScale, SY * $iScale, SX, SY, DX - SX + 1, DY - SY + 1)
 
diff --git a/app/src/gambas3/.src/Family/CFamily.class b/app/src/gambas3/.src/Family/CFamily.class
index 954d95df3..57c8ebce8 100644
--- a/app/src/gambas3/.src/Family/CFamily.class
+++ b/app/src/gambas3/.src/Family/CFamily.class
@@ -266,7 +266,7 @@ Public Sub DrawIcon(hCont As Container, hCCtrl As CControl, sImage As String)
     hPict = Picture["$arr-" & sImage]
     If Not hPict Then
       hImage = New Image(ICON_SIZE, ICON_SIZE, Color.RGB(0, 0, 0, 96))
-      hImage.Draw(Image.Load("img/family" &/ sImage & ".png"), 0, 0)
+      hImage.PaintImage(Image.Load("img/family" &/ sImage & ".png"), 0, 0)
       hPict = hImage.Picture
       Picture["$arr-" & sImage] = hPict
     Endif
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index ea30ecceb..1770f36d2 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -700,8 +700,8 @@ Private Sub AddEmblem(hSource As Image, sEmblem As String) As Image
   hEmblem = Picture[sEmblem].Image.Stretch(iSize * 1.5, iSize * 1.5)
   
   hImage = New Image(hSource.Width + iSize, hSource.Height, Color.Transparent)
-  hImage.Draw(hSource, iSize, 0)
-  hImage.Draw(hEmblem, 0, (hImage.H - hEmblem.H) / 2)
+  hImage.PaintImage(hSource, iSize, 0)
+  hImage.PaintImage(hEmblem, 0, (hImage.H - hEmblem.H) / 2)
   Return hImage
   
 End
@@ -710,8 +710,8 @@ Private Sub AddLinkEmblem(hSource As Image) As Image
   
   Dim hImage As New Image(hSource.Width + 1, hSource.Height + 1, Color.Transparent)
   
-  hImage.Draw(hSource, 1, 0)
-  hImage.Draw(Picture["img/16/link.png"].Image, 0, hImage.Height - 16)
+  hImage.PaintImage(hSource, 1, 0)
+  hImage.PaintImage(Picture["img/16/link.png"].Image, 0, hImage.Height - 16)
   Return hImage
   
 End
@@ -732,7 +732,7 @@ Public Sub MakeModuleIcon(sModule As String, Optional iSize As Integer) As Image
     hImage = $cImageCache["base"]
     hImage = hImage.Stretch(iSize, iSize)
     hImageModule = Image.Load("img/module" &/ sModule & ".png") '.Stretch(iSize / 2, iSize / 2)
-    hImage.Draw(hImageModule, iSize / 4, iSize / 4, iSize / 2, iSize / 2)
+    hImage.PaintImage(hImageModule, iSize / 4, iSize / 4, iSize / 2, iSize / 2)
     $cImageCache[sKey] = hImage
   Endif
   
@@ -4444,7 +4444,7 @@ Public Function StretchIcon(sPath As String, Optional iSize As Integer = 48) As
   If W < iSize Or H < iSize Then
     hBackground = New Image(iSize, iSize)
     hBackground.Fill(Color.Transparent)
-    hBackground.Draw(hImage, (iSize - W) / 2, (iSize - H) / 2, W, H)
+    hBackground.PaintImage(hImage, (iSize - W) / 2, (iSize - H) / 2, W, H)
     hImage = hBackground
   Else 
     hImage = hImage.Stretch(W, H)
@@ -4849,7 +4849,7 @@ Public Sub MakeDirectoryIcon(Optional sDir As String)
   
   If sIcon Then 
     Try hIcon = StretchIcon(sIcon, 16)
-    If hIcon Then hDirIcon.Draw(hIcon, 40, 34)
+    If hIcon Then hDirIcon.PaintImage(hIcon, 40, 34)
   Endif
   
   hDirIcon.Save(sDir &/ ".icon.png")
diff --git a/gb.gtk/src/CImage.cpp b/gb.gtk/src/CImage.cpp
index 0da75fe88..b5dce1ade 100644
--- a/gb.gtk/src/CImage.cpp
+++ b/gb.gtk/src/CImage.cpp
@@ -139,7 +139,7 @@ BEGIN_METHOD_VOID(CIMAGE_free)
 END_METHOD
 #endif
 
-BEGIN_PROPERTY(CIMAGE_picture)
+BEGIN_PROPERTY(Image_Picture)
 
 	check_image(THIS);
 	
@@ -152,7 +152,7 @@ BEGIN_PROPERTY(CIMAGE_picture)
 END_PROPERTY
 
 
-BEGIN_METHOD(CIMAGE_load, GB_STRING path)
+BEGIN_METHOD(Image_Load, GB_STRING path)
 
 	CIMAGE *image;
 	char *addr;
@@ -177,7 +177,7 @@ BEGIN_METHOD(CIMAGE_load, GB_STRING path)
 END_METHOD
 
 
-BEGIN_METHOD(CIMAGE_save, GB_STRING path; GB_INTEGER quality)
+BEGIN_METHOD(Image_Save, GB_STRING path; GB_INTEGER quality)
 
 	check_image(THIS);
 
@@ -191,7 +191,7 @@ BEGIN_METHOD(CIMAGE_save, GB_STRING path; GB_INTEGER quality)
 END_METHOD
 
 
-BEGIN_METHOD(CIMAGE_stretch, GB_INTEGER width; GB_INTEGER height)
+BEGIN_METHOD(Image_Stretch, GB_INTEGER width; GB_INTEGER height)
 
 	CIMAGE *img;
 
@@ -202,7 +202,7 @@ BEGIN_METHOD(CIMAGE_stretch, GB_INTEGER width; GB_INTEGER height)
 END_METHOD
 
 
-BEGIN_METHOD(CIMAGE_rotate, GB_FLOAT angle)
+BEGIN_METHOD(Image_Rotate, GB_FLOAT angle)
 
 	CIMAGE *img;
 
@@ -213,7 +213,7 @@ BEGIN_METHOD(CIMAGE_rotate, GB_FLOAT angle)
 END_METHOD
 
 
-BEGIN_METHOD(CIMAGE_draw, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
+BEGIN_METHOD(Image_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
 
   int x, y, w, h, sx, sy, sw, sh;
   CIMAGE *image = (CIMAGE *)VARG(img);
@@ -246,15 +246,15 @@ GB_DESC CImageDesc[] =
 {
   GB_DECLARE("Image", sizeof(CIMAGE)),
 
-  GB_STATIC_METHOD("Load", "Image", CIMAGE_load, "(Path)s"),
-  GB_METHOD("Save", 0, CIMAGE_save, "(Path)s[(Quality)i]"),
+  GB_STATIC_METHOD("Load", "Image", Image_Load, "(Path)s"),
+  GB_METHOD("Save", 0, Image_Save, "(Path)s[(Quality)i]"),
 
-  GB_METHOD("Stretch", "Image", CIMAGE_stretch, "(Width)i(Height)i"),
-  GB_METHOD("Rotate", "Image", CIMAGE_rotate, "(Angle)f"),
+  GB_METHOD("Stretch", "Image", Image_Stretch, "(Width)i(Height)i"),
+  GB_METHOD("Rotate", "Image", Image_Rotate, "(Angle)f"),
 
-  GB_METHOD("Draw", 0, CIMAGE_draw, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
+  GB_METHOD("PaintImage", 0, Image_PaintImage, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
 
-  GB_PROPERTY_READ("Picture", "Picture", CIMAGE_picture),
+  GB_PROPERTY_READ("Picture", "Picture", Image_Picture),
 
   GB_INTERFACE("Paint", &PAINT_Interface),
 
diff --git a/gb.gtk/src/gpicture.cpp b/gb.gtk/src/gpicture.cpp
index 5ba98f3c8..9d7ccb2da 100644
--- a/gb.gtk/src/gpicture.cpp
+++ b/gb.gtk/src/gpicture.cpp
@@ -897,6 +897,14 @@ gPicture *gPicture::stretch(int w, int h, bool smooth)
   GdkPixbuf *image;
 	int ws, hs;
   
+	if (w <= 0 && h <= 0)
+		return new gPicture();
+	
+	if (w < 0)
+		w = width() * h / height();
+	else if (h < 0)
+		h = height() * w / width();
+	
   if (w <= 0 || h <= 0)
     return new gPicture();
   
diff --git a/gb.image.imlib/src/c_image.c b/gb.image.imlib/src/c_image.c
index 73ea8f578..122795e6e 100644
--- a/gb.image.imlib/src/c_image.c
+++ b/gb.image.imlib/src/c_image.c
@@ -211,7 +211,7 @@ BEGIN_METHOD(Image_Sharpen, GB_INTEGER radius)
 
 END_METHOD
 
-BEGIN_METHOD(Image_Draw, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
+BEGIN_METHOD(Image_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
 
 	int x, y, w, h, sx, sy, sw, sh, src_w, src_h;
 	CIMAGE *image = (CIMAGE *)VARG(img);
@@ -270,7 +270,7 @@ GB_DESC ImageDesc[] =
 	GB_METHOD("Sharpen", "Image", Image_Sharpen, "[(Radius)i]"),
 	GB_METHOD("Tile", "Image", Image_Tile, NULL),
 
-  GB_METHOD("Draw", NULL, Image_Draw, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
+  GB_METHOD("PaintImage", NULL, Image_PaintImage, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
   GB_METHOD("Scroll", NULL, Image_Scroll, "(DX)i(DY)i[(X)i(Y)i(Width)i(Height)i]"),
 	//Gb_INTERFACE("Draw", &DRAW_Interface),
 
diff --git a/gb.qt4/src/CImage.cpp b/gb.qt4/src/CImage.cpp
index b875f33cc..41a4f67ec 100644
--- a/gb.qt4/src/CImage.cpp
+++ b/gb.qt4/src/CImage.cpp
@@ -1,22 +1,22 @@
 /***************************************************************************
 
-  CImage.cpp
+	CImage.cpp
 
-  (c) 2000-2011 Benoît Minisini <gambas@users.sourceforge.net>
+	(c) 2000-2011 Benoît Minisini <gambas@users.sourceforge.net>
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2, or (at your option)
+	any later version.
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ***************************************************************************/
 
@@ -49,32 +49,32 @@
 
 const char *CIMAGE_get_format(QString path)
 {
-  int pos;
+	int pos;
 
-  pos = path.lastIndexOf('.');
-  if (pos < 0)
-    return NULL;
+	pos = path.lastIndexOf('.');
+	if (pos < 0)
+		return NULL;
 
-  path = path.mid(pos + 1).toLower();
+	path = path.mid(pos + 1).toLower();
 
-  if (path == "png")
-    return "PNG";
-  else if (path == "jpg" || path == "jpeg")
-    return "JPEG";
-  else if (path == "gif")
-    return "GIF";
-  else if (path == "bmp")
-    return "BMP";
-  else if (path == "xpm")
-    return "XPM";
-  else
-    return NULL;
+	if (path == "png")
+		return "PNG";
+	else if (path == "jpg" || path == "jpeg")
+		return "JPEG";
+	else if (path == "gif")
+		return "GIF";
+	else if (path == "bmp")
+		return "BMP";
+	else if (path == "xpm")
+		return "XPM";
+	else
+		return NULL;
 }
 
 
 /*******************************************************************************
 
-  Image
+	Image
 
 *******************************************************************************/
 
@@ -99,7 +99,7 @@ static GB_IMG_OWNER _image_owner = {
 	"gb.qt4",
 	GB_IMAGE_BGRA,
 	free_image,
- 	free_image,
+	free_image,
 	temp_image,
 	NULL,
 	};
@@ -125,149 +125,133 @@ static void take_image(CIMAGE *_object, QImage *image)
 CIMAGE *CIMAGE_create(QImage *image)
 {
 	CIMAGE *img;
-  static GB_CLASS class_id = NULL;
+	static GB_CLASS class_id = NULL;
 
-  if (!class_id)
-    class_id = GB.FindClass("Image");
+	if (!class_id)
+		class_id = GB.FindClass("Image");
 
-  GB.New(POINTER(&img), class_id, NULL, NULL);
-  
-  if (image)
+	GB.New(POINTER(&img), class_id, NULL, NULL);
+	
+	if (image)
 	{
 		if (!image->isNull() && image->format() != QImage::Format_ARGB32)
 			*image = image->convertToFormat(QImage::Format_ARGB32);
-  	take_image(img, image);
+		take_image(img, image);
 	}
 	else
-  	take_image(img, new QImage());
+		take_image(img, new QImage());
 	
-  return img;
+	return img;
 }
 
-BEGIN_PROPERTY(CIMAGE_picture)
+BEGIN_PROPERTY(IMAGE_Picture)
 
-  CPICTURE *pict;
-  
-  check_image(THIS);
+	CPICTURE *pict;
+	
+	check_image(THIS);
 
-  GB.New(POINTER(&pict), GB.FindClass("Picture"), NULL, NULL);
-  if (!QIMAGE->isNull())
-  	*pict->pixmap = QPixmap::fromImage(*QIMAGE);
+	GB.New(POINTER(&pict), GB.FindClass("Picture"), NULL, NULL);
+	if (!QIMAGE->isNull())
+		*pict->pixmap = QPixmap::fromImage(*QIMAGE);
 
-  GB.ReturnObject(pict);
+	GB.ReturnObject(pict);
 
 END_PROPERTY
 
 #if 0
 BEGIN_METHOD(CIMAGE_resize, GB_INTEGER width; GB_INTEGER height)
 
-  check_image(THIS);
-
-  if (QIMAGE->isNull())
-  {
-  	take_image(THIS, new QImage(VARG(width), VARG(height), QImage::Format_ARGB32));
-  }
-  else
-  {
-    take_image(THIS, new QImage(QIMAGE->copy(0, 0, VARG(width), VARG(height))));
-  }
-
-END_METHOD
-#endif
-
-BEGIN_METHOD(CIMAGE_load, GB_STRING path)
-
-  QImage *p;
-  CIMAGE *img;
-
-  if (CPICTURE_load_image(&p, STRING(path), LENGTH(path)))
-  {
-  	p->convertToFormat(QImage::Format_ARGB32);
-	  img = CIMAGE_create(p);
-    GB.ReturnObject(img);
-	}
-  else
-    GB.Error("Unable to load image");
-
-END_METHOD
-
-
-BEGIN_METHOD(CIMAGE_save, GB_STRING path; GB_INTEGER quality)
-
-  QString path = TO_QSTRING(GB.FileName(STRING(path), LENGTH(path)));
-  bool ok = false;
-  const char *fmt = CIMAGE_get_format(path);
-
-  if (!fmt)
-  {
-    GB.Error("Unknown format");
-    return;
-  }
-
-  check_image(THIS);
-
-	ok = QIMAGE->save(path, fmt, VARGOPT(quality, -1));
-
-  if (!ok)
-    GB.Error("Unable to save picture");
-
-END_METHOD
-
-BEGIN_METHOD(CIMAGE_stretch, GB_INTEGER width; GB_INTEGER height)
-
-	//static int count = 0;
-  QImage *stretch;
-
-  check_image(THIS);
+	check_image(THIS);
 
 	if (QIMAGE->isNull())
 	{
-    stretch = new QImage(VARG(width), VARG(height), QImage::Format_ARGB32);
+		take_image(THIS, new QImage(VARG(width), VARG(height), QImage::Format_ARGB32));
 	}
 	else
 	{
-		stretch = new QImage();
-		*stretch = QIMAGE->scaled(VARG(width), VARG(height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-		stretch->detach();
+		take_image(THIS, new QImage(QIMAGE->copy(0, 0, VARG(width), VARG(height))));
 	}
 
-  GB.ReturnObject(CIMAGE_create(stretch));
-
-END_METHOD
-
-#if 0
-BEGIN_METHOD_VOID(CIMAGE_flip)
-
-	QImage *mirror = new QImage();
-	
-  check_image(THIS);
-  *mirror = QIMAGE->mirrored(true, false);
-	
-  GB.ReturnObject(CIMAGE_create(mirror));
-
 END_METHOD
 #endif
 
-#if 0
-BEGIN_METHOD_VOID(CIMAGE_mirror)
+BEGIN_METHOD(IMAGE_Load, GB_STRING path)
 
-	QImage *mirror = new QImage();
-	
-  check_image(THIS);
-  *mirror = QIMAGE->mirrored(false, true);
-	
-  GB.ReturnObject(CIMAGE_create(mirror));
+	QImage *p;
+	CIMAGE *img;
+
+	if (CPICTURE_load_image(&p, STRING(path), LENGTH(path)))
+	{
+		p->convertToFormat(QImage::Format_ARGB32);
+		img = CIMAGE_create(p);
+		GB.ReturnObject(img);
+	}
+	else
+		GB.Error("Unable to load image");
 
 END_METHOD
-#endif
 
-BEGIN_METHOD(CIMAGE_rotate, GB_FLOAT angle)
 
-  QImage *rotate = new QImage();
+BEGIN_METHOD(IMAGE_Save, GB_STRING path; GB_INTEGER quality)
+
+	QString path = TO_QSTRING(GB.FileName(STRING(path), LENGTH(path)));
+	bool ok = false;
+	const char *fmt = CIMAGE_get_format(path);
+
+	if (!fmt)
+	{
+		GB.Error("Unknown format");
+		return;
+	}
+
+	check_image(THIS);
+
+	ok = QIMAGE->save(path, fmt, VARGOPT(quality, -1));
+
+	if (!ok)
+		GB.Error("Unable to save picture");
+
+END_METHOD
+
+BEGIN_METHOD(IMAGE_Stretch, GB_INTEGER width; GB_INTEGER height)
+
+	//static int count = 0;
+	QImage *stretch;
+	int w, h;
+
+	check_image(THIS);
+
+	stretch = new QImage();
+
+	if (!QIMAGE->isNull())
+	{
+		w = VARG(width);
+		h = VARG(height);
+	
+		if (w < 0 && h > 0)
+			w = QIMAGE->width() * h / QIMAGE->height();
+		else if (h < 0 && w > 0)
+			h = QIMAGE->height() * w / QIMAGE->width();
+		
+		if (w > 0 && h > 0)
+		{
+			*stretch = QIMAGE->scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+			stretch->detach();
+		}
+	}
+
+	GB.ReturnObject(CIMAGE_create(stretch));
+
+END_METHOD
+
+
+BEGIN_METHOD(IMAGE_Rotate, GB_FLOAT angle)
+
+	QImage *rotate = new QImage();
 	double angle = VARG(angle);
-  
-  check_image(THIS);
-  
+	
+	check_image(THIS);
+	
 	if (angle != 0.0)
 	{
 		QMatrix mat;
@@ -282,30 +266,30 @@ BEGIN_METHOD(CIMAGE_rotate, GB_FLOAT angle)
 END_METHOD
 
 
-BEGIN_METHOD(CIMAGE_draw, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
+BEGIN_METHOD(IMAGE_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh)
 
-  int x, y, w, h, sx, sy, sw, sh;
-  CIMAGE *image = (CIMAGE *)VARG(img);
-  QImage *src, *dst;
-  double scale_x, scale_y;
+	int x, y, w, h, sx, sy, sw, sh;
+	CIMAGE *image = (CIMAGE *)VARG(img);
+	QImage *src, *dst;
+	double scale_x, scale_y;
 
-  if (GB.CheckObject(image))
-    return;
+	if (GB.CheckObject(image))
+		return;
 
 	src = check_image(image);
 	dst = check_image(THIS);
 
-  x = VARGOPT(x, 0);
-  y = VARGOPT(y, 0);
-  w = VARGOPT(w, -1);
-  h = VARGOPT(h, -1);
+	x = VARGOPT(x, 0);
+	y = VARGOPT(y, 0);
+	w = VARGOPT(w, -1);
+	h = VARGOPT(h, -1);
 
-  sx = VARGOPT(sx, 0);
-  sy = VARGOPT(sy, 0);
-  sw = VARGOPT(sw, src->width());
-  sh = VARGOPT(sh, src->height());
+	sx = VARGOPT(sx, 0);
+	sy = VARGOPT(sy, 0);
+	sw = VARGOPT(sw, src->width());
+	sh = VARGOPT(sh, src->height());
 
-  DRAW_NORMALIZE(x, y, w, h, sx, sy, sw, sh, src->width(), src->height());
+	DRAW_NORMALIZE(x, y, w, h, sx, sy, sw, sh, src->width(), src->height());
 
 	if (w != sw || h != sh)
 	{
@@ -335,19 +319,20 @@ END_METHOD
 
 GB_DESC CImageDesc[] =
 {
-  GB_DECLARE("Image", sizeof(CIMAGE)),
+	GB_DECLARE("Image", sizeof(CIMAGE)),
 
-  GB_STATIC_METHOD("Load", "Image", CIMAGE_load, "(Path)s"),
-  GB_METHOD("Save", NULL, CIMAGE_save, "(Path)s[(Quality)i]"),
+	GB_STATIC_METHOD("Load", "Image", IMAGE_Load, "(Path)s"),
+	GB_METHOD("Save", NULL, IMAGE_Save, "(Path)s[(Quality)i]"),
 
-	GB_METHOD("Stretch", "Image", CIMAGE_stretch, "(Width)i(Height)i"),
-  GB_METHOD("Rotate", "Image", CIMAGE_rotate, "(Angle)f"),
+	GB_METHOD("Stretch", "Image", IMAGE_Stretch, "(Width)i(Height)i"),
+	GB_METHOD("Rotate", "Image", IMAGE_Rotate, "(Angle)f"),
 
-  GB_METHOD("Draw", NULL, CIMAGE_draw, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
+	GB_METHOD("PaintImage", NULL, IMAGE_PaintImage, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
 
-  GB_PROPERTY_READ("Picture", "Picture", CIMAGE_picture),
+	GB_PROPERTY_READ("Picture", "Picture", IMAGE_Picture),
+	
 	GB_INTERFACE("Paint", &PAINT_Interface),
 	
-  GB_END_DECLARE
+	GB_END_DECLARE
 };
 
diff --git a/main/lib/image/CImage.c b/main/lib/image/CImage.c
index 719cefb1a..9c89bc958 100644
--- a/main/lib/image/CImage.c
+++ b/main/lib/image/CImage.c
@@ -253,6 +253,18 @@ BEGIN_METHOD(Image_DrawAlpha, GB_OBJECT image; GB_INTEGER x; GB_INTEGER y; GB_IN
 
 END_METHOD
 
+BEGIN_METHOD(Image_DrawImage, GB_OBJECT image; GB_INTEGER x; GB_INTEGER y; GB_INTEGER srcx; GB_INTEGER srcy; GB_INTEGER srcw; GB_INTEGER srch)
+
+	CIMAGE *image = VARG(image);
+	
+	if (GB.CheckObject(image))
+		return;
+	
+  IMAGE_bitblt(THIS_IMAGE, VARGOPT(x, 0), VARGOPT(y, 0), &image->image, VARGOPT(srcx, 0), VARGOPT(srcy, 0), VARGOPT(srcw, -1), VARGOPT(srch, -1));
+	GB.ReturnObject(THIS);
+
+END_METHOD
+
 BEGIN_PROPERTY(Image_Format)
 
 	char *format;
@@ -325,7 +337,7 @@ GB_DESC CImageDesc[] =
 	GB_METHOD("DrawAlpha", "Image", Image_DrawAlpha, "(Image)Image;[(X)i(Y)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
 
 	//GB_METHOD("Transform", "Image", CIMAGE_transform, "(SrcX)f(SrcY)f(DepX)f(DepY)f"),
-  //GB_METHOD("Draw", NULL, CIMAGE_draw, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
+  GB_METHOD("DrawImage", "Image", Image_DrawImage, "(Image)Image;(X)i(Y)i[(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"),
   
   GB_END_DECLARE
 };
diff --git a/main/lib/image/image.c b/main/lib/image/image.c
index f38659b97..1034f2889 100644
--- a/main/lib/image/image.c
+++ b/main/lib/image/image.c
@@ -838,9 +838,12 @@ int IMAGE_get_default_format()
 
 void IMAGE_bitblt(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int sw, int sh)
 {
-	if (dst->format != src->format)
+	int sfmt = src->format;
+	int dfmt = dst->format;
+	
+	if (!GB_IMAGE_FMT_IS_32_BITS(sfmt) || !GB_IMAGE_FMT_IS_32_BITS(dfmt))
 	{
-		GB.Error("The source image and the destination image must have the same format");
+		GB.Error("The pixel format of both images must be 32 bits");
 		return;
 	}
 	
@@ -861,40 +864,55 @@ void IMAGE_bitblt(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int
 	SYNCHRONIZE(src);
 	SYNCHRONIZE(dst);
 		
-	if (GB_IMAGE_FMT_IS_32_BITS(src->format))
+	uint *d = (uint *)dst->data + dy * dst->width + dx;
+	uint *s = (uint *)src->data + sy * src->width + sx;
+
+	if (sfmt != dfmt)
 	{
-		uint *d = (uint *)dst->data + dy * dst->width + dx;
-		uint *s = (uint *)src->data + sy * src->width + sx;
-	
-		if (sw < 64)
+		const int dd = dst->width - sw;
+		const int ds = src->width - sw;
+		int t;
+		while (sh--) 
 		{
-			// Trust ourselves
-			const int dd = dst->width - sw;
-			const int ds = src->width - sw;
-			int t;
-			while (sh--) 
+			for (t = sw; t--;)
 			{
-				for (t = sw; t--;)
-					*d++ = *s++;
-				d += dd;
-				s += ds;
-			}
-		} 
-		else 
-		{
-			// Trust libc
-			const int dd = dst->width;
-			const int ds = src->width;
-			const int b = sw * sizeof(uint);
-			while (sh--) 
-			{
-				memcpy(d, s, b);
-				d += dd;
-				s += ds;
+				*d = BGRA_to_format(BGRA_from_format(*s, sfmt), dfmt);
+				d++;
+				s++;
 			}
+			
+			d += dd;
+			s += ds;
 		}
 	}
-	else // 24 bits
+	else if (sw < 64)
+	{
+		const int dd = dst->width - sw;
+		const int ds = src->width - sw;
+		int t;
+		while (sh--) 
+		{
+			for (t = sw; t--;)
+				*d++ = *s++;
+			d += dd;
+			s += ds;
+		}
+	} 
+	else 
+	{
+		// Trust libc
+		const int dd = dst->width;
+		const int ds = src->width;
+		const int b = sw * sizeof(uint);
+		while (sh--) 
+		{
+			memcpy(d, s, b);
+			d += dd;
+			s += ds;
+		}
+	}
+
+	/*else if (GB_IMAGE_FMT_IS_24_BITS(sfmt) && GB_IMAGE_FMT_IS_24_BITS(sfmt))
 	{
 		char *d = (char *)dst->data + (dy * dst->width + dx) * 3;
 		char *s = (char *)src->data + (sy * src->width + sx) * 3;
@@ -908,19 +926,13 @@ void IMAGE_bitblt(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int
 			d += dd;
 			s += ds;
 		}
-	}
+	}*/
 	
 	MODIFY(dst);
 }
 
 void IMAGE_draw_alpha(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int sw, int sh)
 {
-	/*if (dst->format != src->format)
-	{
-		GB.Error("The source image and the destination image must have the same format");
-		return;
-	}*/
-	
 	if (!GB_IMAGE_FMT_IS_32_BITS(src->format) || !GB_IMAGE_FMT_IS_32_BITS(dst->format))
 	{
 		GB.Error("The images must have an alpha channel");
@@ -991,8 +1003,6 @@ void IMAGE_draw_alpha(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy,
 	{
 		for (t = sw; t--; d += 4,s += 4)
 		{
-			//cs = BGRA_from_format(*s, sformat);
-			//cd = BGRA_from_format(*d, dformat);
 			if (*s < *d)
 				*d = *s;
 		}