[CONFIGURATION]

* NEW: Switch to 3.4 version.

[GB.COMPRESS.ZLIB]
* BUG: Fix a file handle mistake.

[GB.GUI.BASE]
* NEW: Remove again the MyHSplit.class file. No idea how it came back into
  the repository...

[GB.JIT]
* BUG: Fix some warnings by using 'llvm-config.h' instead of 'config.h'.


git-svn-id: svn://localhost/gambas/trunk@5485 867c0c6c-44f3-4631-809d-bfa615b0a4ec

VERSION

@@ -1 +1 @@
-3.3.90
+3.4.0

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

comp/src/gb.gui.base/.src/Split/MyHSplit.class

@@ -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

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;
 			}

gb.jit/src/main.cpp

@@ -27,7 +27,8 @@
 
 #include "gambas.h"
 #include "main.h"
-#include <llvm/Config/config.h>
+// Don't use <config.h> if we just need the version
+#include <llvm/Config/llvm-config.h>
 
 extern "C" {
 	GB_INTERFACE GB EXPORT;