diff --git a/VERSION b/VERSION
index 77d822a78..fbcbf7380 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.90
\ No newline at end of file
+3.4.0
\ No newline at end of file
diff --git a/acinclude.m4 b/acinclude.m4
index e362ac15b..3e52d3427 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -64,25 +64,26 @@ AC_DEFUN([GB_PRINT_MESSAGES],
AC_DEFUN([GB_INIT_AUTOMAKE],
[
- AM_INIT_AUTOMAKE($1, 3.3.90)
+ AM_INIT_AUTOMAKE($1, 3.4.0)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
##AM_SILENT_RULES([yes])
AC_CONFIG_HEADER([config.h])
AC_PREFIX_DEFAULT(/usr)
GAMBAS_VERSION=3
- GAMBAS_MINOR_VERSION=2
+ GAMBAS_MINOR_VERSION=4
AC_SUBST(GAMBAS_VERSION)
AC_SUBST(GAMBAS_MINOR_VERSION)
AC_DEFINE(GAMBAS_VERSION, 3, Gambas version)
- AC_DEFINE(GAMBAS_MINOR_VERSION, 3, Gambas minor version)
- AC_DEFINE(GAMBAS_VERSION_STRING, "3", Gambas version string)
- AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "3.3", Gambas full version string)
+ AC_DEFINE(GAMBAS_MINOR_VERSION, 4, Gambas minor version)
- AC_DEFINE(GAMBAS_FULL_VERSION, 0x03030090, [Full Gambas version])
- AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03030000, [Gambas bytecode version])
+ AC_DEFINE(GAMBAS_VERSION_STRING, "3", Gambas version string)
+ AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "3.4", Gambas full version string)
+
+ AC_DEFINE(GAMBAS_FULL_VERSION, 0x03040000, [Full Gambas version])
+ AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03040000, [Gambas bytecode version])
AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, 0x03000000, [Minimum Gambas bytecode version])
GB_CLEAR_MESSAGES
diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class
index e16b36f3f..2ee42c923 100644
--- a/app/src/gambas3/.src/Project/FCreateFile.class
+++ b/app/src/gambas3/.src/Project/FCreateFile.class
@@ -143,7 +143,7 @@ Public Sub Form_Open()
$bInitExistingTab = False
UpdateExistingTab
- lstType.Select(Null )
+ lstType.Select(Null)
If Not $sType Then $sType = "module"
For Each hCtrl In lstType.Children
If hCtrl.Tag = $sType Then
@@ -203,7 +203,7 @@ Private Sub CreateFile() As Boolean
Case Else
- sMsg = Project.CheckClassName(sName, True )
+ sMsg = Project.CheckClassName(sName, True)
If sMsg Then
txtName.SetFocus
Balloon.Warning(sMsg, txtName)
@@ -246,7 +246,7 @@ Private Sub CreateFile() As Boolean
sTemp = Replace(sTemp, "\t", Space$(Project.TabSize))
Endif
- Project.InsertSource(sName, "class", $sDir, sTemp, True , True )
+ Project.InsertSource(sName, "class", $sDir, sTemp, True, True)
sTemp = Project.FORM_MAGIC & "\n\n" &
"{ " & sName & " " & UCase(Left(sType)) & Mid$(sType, 2) & "\n"
@@ -292,7 +292,7 @@ Private Sub CreateFile() As Boolean
Case "webpage"
- Project.InsertSource(sName, "class", $sDir, "' Gambas class file\n\n", True , True )
+ Project.InsertSource(sName, "class", $sDir, "' Gambas class file\n\n", True, True)
Project.InsertSource(sName, "webpage", $sDir, "\n\n<%\nPrint \"Gambas
\";\n%>\n\n\n")
Case "text"
@@ -363,7 +363,7 @@ Private Sub ImportDependencies(sName As String, sExt As String, sOrig As String,
If Exist(sOrig &/ sImg) Then
If Not Exist(sDestImg) Then
- Project.InsertFile(File.Name(sDestImg), File.Dir(sDestImg), sOrig &/ sImg, True , bLink)
+ Project.InsertFile(File.Name(sDestImg), File.Dir(sDestImg), sOrig &/ sImg, True, bLink)
Endif
sLine = Left(sLine, iPos + 7) & Chr$(34) & "import" &/ sName &/ File.Name(sDestImg) & Chr$(34) & "]"
bSave = True
@@ -415,15 +415,15 @@ Private Sub ImportFile() As Boolean
Case "form", "report"
sName = File.BaseName(Project.GetUniqueSourceName(sName))
- Project.InsertSource(sName, "class", $sDir, File.SetExt(sTemp, "class"), True , True , chkLink.Value)
- Project.InsertSource(sName, sExt, $sDir, sTemp, False , True , chkLink.Value)
+ Project.InsertSource(sName, "class", $sDir, File.SetExt(sTemp, "class"), True, True, chkLink.Value)
+ Project.InsertSource(sName, sExt, $sDir, sTemp, False, True, chkLink.Value)
ImportDependencies(sName, sExt, sTemp, chkLink.Value)
Project.OpenForm(sName)
Case "webpage"
sName = File.BaseName(Project.GetUniqueSourceName(sName))
- Project.InsertSource(sName, "class", $sDir, File.SetExt(sTemp, "class"), True , True , chkLink.Value)
- Project.InsertSource(sName, "webpage", $sDir, sTemp, False , False , chkLink.Value)
+ Project.InsertSource(sName, "class", $sDir, File.SetExt(sTemp, "class"), True, True, chkLink.Value)
+ Project.InsertSource(sName, "webpage", $sDir, sTemp, False, False, chkLink.Value)
Default
sName = Project.GetUniqueName($sDir, sName)
@@ -443,7 +443,7 @@ Public Sub btnOK_Click()
If ImportFile() Then Return
Endif
- Me.Close(True )
+ Me.Close(True)
Catch
diff --git a/comp/src/gb.gui.base/.src/Split/MyHSplit.class b/comp/src/gb.gui.base/.src/Split/MyHSplit.class
deleted file mode 100644
index 062cec6c7..000000000
--- a/comp/src/gb.gui.base/.src/Split/MyHSplit.class
+++ /dev/null
@@ -1,88 +0,0 @@
-' Gambas class file
-
-Inherits UserContainer
-
-Public Const _Properties As String = "*,-Padding,-Spacing,-Arrangement,-AutoResize,-Indent"
-Public Const _DefaultArrangement As String = "V"
-Public Const _DefaultEvent As String = "Click"
-
-Property Layout, Settings As Integer[]
-Event Resize
-
-Private $hObs As Observer
-Private $bLayouting As Boolean
-
-Public Sub _new()
-
- Me._Arrangement = Arrange.None
-
- $hObs = New Observer(Me) As "Container"
-
-End
-
-Public Sub Container_NewChild((Control) As Control)
-
- Dim aLayout As Integer[]
-
- aLayout = Layout_Read()
- Try aLayout[aLayout.Max] = aLayout[aLayout.Max - 1]
- Layout_Write(aLayout)
-
-End
-
-Public Sub Container_Arrange()
-
- Layout_Write(Layout_Read())
-
-End
-
-
-Private Function Layout_Read() As Integer[]
-
- Dim aLayout As New Integer[]
- Dim hChild As Control
-
- For Each hChild In Me.Children
- If Not hChild.Visible Then Continue
- aLayout.Add(hChild.Width)
- Next
-
- Return aLayout
-
-End
-
-Private Sub Layout_Write(Value As Integer[])
-
- Dim I, W, WMax, WTotal As Integer
- Dim iTotal As Integer
- Dim hChild As Control
- Dim X As Integer
-
- If $bLayouting Or If Not Value Or If Value.Count = 0 Then Return
-
- $bLayouting = True
-
- Value.Resize(Me.Children.Count)
-
- For I = 0 To Value.Max
- Value[I] = Max(1, Value[I])
- iTotal += Value[I]
- Next
-
- WMax = Me.W - Value.Max
- For I = 0 To Value.Max - 1
- W = Value[I] * WMax / iTotal
- WTotal += W
- Me.Children[I].Width = W
- Next
-
- Me.Children[Value.Max].Width = WMax - WTotal
-
- For Each hChild In Me.Children
- hChild.Move(X, 0, hChild.W, Me.H)
- X += hChild.W + 1
- Next
-
- $bLayouting = False
-
-End
diff --git a/gb.compress.zlib/src/main.c b/gb.compress.zlib/src/main.c
index 3deeb58db..e9143dae5 100644
--- a/gb.compress.zlib/src/main.c
+++ b/gb.compress.zlib/src/main.c
@@ -332,8 +332,8 @@ static void u_File(char *source,char *target)
{
if (len != fwrite((void*)buf,sizeof(char),len,dst) )
{
- fclose(src);
- gzclose(dst);
+ fclose(dst);
+ gzclose(src);
GB.Error("Error while writing data");
return;
}
diff --git a/gb.jit/src/main.cpp b/gb.jit/src/main.cpp
index 5e930723e..405d3ec3e 100644
--- a/gb.jit/src/main.cpp
+++ b/gb.jit/src/main.cpp
@@ -27,7 +27,8 @@
#include "gambas.h"
#include "main.h"
-#include
+// Don't use if we just need the version
+#include
extern "C" {
GB_INTERFACE GB EXPORT;