[CONFIGURATION]

* NEW: Switch to 3.2.90 version.

[DEVELOPMENT ENVIRONMENT]
* BUG: Fix automatic completion of project classes that reimplements 
  another class.

[WEB SITE MAKER]
* BUG: Fix scrolling frames on Chrome.

[INTERPRETER]
* NEW: Args and Env classes are now shortcuts for Application.Args and 
  Application.Env properties.


git-svn-id: svn://localhost/gambas/trunk@4977 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-07-21 20:43:10 +00:00
parent 4f8389e766
commit 938458a03e
15 changed files with 48 additions and 48 deletions

View file

@ -64,7 +64,7 @@ AC_DEFUN([GB_PRINT_MESSAGES],
AC_DEFUN([GB_INIT_AUTOMAKE],
[
AM_INIT_AUTOMAKE($1, 3.2.0)
AM_INIT_AUTOMAKE($1, 3.2.90)
##AM_SILENT_RULES([yes])
AM_CONFIG_HEADER([config.h])
@ -79,7 +79,7 @@ AC_DEFUN([GB_INIT_AUTOMAKE],
AC_DEFINE(GAMBAS_VERSION_STRING, "3", Gambas version string)
AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "3.2", Gambas full version string)
AC_DEFINE(GAMBAS_FULL_VERSION, 0x03020000, [Full Gambas version])
AC_DEFINE(GAMBAS_FULL_VERSION, 0x03020090, [Full Gambas version])
AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03020000, [Gambas bytecode version])
AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, 0x03000000, [Minimum Gambas bytecode version])

View file

@ -36,11 +36,13 @@ SearchComment=False
SearchString=True
[OpenFile]
File[1]="gambas.sourceforge.net/home.html.template:27.0"
File[2]=".src/MMain.module:142.0"
Active=3
File[1]="gambas.sourceforge.net/home.html.template:44.118"
Active=2
File[2]=".src/MMain.module:16.31"
File[3]="authors.txt:28.0"
Count=3
File[4]="gambas.sourceforge.net/main.html:19.56"
File[5]="gambas.sourceforge.net/main-rtl.html:19.71"
Count=5
[Watches]
Count=0

View file

@ -14,7 +14,7 @@ Sub InitVar()
'DIM aDev AS String[] = ["92", "91", "90", "51"]
$cVar["OLD_VERSION"] = "2.24.0"
$cVar["DEV_VERSION"] = "3.2.0"
$cVar["DEV_VERSION"] = "3.2.1"
InitAuthor

View file

@ -42,7 +42,7 @@
<div class="all-news" align="right"><a href="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view">{Last news}</a></div>-->
<div id="fade"></div>
<div id="news">
<iframe id="news-frame" src="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view" frameborder="0">
<iframe id="news-frame" src="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view" frameborder="0" scrolling="no">
Your browser must support frames.
</iframe>
</div>
@ -56,10 +56,10 @@
<img id="logo" src="logo-small-fast.png"/>
<div>
<a class="download-orange" target="_blank" href="http://sourceforge.net/projects/gambas/files/gambas3/gambas3-3.2.0.tar.bz2/download">
{Download}&nbsp;<b>Gambas&nbsp;3.2.0</b>
<a class="download-orange" target="_blank" href="http://sourceforge.net/projects/gambas/files/gambas3/gambas3-3.2.1.tar.bz2/download">
{Download}&nbsp;<b>Gambas&nbsp;3.2.1</b>
</a>
<div class="release-notes" align="center"><a href="http://gambasdoc.org/help/doc/release/3.2.0?view&amp;$(LANG)">{Release Notes}</a></div>
<div class="release-notes" align="center"><a href="http://gambasdoc.org/help/doc/release/3.2.1?view&amp;$(LANG)">{Release Notes}</a></div>
</div>
<div style="display:inline-table;">

View file

@ -42,7 +42,7 @@
<div class="all-news" align="right"><a href="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view">{Last news}</a></div>-->
<div id="fade"></div>
<div id="news">
<iframe id="news-frame" src="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view" frameborder="0">
<iframe id="news-frame" src="http://gambasdoc.org/help/doc/news?$(LANG)&amp;view" frameborder="0" scrolling="no">
Your browser must support frames.
</iframe>
</div>

View file

@ -17,7 +17,7 @@
<td class="none" width="*"><iframe id="main-contents" name="contents" src="home.html" frameborder="0"></iframe></td>
</tr>
</table>
<iframe id="main-menu" src="menu.html" frameborder="0"></iframe>
<iframe id="main-menu" src="menu.html" frameborder="0" scrolling="no"></iframe>
</body>
<script type="text/javascript">

View file

@ -17,7 +17,7 @@
<td class="none" width="*"><iframe id="main-contents" name="contents" src="home.html" frameborder="0"></iframe></td>
</tr>
</table>
<iframe id="main-menu" src="menu.html" frameborder="0"></iframe>
<iframe id="main-menu" src="menu.html" frameborder="0" scrolling="no"></iframe>
</body>
<!--

View file

@ -1,8 +1,7 @@
# Gambas Project File 3.0
# Compiled with Gambas 3.2.0
# Compiled with Gambas 3.2.90
Title=Gambas 3
Startup=Project
Profiling=1
Icon=img/logo/logo-ide.png
Version=3.2.0
VersionFile=1

View file

@ -791,7 +791,6 @@ Static Private Sub ScanClass(hModule As Object, cSymbol As Collection, bModule A
Dim bExport As Boolean
'Debug "ScanClass "; hModule.Name
'DEBUG "> "; hModule.Name
hEditor = hModule.Editor
hModule.AutoCreatable = False
@ -799,18 +798,15 @@ Static Private Sub ScanClass(hModule As Object, cSymbol As Collection, bModule A
'DEBUG hModule.Name; " := "; hModule.AutoCreatable
If bCanInherit Then
hClass = Classes[hModule.Name]
' If hClass And If hClass.Component = Project.Name And If hClass.Parent Then
' hClass = Classes[hClass.Parent]
' Endif
If hClass Then
If hClass.Component <> Project.Name And If hClass.Component <> CComponent.PROJECT_NAME Then
MakeInheritance(hModule, cSymbol, hClass.Name, hClass.Component)
bCanInherit = False
Endif
If hClass And If hClass.Component = CComponent.PROJECT_NAME Then
hClass = Classes[hClass.ParentComponent &/ hClass.Parent]
MakeInheritance(hModule, cSymbol, hClass.Name, hClass.Component)
bCanInherit = False
Endif
Endif
For iLine = 0 To hEditor.Lines.Count - 1

View file

@ -251,14 +251,14 @@ Public Sub Main()
RefreshBreakpointPicture
For iInd = 1 To Application.Args.Count - 1
sArg = Application.Args[iInd]
For iInd = 1 To Args.Count - 1
sArg = Args[iInd]
If sArg = "-t" Then
$bTesting = True
Continue
Endif
If Left(sArg) <> "-" Then
sPath = Application.Args[iInd]
sPath = Args[iInd]
Break
Endif
Next
@ -4878,11 +4878,11 @@ Public Sub OpenWebPage(sLink As String)
Case Else
aTest = [Application.Env["BROWSER"]]
aTest = [Env["BROWSER"]]
If Application.Env["KDE_FULL_SESSION"] Then
If Env["KDE_FULL_SESSION"] Then
aTest.Add("konqueror")
Else If Application.Env["GNOME_DESKTOP_SESSION_ID"] Then
Else If Env["GNOME_DESKTOP_SESSION_ID"] Then
aTest.Add("epiphany")
aTest.Add("firefox")
Endif

View file

@ -21,28 +21,28 @@ Static Private Sub GetDesktop() As String
Dim sOutput As String
If Application.Env["KDE_FULL_SESSION"] Then
If Application.Env["KDE_SESSION_VERSION"] = "4" Then
If Env["KDE_FULL_SESSION"] Then
If Env["KDE_SESSION_VERSION"] = "4" Then
Return "KDE4"
Else
Return "KDE"
Endif
Else If Application.Env["GNOME_DESKTOP_SESSION_ID"] Then
Else If Env["GNOME_DESKTOP_SESSION_ID"] Then
Return "GNOME"
Else If Application.Env["MATE_DESKTOP_SESSION_ID"] Or If Application.Env["MATECORBA_SOCKETDIR"] Then
Else If Env["MATE_DESKTOP_SESSION_ID"] Or If Env["MATECORBA_SOCKETDIR"] Then
Return "MATE"
Else If Application.Env["E_BIN_DIR"] And If Application.Env["E_LIB_DIR"] Then
Else If Env["E_BIN_DIR"] And If Env["E_LIB_DIR"] Then
Return "ENLIGHTENMENT"
Else If Application.Env["WMAKER_BIN_NAME"] Then
Else If Env["WMAKER_BIN_NAME"] Then
Return "WINDOWMAKER"
Else If Application.Env["DESKTOP_SESSION"] = "LXDE" Then
Else If Env["DESKTOP_SESSION"] = "LXDE" Then
Return "LXDE"
Else
Shell "xprop -root XFCE_DESKTOP_WINDOW" To sOutput
If sOutput Then Return "XFCE"
Endif
Select Case Application.Env["XDG_CURRENT_DESKTOP"]
Select Case Env["XDG_CURRENT_DESKTOP"]
Case "LXDE"
Return "LXDE"
End Select
@ -141,7 +141,7 @@ Static Private Sub InitTheme()
Dim aFind As String[]
If Not $bDebug Then
If Application.Env["GB_STOCK"] Then $bDebug = True
If Env["GB_STOCK"] Then $bDebug = True
Endif
$aIconPath = New String[]

View file

@ -1,5 +1,5 @@
[Component]
Key=gb.gsl
Author=Randall Morgan,Benoît Minisini
Alpha=1
State=NotFinished
Implements=Complex

View file

@ -1,3 +1,3 @@
[Component]
Author=Benoît Minisini
Alpha=1
State=NotFinished

View file

@ -250,7 +250,7 @@ END_PROPERTY
GB_DESC NATIVE_AppArgs[] =
{
GB_DECLARE(".Application.Args", 0), GB_VIRTUAL_CLASS(),
GB_DECLARE_VIRTUAL("Args"),
GB_STATIC_PROPERTY_READ("Count", "i", Application_Args_Count),
GB_STATIC_METHOD("_get", "s", Application_Args_get, "(Index)i"),
@ -262,7 +262,7 @@ GB_DESC NATIVE_AppArgs[] =
GB_DESC NATIVE_AppEnv[] =
{
GB_DECLARE(".Application.Env", 0), GB_VIRTUAL_CLASS(),
GB_DECLARE_VIRTUAL("Env"),
GB_STATIC_PROPERTY_READ("Count", "i", Application_Env_Count),
GB_STATIC_METHOD("_get", "s", Application_Env_get, "(Key)s"),
@ -275,10 +275,10 @@ GB_DESC NATIVE_AppEnv[] =
GB_DESC NATIVE_App[] =
{
GB_DECLARE("Application", 0), GB_VIRTUAL_CLASS(),
GB_DECLARE_VIRTUAL("Application"),
GB_STATIC_PROPERTY_SELF("Args", ".Application.Args"),
GB_STATIC_PROPERTY_SELF("Env", ".Application.Env"),
GB_STATIC_PROPERTY_SELF("Args", "Args"),
GB_STATIC_PROPERTY_SELF("Env", "Env"),
GB_STATIC_PROPERTY_READ("Path", "s", Application_Path),
GB_STATIC_PROPERTY_READ("Name", "s", Application_Name),
GB_STATIC_PROPERTY_READ("Title", "s", Application_Title),

View file

@ -349,6 +349,9 @@ typedef
#define GB_VIRTUAL_CLASS() { GB_VIRTUAL_CLASS_ID }, { GB_NOT_CREATABLE_ID }
#define GB_DECLARE_VIRTUAL(name) \
{ name, (intptr_t)GB_VERSION, (intptr_t)0 }, GB_VIRTUAL_CLASS()
/* Not creatable class macro */