From 938458a03eca83d5c1f764c28b90a2608259275c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Sat, 21 Jul 2012 20:43:10 +0000
Subject: [PATCH] [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
---
 acinclude.m4                                   |  4 ++--
 app/other/MakeWebSite/.settings                | 10 ++++++----
 app/other/MakeWebSite/.src/MMain.module        |  2 +-
 .../gambas.sourceforge.net/home.html           |  8 ++++----
 .../gambas.sourceforge.net/home.html.template  |  2 +-
 .../gambas.sourceforge.net/main-rtl.html       |  2 +-
 .../gambas.sourceforge.net/main.html           |  2 +-
 app/src/gambas3/.project                       |  3 +--
 .../gambas3/.src/Component/CComponent.class    | 16 ++++++----------
 app/src/gambas3/.src/Project.module            | 12 ++++++------
 comp/src/gb.form/.src/Stock.class              | 18 +++++++++---------
 gb.gsl/src/gb.gsl.component                    |  2 +-
 gb.media/src/gb.media.component                |  2 +-
 main/gbx/gbx_c_application.c                   | 10 +++++-----
 main/share/gambas.h                            |  3 +++
 15 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 57c72eeed..c9c12eed6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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])
 
diff --git a/app/other/MakeWebSite/.settings b/app/other/MakeWebSite/.settings
index 306ba275c..fd151404f 100644
--- a/app/other/MakeWebSite/.settings
+++ b/app/other/MakeWebSite/.settings
@@ -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
diff --git a/app/other/MakeWebSite/.src/MMain.module b/app/other/MakeWebSite/.src/MMain.module
index 2080d8b64..cfafd85bd 100644
--- a/app/other/MakeWebSite/.src/MMain.module
+++ b/app/other/MakeWebSite/.src/MMain.module
@@ -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
   
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
index f9051ec51..e49845256 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
@@ -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;">
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
index 0619fc9ad..be7e25cbc 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
@@ -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>
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/main-rtl.html b/app/other/MakeWebSite/gambas.sourceforge.net/main-rtl.html
index b015a7276..d8c0f0992 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/main-rtl.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/main-rtl.html
@@ -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">
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/main.html b/app/other/MakeWebSite/gambas.sourceforge.net/main.html
index d363920f5..929b0d6be 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/main.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/main.html
@@ -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>
 
 <!--
diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project
index 5ddaffe4e..f68d2841c 100644
--- a/app/src/gambas3/.project
+++ b/app/src/gambas3/.project
@@ -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
diff --git a/app/src/gambas3/.src/Component/CComponent.class b/app/src/gambas3/.src/Component/CComponent.class
index 2da8b5929..e84f87856 100644
--- a/app/src/gambas3/.src/Component/CComponent.class
+++ b/app/src/gambas3/.src/Component/CComponent.class
@@ -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
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index 16d427e17..18cb6ae6f 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -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
diff --git a/comp/src/gb.form/.src/Stock.class b/comp/src/gb.form/.src/Stock.class
index 81ecbae5c..bde8bc379 100644
--- a/comp/src/gb.form/.src/Stock.class
+++ b/comp/src/gb.form/.src/Stock.class
@@ -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[]
diff --git a/gb.gsl/src/gb.gsl.component b/gb.gsl/src/gb.gsl.component
index db83e6261..1d60d9da0 100644
--- a/gb.gsl/src/gb.gsl.component
+++ b/gb.gsl/src/gb.gsl.component
@@ -1,5 +1,5 @@
 [Component]
 Key=gb.gsl
 Author=Randall Morgan,Benoît Minisini
-Alpha=1
+State=NotFinished
 Implements=Complex
diff --git a/gb.media/src/gb.media.component b/gb.media/src/gb.media.component
index f0cde05f2..76ee7ad65 100644
--- a/gb.media/src/gb.media.component
+++ b/gb.media/src/gb.media.component
@@ -1,3 +1,3 @@
 [Component]
 Author=Benoît Minisini
-Alpha=1
+State=NotFinished
diff --git a/main/gbx/gbx_c_application.c b/main/gbx/gbx_c_application.c
index 333bc3f73..e793adedc 100644
--- a/main/gbx/gbx_c_application.c
+++ b/main/gbx/gbx_c_application.c
@@ -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),
diff --git a/main/share/gambas.h b/main/share/gambas.h
index 980e06277..5f02e8804 100644
--- a/main/share/gambas.h
+++ b/main/share/gambas.h
@@ -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 */