From 97c46b796aedd1deb3f7d672dcac7b1c802df6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 11 Oct 2014 13:49:56 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: When converting a Gambas 2 project, correctly replace Arrangement. LeftRight by Arrangement.Row and Arrangement.TopBottom by Arrangement.Column. git-svn-id: svn://localhost/gambas/trunk@6532 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.src/Project/Conversion/MConvert.module | 6 ++++++ app/src/gambas3/.src/Project/FCreateFile.class | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/gambas3/.src/Project/Conversion/MConvert.module b/app/src/gambas3/.src/Project/Conversion/MConvert.module index 16dcfdfba..43cc75375 100644 --- a/app/src/gambas3/.src/Project/Conversion/MConvert.module +++ b/app/src/gambas3/.src/Project/Conversion/MConvert.module @@ -152,6 +152,12 @@ Private Sub ConvertForm(sPath As String) Endif Else If sProp = "Spacing" Then sFullLine = "Spacing = True" + Else If sProp = "Arrangement" Then + If sValue = "LeftRight" Then + sFullLine = "Arrangement = Arrange.Row" + Else If sValue = "TopBottom" Then + sFullLine = "Arrangement = Arrange.Column" + Endif Else If sClass = "WebBrowser" Then If ["Java", "JavaScript", "Path", "Plugins", "Zoom"].Exist(sProp) Then Continue Else If sClass = "ValueBox" Then diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class index f46a513d3..eaf39d361 100644 --- a/app/src/gambas3/.src/Project/FCreateFile.class +++ b/app/src/gambas3/.src/Project/FCreateFile.class @@ -118,12 +118,7 @@ End Public Sub Form_Open() - Dim hCtrl As Control Dim hModule As CModule - 'Dim aFilter As String[] - Dim hPanel As Container - Dim hPictureBox As PictureBox - Dim sType As String $bDoNotSetName = False