diff --git a/VERSION b/VERSION index fbca2c91a..d5f346361 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.9.90 +3.10.90 diff --git a/acinclude.m4 b/acinclude.m4 index 29d252e58..e6ff161e4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -81,7 +81,7 @@ AC_DEFUN([GB_INIT_AUTOMAKE], AC_DEFINE(GAMBAS_VERSION_STRING, "GB_VERSION_MAJOR", Gambas version string) AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "GB_VERSION_MAJOR.GB_VERSION_MINOR", Gambas full version string) - AC_DEFINE(GAMBAS_FULL_VERSION, 0x03090090, [Full Gambas version]) + AC_DEFINE(GAMBAS_FULL_VERSION, 0x03100090, [Full Gambas version]) AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03080000, [Gambas bytecode version]) AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, 0x03000000, [Minimum Gambas bytecode version]) diff --git a/comp/src/gb.form.terminal/.component b/comp/src/gb.form.terminal/.component index e7cb1cd8d..16209c392 100644 --- a/comp/src/gb.form.terminal/.component +++ b/comp/src/gb.form.terminal/.component @@ -1,6 +1,6 @@ [Component] Key=gb.form.terminal -Version=3.9.90 +Version=3.10.90 State=1 Authors=Benoît Minisini,Fabien Bodard Needs=Form diff --git a/comp/src/gb.form.terminal/.project b/comp/src/gb.form.terminal/.project index 909e58863..741b2f788 100644 --- a/comp/src/gb.form.terminal/.project +++ b/comp/src/gb.form.terminal/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.9.90 +# Compiled with Gambas 3.10.90 Title=Gambas Terminal control Startup=PipeTest Icon=terminalview.png -Version=3.9.90 +Version=3.10.90 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.form/.component b/comp/src/gb.form/.component index 97016d1cb..31ad5eaa1 100644 --- a/comp/src/gb.form/.component +++ b/comp/src/gb.form/.component @@ -1,5 +1,5 @@ [Component] Key=gb.form -Version=3.9.90 +Version=3.10.90 Authors=Benoît Minisini Needs=Form diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index ed33eecf5..fa1611b93 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.9.90 +# Compiled with Gambas 3.10.90 Title=More controls for graphical components Startup=FIconPanel -Version=3.9.90 +Version=3.10.90 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.gui.base/.component b/comp/src/gb.gui.base/.component index 731895346..48c1cf5de 100644 --- a/comp/src/gb.gui.base/.component +++ b/comp/src/gb.gui.base/.component @@ -1,5 +1,5 @@ [Component] Key=gb.gui.base -Version=3.9.90 +Version=3.10.90 Hidden=True Needs=Form diff --git a/comp/src/gb.gui.base/.project b/comp/src/gb.gui.base/.project index 1de2af1d3..fe555a018 100644 --- a/comp/src/gb.gui.base/.project +++ b/comp/src/gb.gui.base/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.9.90 +# Compiled with Gambas 3.10.90 Title=gb.gui.base Startup=FGridView -Version=3.9.90 +Version=3.10.90 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.gui.base/.src/Test/FGridView.class b/comp/src/gb.gui.base/.src/Test/FGridView.class index 77e211850..a0b59d82c 100644 --- a/comp/src/gb.gui.base/.src/Test/FGridView.class +++ b/comp/src/gb.gui.base/.src/Test/FGridView.class @@ -159,3 +159,21 @@ Public Sub Button2_Click() gvwInfo.Border = Not gvwInfo.Border End + +Public Sub Label1_MouseDown() + + + +End + +Public Sub Label1_MouseDrag() + + Drag(Label1, "text") + +End + +Public Sub gvwInfo_Drop() + + Debug Drag.Paste() + +End diff --git a/comp/src/gb.gui.base/.src/Test/FGridView.form b/comp/src/gb.gui.base/.src/Test/FGridView.form index 9ac42721c..b3420c81a 100644 --- a/comp/src/gb.gui.base/.src/Test/FGridView.form +++ b/comp/src/gb.gui.base/.src/Test/FGridView.form @@ -1,12 +1,12 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,0,72,68) + MoveScaled(0,0,87,68) Arrangement = Arrange.Vertical Spacing = True Margin = True { HBox1 HBox - MoveScaled(6,1,55,4) + MoveScaled(6,1,75,4) { txtPadding SpinBox MoveScaled(3,0,8,4) } @@ -17,10 +17,17 @@ MoveScaled(34,0,16,4) Text = ("Border") } + { Label1 Label + MoveScaled(53,0,13,4) + AutoResize = True + Text = ("Drag me") + Border = Border.Plain + } } { gvwInfo GridView MoveScaled(8,11,51,31) Foreground = Color.Orange + Drop = True Expand = True Border = False Mode = Select.Multiple diff --git a/comp/src/gb.gui.base/.startup b/comp/src/gb.gui.base/.startup index 10e37ff15..52fac89ad 100644 --- a/comp/src/gb.gui.base/.startup +++ b/comp/src/gb.gui.base/.startup @@ -2,7 +2,7 @@ FGridView gb.gui.base 0 0 -3.9.90 +3.10.90 gb.image gb.gui diff --git a/comp/src/gb.web.feed/.component b/comp/src/gb.web.feed/.component index 4aa30dbff..62903252c 100644 --- a/comp/src/gb.web.feed/.component +++ b/comp/src/gb.web.feed/.component @@ -1,6 +1,6 @@ [Component] Key=gb.web.feed -Version=3.9.90 +Version=3.9.91 State=2 Authors=(C) 2017 Tobias Boege Needs=XML diff --git a/comp/src/gb.web.feed/.project b/comp/src/gb.web.feed/.project index c16fa9ed7..13ee63250 100644 --- a/comp/src/gb.web.feed/.project +++ b/comp/src/gb.web.feed/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.9.90 +# Compiled with Gambas 3.10.90 Startup=Main Icon=Feed-icon.svg -Version=3.9.90 +Version=3.9.91 Component=gb.xml Description="Web feed parser and generator" Authors="(C) 2017 Tobias Boege " diff --git a/comp/src/gb.web.form/.component b/comp/src/gb.web.form/.component index c0360bfcf..4b2db0af1 100644 --- a/comp/src/gb.web.form/.component +++ b/comp/src/gb.web.form/.component @@ -1,6 +1,6 @@ [Component] Key=gb.web.form -Version=3.9.90 +Version=3.10.90 State=1 Authors=Benoît Minisini Requires=gb.web,gb.util.web,gb.util diff --git a/comp/src/gb.web.form/.project b/comp/src/gb.web.form/.project index 8c8d00b37..77b9eead2 100644 --- a/comp/src/gb.web.form/.project +++ b/comp/src/gb.web.form/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.9.90 +# Compiled with Gambas 3.10.90 Startup=Webform3 UseHttpServer=1 -Version=3.9.90 +Version=3.10.90 VersionFile=1 Component=gb.util Component=gb.util.web diff --git a/main/gbx/gbx_api.c b/main/gbx/gbx_api.c index 9407add53..fe7da0546 100644 --- a/main/gbx/gbx_api.c +++ b/main/gbx/gbx_api.c @@ -255,6 +255,7 @@ const void *const GAMBAS_Api[] = (void *)GB_SystemHasForked, (void *)GB_SystemDebug, (void *)FILE_get_home, + (void *)DATE_get_timezone, (void *)GB_ArrayNew, (void *)GB_ArrayCount, diff --git a/main/lib/db/CConnection.c b/main/lib/db/CConnection.c index 9091826cc..f1dfcdc91 100644 --- a/main/lib/db/CConnection.c +++ b/main/lib/db/CConnection.c @@ -154,6 +154,7 @@ BEGIN_METHOD(CCONNECTION_new, GB_STRING url) THIS->db.handle = NULL; THIS->db.ignore_case = FALSE; // Now case is sensitive by default! THIS->db.timeout = 20; // Connection timeout is 20 seconds by default + THIS->db.timezone = GB.System.TimeZone(); if (_current == NULL) _current = THIS; @@ -262,6 +263,16 @@ BEGIN_PROPERTY(Connection_Timeout) END_PROPERTY +BEGIN_PROPERTY(Connection_Timezone) + + if (READ_PROPERTY) + GB.ReturnInteger(THIS->db.timezone); + else + THIS->db.timezone = VPROP(GB_INTEGER); + +END_PROPERTY + + BEGIN_PROPERTY(CCONNECTION_opened) CHECK_DB(); @@ -767,6 +778,7 @@ GB_DESC CConnectionDesc[] = GB_PROPERTY("Name", "s", CCONNECTION_name), GB_PROPERTY("Port", "s", CCONNECTION_port), GB_PROPERTY("Timeout", "i", Connection_Timeout), + GB_PROPERTY("Timezone", "i", Connection_Timezone), GB_PROPERTY_READ("Charset", "s", CCONNECTION_charset), GB_PROPERTY_READ("Version", "i", CCONNECTION_version), GB_PROPERTY_READ("Opened", "b", CCONNECTION_opened), diff --git a/main/lib/db/gb.db.h b/main/lib/db/gb.db.h index 218b27900..62b2c1ab1 100644 --- a/main/lib/db/gb.db.h +++ b/main/lib/db/gb.db.h @@ -54,6 +54,7 @@ typedef void *data; /* Can be used by the driver for storing its own private data */ int error; /* Last SQL error code raise by a query */ int timeout; /* Connection timeout */ + int timezone; /* Timezone of dates (default to local timezone) */ unsigned ignore_case : 1; /* If table, field and index names are case sensitive */ struct { unsigned no_table_type : 1; /* Tables do not have types */ diff --git a/main/share/gambas.h b/main/share/gambas.h index cf700a1f9..47588d4cf 100644 --- a/main/share/gambas.h +++ b/main/share/gambas.h @@ -1105,6 +1105,7 @@ typedef void (*HasForked)(void); bool (*Debug)(void); char *(*Home)(void); + int (*TimeZone)(void); } System; diff --git a/version.m4 b/version.m4 index a47e8ec7b..788989b48 100644 --- a/version.m4 +++ b/version.m4 @@ -1,9 +1,9 @@ ## Package version and e-mail for bugs are defined here -m4_define([GB_VERSION], [3.9.90]) +m4_define([GB_VERSION], [3.10.90]) m4_define([GB_MAIL], [gambas@users.sourceforge.net]) m4_define([GB_URL], [http://gambas.sourceforge.net]) m4_define([GB_VERSION_MAJOR], [3]) -m4_define([GB_VERSION_MINOR], [9]) +m4_define([GB_VERSION_MINOR], [10]) m4_define([GB_VERSION_RELEASE], [90])