Release-1.2.5-20010226

10 files changed, 54 insertions, 22 deletions

diff --git a/INSTALL b/INSTALL
index a42c9b2..a2505e6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.5-20010225
+DOXYGEN Version 1.2.5-20010226
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (25 February 2001)
+Dimitri van Heesch (26 February 2001)
diff --git a/README b/README
index c1b29ca..0fed8a0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.5-20010225
+DOXYGEN Version 1.2.5-20010226
 
 Please read INSTALL for compilation instructions.
 
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (25 February 2001)
+Dimitri van Heesch (26 February 2001)
diff --git a/VERSION b/VERSION
index a60c80b..6bd7939 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.5-20010225
+1.2.5-20010226
diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l
index 6b6b248..c4310f3 100644
--- a/addon/configgen/config_templ.l
+++ b/addon/configgen/config_templ.l
@@ -976,7 +976,7 @@ void checkConfig()
   }
 
 #undef PUTENV
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define PUTENV _putenv
 #else
 #define PUTENV putenv
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 0f5d612..a2b7bfd 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,5 +1,5 @@
 Name: doxygen
-Version: 1.2.5-20010225
+Version: 1.2.5-20010226
 Summary: documentation system for C, C++ and IDL
 Release: 1
 Source0: doxygen-%{version}.src.tar.gz
diff --git a/src/config.l b/src/config.l
index e06d867..9093c8e 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sun Feb 25 14:30:18 2001
+/* This file was generated by configgen on Mon Feb 26 19:52:21 2001
  * from config_templ.l
  *
  * DO NOT EDIT!
@@ -3039,7 +3039,7 @@ void checkConfig()
   }
 
 #undef PUTENV
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define PUTENV _putenv
 #else
 #define PUTENV putenv
diff --git a/src/index.cpp b/src/index.cpp
index 5f372d2..723ec79 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -2211,19 +2211,20 @@ void writeGroupTreeNode(OutputList &ol, GroupDef *gd)
       // write members
       struct MemInfo
       {
+        MemInfo(MemberList *l,const QCString &n) { list=l; name=n; }
         MemberList *list;
         QCString name;
       };
       MemInfo memberLists[] = 
       {
-        { &gd->defineMembers,  theTranslator->trDefines()           },
-        { &gd->typedefMembers, theTranslator->trTypedefs()          },
-        { &gd->enumMembers,    theTranslator->trEnumerations()      },
-        { &gd->enumValMembers, theTranslator->trEnumerationValues() },
-        { &gd->funcMembers,    theTranslator->trFunctions()         },
-        { &gd->varMembers,     theTranslator->trVariables()         },
-        { &gd->protoMembers,   theTranslator->trFuncProtos()        },
-        { 0,0 }
+        MemInfo(&gd->defineMembers,  theTranslator->trDefines()),
+        MemInfo(&gd->typedefMembers, theTranslator->trTypedefs()),
+        MemInfo(&gd->enumMembers,    theTranslator->trEnumerations()),
+        MemInfo(&gd->enumValMembers, theTranslator->trEnumerationValues()),
+        MemInfo(&gd->funcMembers,    theTranslator->trFunctions()),
+        MemInfo(&gd->varMembers,     theTranslator->trVariables()),
+        MemInfo(&gd->protoMembers,   theTranslator->trFuncProtos()),
+        MemInfo(0,0)
       };
 
       MemberList *members;
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index d83f236..a48f284 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -866,9 +866,9 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
   QCString scopeName = scName;
   if (container->definitionType()==TypeGroup)
   {
-    if (getClassDef()) scopeName=getClassDef()->name();
-    else if (getNamespaceDef()) scopeName=getClassDef()->name();
-    else if (getFileDef()) scopeName=getClassDef()->name();
+    if (getClassDef())          scopeName=getClassDef()->name();
+    else if (getNamespaceDef()) scopeName=getNamespaceDef()->name();
+    else if (getFileDef())      scopeName=getFileDef()->name();
   }
   
   bool hasDocs = detailsAreVisible();
diff --git a/src/translator.h b/src/translator.h
index fe53b35..a8c1de7 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -1195,7 +1195,14 @@ class Translator
     /*! Used for Java classes in the summary section of Java packages */
     virtual QCString trClasses()
     {
-      return "Classes";
+      if (Config::optimizeForCFlag)
+      {
+        return "Data Structures";
+      }
+      else
+      {
+        return "Classes";
+      }
     }
     /*! Used as the title of a Java package */
     virtual QCString trPackage(const char *name)
diff --git a/src/translator_cz.h b/src/translator_cz.h
index a3e5606..60fa31f 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -85,6 +85,14 @@
 //    I tried my best to guess the Czech terminology for the Java.
 //    Let me know if some wording should be changed/improved.
 //         
+// 2001/02/15 (Petr Prikryl)
+//  - trMore() now returns only "..." (ellipsis).  The Czech replacement
+//    of "(more)" was too much visible.  The previous "(...)" did not 
+//    look well.
+//    
+// 2001/02/26 (Petr Prikryl)
+//  - Update for "new since 1.2.5" version (trBug(), trBugList()).
+//         
 // Notices:
 // -------- 
 // The conditional compilation ensures or the neutral functionality
@@ -166,7 +174,7 @@ class TranslatorCzech : public Translator
 
     /*! this is the text of a link put after brief descriptions. */
     virtual QCString trMore() 
-    { return Decode("(...)"); }
+    { return Decode("..."); }
 
     /*! put in the class documentation */
     virtual QCString trListOfAllMembers()
@@ -1182,6 +1190,22 @@ class TranslatorCzech : public Translator
     {
       return Decode("Hodnota:");
     }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.5
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a \bug item */
+    virtual QCString trBug()
+    {
+      return Decode("Chyba");
+    }
+    /*! Used as the header of the bug list */
+    virtual QCString trBugList()
+    {
+      return Decode("Seznam chyb");
+    }
+
 };
 
 #endif // TRANSLATOR_CZ_H